notedeck

One damus client to rule them all
git clone git://jb55.com/notedeck
Log | Files | Refs | README | LICENSE

commit d6d7e4c35e9a3028c769b633f420aeba485d1d57
parent c3499729f2f117e32240e90c492d2d0b3cbdb171
Author: William Casarin <jb55@jb55.com>
Date:   Thu, 31 Jul 2025 17:29:06 -0700

android: fix build

Fixes: dac786e60fe4 ("chrome: remove duplication in app setup")

Diffstat:
Mcrates/notedeck/src/platform/android.rs | 2+-
Mcrates/notedeck_chrome/src/android.rs | 14++++----------
2 files changed, 5 insertions(+), 11 deletions(-)

diff --git 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 @@ -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))