diff --git a/crates/notedeck/src/platform/android.rs b/crates/notedeck/src/platform/android.rs index d3d08d4c..7497346c 100644 --- a/crates/notedeck/src/platform/android.rs +++ b/crates/notedeck/src/platform/android.rs @@ -16,7 +16,7 @@ pub extern "C" fn Java_com_damus_notedeck_KeyboardHeightHelper_nativeKeyboardHei debug!("updating virtual keyboard height {}", height); // Convert and store atomically - KEYBOARD_HEIGHT.store(height as i32, Ordering::SeqCst); + KEYBOARD_HEIGHT.store(height, Ordering::SeqCst); } /// Gets the current Android virtual keyboard height. Useful for transforming diff --git a/crates/notedeck_chrome/src/android.rs b/crates/notedeck_chrome/src/android.rs index 4693662d..299b0bb3 100644 --- a/crates/notedeck_chrome/src/android.rs +++ b/crates/notedeck_chrome/src/android.rs @@ -2,20 +2,15 @@ //use egui_android::run_android; use egui_winit::winit::platform::android::activity::AndroidApp; -use notedeck::enostr::Error; -use notedeck_columns::Damus; -use notedeck_dave::Dave; -use notedeck_notebook::Notebook; -use crate::{app::NotedeckApp, chrome::Chrome, setup::setup_egui_context}; +use crate::chrome::Chrome; use notedeck::Notedeck; -use tracing::error; #[no_mangle] #[tokio::main] pub async fn android_main(app: AndroidApp) { //use tracing_logcat::{LogcatMakeWriter, LogcatTag}; - use tracing_subscriber::{prelude::*, EnvFilter}; + use tracing_subscriber::{EnvFilter, prelude::*}; std::env::set_var("RUST_BACKTRACE", "full"); //std::env::set_var("DAVE_ENDPOINT", "http://ollama.jb55.com/v1"); @@ -70,9 +65,8 @@ pub async fn android_main(app: AndroidApp) { Box::new(move |cc| { let ctx = &cc.egui_ctx; let mut notedeck = Notedeck::new(ctx, path, &app_args); - notedeck.setup()?; - - let chrome = Chrome::new_with_apps(&mut notedeck); + notedeck.setup(ctx); + let chrome = Chrome::new_with_apps(cc, &app_args, &mut notedeck)?; notedeck.set_app(chrome); Ok(Box::new(notedeck))