From 523f957d613779784df2196ac910a1dc99b250a0 Mon Sep 17 00:00:00 2001 From: alanpoon Date: Thu, 30 Apr 2026 17:13:52 +0800 Subject: [PATCH 1/2] remove editing LOG_WITH_LEVEL for android --- src/app.rs | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/app.rs b/src/app.rs index d4760daa..4e6ba912 100644 --- a/src/app.rs +++ b/src/app.rs @@ -693,18 +693,22 @@ impl MatchEvent for App { // Clean up old log files to prevent disk space issues cleanup_old_logs(MAX_LOG_FILES_TO_KEEP); } - // Override Makepad's new default-JSON logger. We just want regular formatting. - fn regular_log(file_name: &str, line_start: u32, column_start: u32, _line_end: u32, _column_end: u32, message: String, level: LogLevel) { - let l = match level { - LogLevel::Panic => "[!]", - LogLevel::Error => "[E]", - LogLevel::Warning => "[W]", - LogLevel::Log => "[I]", - LogLevel::Wait => "[.]", - }; - println!("{l} {file_name}:{}:{}: {message}", line_start + 1, column_start + 1); + + #[cfg(not(any(target_os = "android", target_os = "ios")))] + { + // Override Makepad's new default-JSON logger. We just want regular formatting. + fn regular_log(file_name: &str, line_start: u32, column_start: u32, _line_end: u32, _column_end: u32, message: String, level: LogLevel) { + let l = match level { + LogLevel::Panic => "[!]", + LogLevel::Error => "[E]", + LogLevel::Warning => "[W]", + LogLevel::Log => "[I]", + LogLevel::Wait => "[.]", + }; + println!("{l} {file_name}:{}:{}: {message}", line_start + 1, column_start + 1); + } + *LOG_WITH_LEVEL.write().unwrap() = regular_log; } - *LOG_WITH_LEVEL.write().unwrap() = regular_log; // Initialize the project directory here from the main UI thread // such that background threads/tasks will be able to can access it. From 253f279b5487e55fc9c5f04b43041be2373db607 Mon Sep 17 00:00:00 2001 From: alanpoon Date: Thu, 7 May 2026 23:43:27 +0800 Subject: [PATCH 2/2] remove _app_data_dir --- src/app.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app.rs b/src/app.rs index 4e6ba912..1af38dd0 100644 --- a/src/app.rs +++ b/src/app.rs @@ -710,9 +710,6 @@ impl MatchEvent for App { *LOG_WITH_LEVEL.write().unwrap() = regular_log; } - // Initialize the project directory here from the main UI thread - // such that background threads/tasks will be able to can access it. - let _app_data_dir = crate::app_data_dir(); log!("App::handle_startup(): app_data_dir: {:?}", _app_data_dir); if let Err(e) = persistence::load_window_state(self.ui.window(cx, ids!(main_window)), cx) {