rename bin/darkwallet/ to bin/app/

bin/darkwallet/Cargo.lock → bin/app/Cargo.lock

@@ -1236,6 +1236,47 @@ dependencies = [
  "x509-parser",
 ]
 
+[[package]]
+name = "darkfi-app"
+version = "0.1.0"
+dependencies = [
+ "android_logger",
+ "arboard",
+ "async-channel 2.3.1",
+ "async-gen",
+ "async-lock",
+ "async-recursion",
+ "async-trait",
+ "atomic_float",
+ "blake3",
+ "chrono",
+ "colored",
+ "darkfi",
+ "darkfi-serial",
+ "dirs",
+ "easy-parallel",
+ "file-rotate",
+ "freetype-rs",
+ "futures",
+ "glam",
+ "harfbuzz-sys",
+ "image",
+ "log",
+ "miniquad",
+ "parking_lot 0.12.3",
+ "rand",
+ "regex",
+ "rusqlite",
+ "semver",
+ "simplelog",
+ "sled-overlay",
+ "smol",
+ "thiserror 1.0.69",
+ "tor-dirmgr",
+ "url",
+ "zeromq",
+]
+
 [[package]]
 name = "darkfi-derive"
 version = "0.4.2"
@@ -1297,47 +1338,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "darkwallet"
-version = "0.1.0"
-dependencies = [
- "android_logger",
- "arboard",
- "async-channel 2.3.1",
- "async-gen",
- "async-lock",
- "async-recursion",
- "async-trait",
- "atomic_float",
- "blake3",
- "chrono",
- "colored",
- "darkfi",
- "darkfi-serial",
- "dirs",
- "easy-parallel",
- "file-rotate",
- "freetype-rs",
- "futures",
- "glam",
- "harfbuzz-sys",
- "image",
- "log",
- "miniquad",
- "parking_lot 0.12.3",
- "rand",
- "regex",
- "rusqlite",
- "semver",
- "simplelog",
- "sled-overlay",
- "smol",
- "thiserror 1.0.69",
- "tor-dirmgr",
- "url",
- "zeromq",
-]
-
 [[package]]
 name = "darling"
 version = "0.14.4"

bin/darkwallet/Cargo.toml → bin/app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "darkwallet"
-description = "Wallet UI"
+name = "darkfi-app"
+description = "DarkFi UI App"
 version = "0.1.0"
 edition = "2021"
 authors = ["Dyne.org foundation <foundation@dyne.org>"]
@@ -91,8 +91,8 @@ workspace = true
 [workspace.lints.clippy]
 
 [package.metadata.android]
-package_name = "darkfi.darkwallet"
-label = "DarkWallet"
+package_name = "darkfi.app"
+label = "DarkFi"
 res = "data/res"
 icon = "@mipmap/ic_launcher"
 assets = "assets"

bin/darkwallet/Makefile → bin/app/Makefile

@@ -1,6 +1,6 @@
 .POSIX:
 
-APK = target/android-artifacts/release/apk/darkwallet.apk
+APK = target/android-artifacts/release/apk/darkfi-app.apk
 
 SRC = \
 	build.rs \
@@ -10,21 +10,25 @@ SRC = \
 	$(shell find assets -type f) \
 	$(shell find src -type f)
 
+RELEASE_FEATURES = --features=enable-plugins
+
 #FEATURES = --features=emulate-android
-#FEATURES = --features=enable-plugins
 #FEATURES = --features=enable-netdebug,enable-plugins
-FEATURES = --features=enable-netdebug
+DEV_FEATURES = --features=enable-netdebug
 
 all: $(SRC) fonts
-	# You can either install cargo-limit or just s/lbuild/build
-	# `cargo install cargo-limit`
-	cargo lbuild $(FEATURES)
-	-mv target/debug/darkwallet .
-	./darkwallet
+	cargo build --release $(RELEASE_FEATURES)
+	-mv target/debug/darkfi-app .
+	./darkfi-app
+
+dev: $(SRC) fonts
+	cargo lbuild $(DEV_FEATURES)
+	-mv target/debug/darkfi-app .
+	./darkfi-app
 
