From 18226a35ffafca3621606c5e0fd9b2aba4e00913 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 14 Dec 2024 01:51:56 -0800 Subject: [PATCH] android: fix build Signed-off-by: William Casarin --- crates/notedeck_chrome/Cargo.toml | 5 ++++- crates/notedeck_chrome/src/android.rs | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/crates/notedeck_chrome/Cargo.toml b/crates/notedeck_chrome/Cargo.toml index a5287ded..c9dea183 100644 --- a/crates/notedeck_chrome/Cargo.toml +++ b/crates/notedeck_chrome/Cargo.toml @@ -26,6 +26,9 @@ tracing-subscriber = { workspace = true } [dev-dependencies] tempfile = { workspace = true } +[lib] +crate-type = ["lib", "cdylib"] + [[bin]] name = "notedeck" path = "src/notedeck.rs" @@ -76,7 +79,7 @@ keystore_password = "damuskeystore" name = "android.permission.INTERNET" [package.metadata.android.application] -label = "Damus" +label = "Notedeck" [package.metadata.deb] name = "notedeck" diff --git a/crates/notedeck_chrome/src/android.rs b/crates/notedeck_chrome/src/android.rs index 2a26be67..1c3af4a4 100644 --- a/crates/notedeck_chrome/src/android.rs +++ b/crates/notedeck_chrome/src/android.rs @@ -2,6 +2,7 @@ //use egui_android::run_android; use crate::app::Notedeck; +use notedeck_columns::Damus; use winit::platform::android::activity::AndroidApp; use winit::platform::android::EventLoopBuilderExtAndroid; @@ -25,7 +26,12 @@ pub async fn android_main(app: AndroidApp) { let _res = eframe::run_native( "Damus Notedeck", options, - Box::new(move |cc| Ok(Box::new(Notedeck::new(&cc.egui_ctx, path, &app_args)))), + Box::new(move |cc| { + let mut notedeck = Notedeck::new(&cc.egui_ctx, path, &app_args); + let damus = Damus::new(&mut notedeck.app_context(), &app_args); + notedeck.add_app(damus); + Ok(Box::new(notedeck)) + }), ); }