app: reduce display scale for Android, disable crashing settings icon, and make various UI tweaks

bin/app/release/win/README.md

@@ -126,12 +126,13 @@ Open cmd and navigate to the folder. Now run `cargo build`.
 
 ```
 C:\Users\a> cd ../../darkfi/bin/app/
-C:\darkfi\bin\app> cargo build
+C:\darkfi\bin\app> cargo build --release --features=enable-plugins
 ```
 
 ## Create Installer
 
 * Use Advanced Installer to create an MSI installer.
+    * Application Folder should have `DarkFi App.exe` and `assets/`.
 * Add shortcuts. Use the provided darkfi.ico icon.
     * Application Shortcut Folder
     * Desktop

bin/app/src/app/mod.rs

@@ -113,8 +113,8 @@ impl App {
         let mut window_scale = 1.;
         #[cfg(target_os = "android")]
         {
-            window_scale = android::get_screen_density() / 2.25;
-            t!("Setting window_scale to {window_scale}");
+            window_scale = android::get_screen_density() / 2.625;
+            d!("Setting window_scale to {window_scale}");
         }
 
         settings.add_setting("scale", PropertyValue::Float32(window_scale));
@@ -163,9 +163,9 @@ impl App {
 
         // Access drawable in window node and call draw()
         self.init();
-        if epoch == 1 {
-            self.trigger_draw().await;
-        }
+        //if epoch == 1 {
+        self.trigger_draw().await;
+        //}
 
         self.start_procs(event_pub).await;
         i!("App started");

bin/app/src/app/schema/menu.rs

@@ -48,7 +48,7 @@ use super::{ColorScheme, CHANNELS, COLOR_SCHEME};
 
 mod android_ui_consts {
     pub const CHANNEL_LABEL_X: f32 = 40.;
-    pub const CHANNEL_LABEL_Y: f32 = 28.;
+    pub const CHANNEL_LABEL_Y: f32 = 35.;
     pub const CHANNEL_LABEL_LINESPACE: f32 = 140.;
     pub const CHANNEL_LABEL_FONTSIZE: f32 = 44.;
     pub const CHANNEL_LABEL_BASELINE: f32 = 82.;

bin/app/src/app/schema/mod.rs

@@ -411,6 +411,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
 
     // Navbar Settings Button
 
+    /*
     // Layer
     let settingslayer_node = create_layer("settings_button_layer");
     let prop = settingslayer_node.get_property("rect").unwrap();
@@ -497,6 +498,7 @@ pub async fn make(app: &App, window: SceneNodePtr) {
 
     let node = node.setup(|me| Button::new(me, app.ex.clone())).await;
     settingslayer_node.clone().link(node);
+    */
 
     let emoji_meshes = emoji_picker::EmojiMeshes::new(
         app.render_api.clone(),

bin/app/src/main.rs

@@ -189,8 +189,9 @@ impl God {
         #[cfg(feature = "enable-plugins")]
         {
             let ex = bg_ex.clone();
+            let cv = cv_app_is_setup.clone();
             let plug_task = bg_ex.spawn(async move {
-                load_plugins(ex, sg_root).await;
+                load_plugins(ex, sg_root, cv).await;
             });
             bg_runtime.push_task(plug_task);
         }
@@ -262,7 +263,7 @@ impl std::fmt::Debug for God {
 pub static GOD: OnceLock<God> = OnceLock::new();
 
 #[cfg(feature = "enable-plugins")]
-async fn load_plugins(ex: ExecutorPtr, sg_root: SceneNodePtr) {
+async fn load_plugins(ex: ExecutorPtr, sg_root: SceneNodePtr, cv: Arc<CondVar>) {
     let plugin = SceneNode::new("plugin", SceneNodeType::PluginRoot);
     let plugin = plugin.setup_null();
     sg_root.clone().link(plugin.clone());
@@ -339,6 +340,7 @@ async fn load_plugins(ex: ExecutorPtr, sg_root: SceneNodePtr) {
     darkirc.register("connect", slot).unwrap();
     let sg_root2 = sg_root.clone();
     let listen_connect = ex.spawn(async move {
+        cv.wait().await;
         let net0 = sg_root2.clone().lookup_node("/window/netstatus_layer/net0").unwrap();
         let net1 = sg_root2.clone().lookup_node("/window/netstatus_layer/net1").unwrap();
         let net2 = sg_root2.clone().lookup_node("/window/netstatus_layer/net2").unwrap();