-darkwallet.apk: $(SRC) fonts
-	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/darkwallet/ -t apk cargo quad-apk build --release $(FEATURES)
-	cp -f $(APK) $@
+android: $(SRC) fonts
+	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk cargo quad-apk build --release $(RELEASE_FEATURES)
+	-mv $(APK) .
 
 ibm-plex-mono-regular.otf:
 	wget -c https://codeberg.org/darkrenaissance/darkfi/raw/branch/data/ibm-plex-mono-regular.otf
@@ -34,20 +38,21 @@ NotoColorEmoji.ttf:
 
 fonts: ibm-plex-mono-regular.otf NotoColorEmoji.ttf
 
-android: $(SRC) fonts
-	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/darkwallet/ -t apk cargo quad-apk build --release $(FEATURES)
-	adb uninstall darkfi.darkwallet
-	adb install $(APK)
+apk: darkfi-app.apk
+	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk cargo quad-apk build --release $(DEV_FEATURES)
+	-mv $(APK) .
+	adb uninstall darkfi.app
+	adb install darkfi-app.apk
 	reset
 	adb logcat -c
 	adb logcat -v color -s darkfi -s SAPP -s libc -s DEBUG -s ActivityManager -s ActivityTaskManager -s WindowManager
 
 # Useful for dev
 cli:
-	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/darkwallet/ -it apk bash
+	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -it apk bash
 
 clean:
 	podman run -v $(shell pwd):/root/dw -w /root/dw -t apk rm -fr target/
-	rm -f darkwallet.apk
+	rm -f darkfi-app.apk
 
 .PHONY: all android cli clean

bin/darkwallet/release/README.win32.md → bin/app/release/README.win32.md

@@ -125,8 +125,8 @@ in an accessible place.
 Open cmd and navigate to the folder. Now run `cargo build`.
 
 ```
-C:\Users\a> cd ../../darkfi/bin/darkwallet/
-C:\darkfi\bin\darkwallet> cargo build
+C:\Users\a> cd ../../darkfi/bin/app/
+C:\darkfi\bin\app> cargo build
 ```
 
 ## (Optional) Mesa GL

bin/darkwallet/src/app/mod.rs → bin/app/src/app/mod.rs

@@ -181,13 +181,14 @@ impl App {
         let plugin = Arc::new(SceneNode3::new("plugin", SceneNodeType3::PluginRoot));
         self.sg_root.clone().link(plugin.clone());
 
-        if cfg!(feature = "enable-plugins") {
-            self.load_plugins(plugin).await;
-        } else {
-            w!("Plugins are disabled in this build");
-        }
+        #[cfg(feature = "enable-plugins")]
+        self.load_plugins(plugin).await;
+
+        #[cfg(not(feature = "enable-plugins"))]
+        w!("Plugins are disabled in this build");
     }
 
+    #[cfg(feature = "enable-plugins")]
     async fn load_plugins(&self, plugin: SceneNodePtr) {
         let darkirc = create_darkirc("darkirc");
         let darkirc = darkirc

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

@@ -61,7 +61,7 @@ mod android_ui_consts {
 
 #[cfg(target_os = "android")]
 mod ui_consts {
-    use crate::android::get_appdata_path;
+    use crate::android::{get_appdata_path, get_external_storage_path};
     use std::path::PathBuf;
 
     pub const BG_PATH: &str = "bg.png";
@@ -87,15 +87,15 @@ mod desktop_paths {
     pub const BG_PATH: &str = "assets/bg.png";
 
     pub fn get_chatdb_path() -> PathBuf {
-        dirs::data_local_dir().unwrap().join("darkfi/wallet/chatdb")
+        dirs::data_local_dir().unwrap().join("darkfi/app/chatdb")
     }
 
     pub fn get_first_time_filename() -> PathBuf {
-        dirs::cache_dir().unwrap().join("darkfi/wallet/first_time")
+        dirs::cache_dir().unwrap().join("darkfi/app/first_time")
     }
 
     pub fn get_window_scale_filename() -> PathBuf {
-        dirs::cache_dir().unwrap().join("darkfi/wallet/window_scale")
+        dirs::cache_dir().unwrap().join("darkfi/app/window_scale")
     }
 }
 

bin/darkwallet/src/app/schema/test.rs → bin/app/src/app/schema/test.rs

@@ -47,7 +47,7 @@ const LIGHTMODE: bool = false;
 
 #[cfg(target_os = "android")]
 mod ui_consts {
-    pub const CHATDB_PATH: &str = "/data/data/darkfi.darkwallet/chatdb/";
+    pub const CHATDB_PATH: &str = "/data/data/darkfi.app/chatdb/";
     pub const KING_PATH: &str = "king.png";
 }
 

bin/darkwallet/src/gfx/mod.rs → bin/app/src/gfx/mod.rs

@@ -59,7 +59,7 @@ pub fn get_window_size_filename() -> PathBuf {
 }
 #[cfg(not(target_os = "android"))]
 pub fn get_window_size_filename() -> PathBuf {
-    dirs::cache_dir().unwrap().join("darkfi/wallet/window_size")
+    dirs::cache_dir().unwrap().join("darkfi/app/window_size")
 }
 
 #[derive(Clone, Debug, SerialEncodable, SerialDecodable)]

bin/darkwallet/src/main.rs → bin/app/src/main.rs

@@ -89,16 +89,21 @@ fn main() {
 
     #[cfg(target_os = "android")]
     {
+        use crate::android::{get_appdata_path, get_external_storage_path};
+
+        info!("App internal data path: {:?}", get_appdata_path());
+        info!("App external storage path: {:?}", get_external_storage_path());
+
         // Workaround for this bug
         // https://gitlab.torproject.org/tpo/core/arti/-/issues/999
         unsafe {
-            std::env::set_var("HOME", "/data/data/darkfi.darkwallet/");
+            std::env::set_var("HOME", get_appdata_path().as_os_str());
         }
 
-        let paths = std::fs::read_dir("/data/data/darkfi.darkwallet/").unwrap();
-        for path in paths {
-            debug!("{}", path.unwrap().path().display())
-        }
+        //let paths = std::fs::read_dir("/data/data/darkfi.darkfi/").unwrap();
+        //for path in paths {
+        //    debug!("{}", path.unwrap().path().display())
+        //}
     }
 
     let exe_path = std::env::current_exe().unwrap();

bin/darkwallet/src/plugin/darkirc.rs → bin/app/src/plugin/darkirc.rs

@@ -62,7 +62,7 @@ const RECENT_TIME_DIST: u64 = 25_000;
 
 #[cfg(target_os = "android")]
 mod paths {
-    use crate::android::get_appdata_path;
+    use crate::android::{get_appdata_path, get_external_storage_path};
     use std::path::PathBuf;
 
     pub fn get_evgrdb_path() -> PathBuf {
@@ -86,18 +86,18 @@ mod paths {
     use std::path::PathBuf;
 
     pub fn get_evgrdb_path() -> PathBuf {
-        dirs::data_local_dir().unwrap().join("darkfi/evgr")
+        dirs::data_local_dir().unwrap().join("darkfi/app/evgr")
     }
 
     pub fn nick_filename() -> PathBuf {
-        dirs::cache_dir().unwrap().join("darkfi/nick.txt")
+        dirs::cache_dir().unwrap().join("darkfi/app/nick.txt")
     }
 
     pub fn p2p_datastore_path() -> PathBuf {
-        dirs::cache_dir().unwrap().join("darkfi/wallet/darkirc_p2p")
+        dirs::cache_dir().unwrap().join("darkfi/app/darkirc_p2p")
     }
     pub fn hostlist_path() -> PathBuf {
-        dirs::cache_dir().unwrap().join("darkfi/wallet/hostlist.tsv")
+        dirs::cache_dir().unwrap().join("darkfi/app/hostlist.tsv")
     }
 }
 

bin/darkwallet/src/text/mod.rs → bin/app/src/text/mod.rs

@@ -49,7 +49,7 @@ pub const EMOJI_PROP_ABOVE_BASELINE: f32 = 0.8;
 
 #[cfg(target_os = "android")]
 fn custom_font_path() -> PathBuf {
-    get_external_storage_path().join("font")
+    crate::android::get_external_storage_path().join("font")
 }
 #[cfg(not(target_os = "android"))]
 fn custom_font_path() -> PathBuf {

bin/darkwallet/src/ui/emoji_picker/emoji.rs → bin/app/src/ui/emoji_picker/emoji.rs

@@ -43,7 +43,7 @@ use super::default;
 
 #[cfg(target_os = "android")]
 pub fn get_emoji_list_path() -> PathBuf {
-    get_external_storage_path().join("emoji.txt")
+    crate::android::get_external_storage_path().join("emoji.txt")
 }
 
 #[cfg(not(target_os = "android"))]