diff --git a/nym-connect-android/public/growth.html.back b/nym-connect-android/public/growth.html.back
deleted file mode 100644
index 08672aaa3c..0000000000
--- a/nym-connect-android/public/growth.html.back
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
- Nym Connect
-
-
-
-
-
diff --git a/nym-connect-android/public/log.html.back b/nym-connect-android/public/log.html.back
deleted file mode 100644
index 5ced2243f1..0000000000
--- a/nym-connect-android/public/log.html.back
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
- Nym Wallet Logs
-
-
-
-
-
diff --git a/nym-connect-android/src-tauri/Cargo.toml b/nym-connect-android/src-tauri/Cargo.toml
index 93e8c31750..e967c9729a 100644
--- a/nym-connect-android/src-tauri/Cargo.toml
+++ b/nym-connect-android/src-tauri/Cargo.toml
@@ -41,8 +41,8 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_repr = "0.1"
tap = "1.0.1"
-tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next", features = ["clipboard-write-text", "native-tls-vendored", "notification-all", "shell-open", "system-tray", "window-close", "window-minimize", "window-start-dragging"] }
-# tauri = { version = "2.0.0-alpha.0", features = ["clipboard-write-text", "native-tls-vendored", "notification-all", "shell-open", "system-tray", "window-close", "window-minimize", "window-start-dragging"] }
+# TODO swithing to `rfd101` temporarily, untill https://github.com/tauri-apps/tauri/pull/6174 is merged
+tauri = { git = "https://github.com/tauri-apps/tauri", branch = "rfd101", features = ["clipboard-write-text", "native-tls-vendored", "notification-all", "shell-open", "system-tray", "window-close", "window-minimize", "window-start-dragging"] }
tendermint-rpc = "0.23.0"
thiserror = "1.0"
tokio = { version = "1.24.1", features = ["sync", "time"] }
@@ -64,3 +64,9 @@ tempfile = "3.3.0"
[features]
default = ["custom-protocol"]
custom-protocol = ["tauri/custom-protocol"]
+
+# [profile.dev]
+# strip = true
+# opt-level = "s"
+# lto = true
+
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/build.gradle.kts b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/build.gradle.kts
index a81c779421..56d94386ff 100644
--- a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/build.gradle.kts
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/build.gradle.kts
@@ -1,111 +1,112 @@
plugins {
- id("com.android.application")
- id("org.jetbrains.kotlin.android")
- id("rustPlugin")
+ id("com.android.application")
+ id("org.jetbrains.kotlin.android")
+ id("rustPlugin")
}
android {
- compileSdk = 33
- defaultConfig {
- manifestPlaceholders["usesCleartextTraffic"] = "false"
- applicationId = "net.nymtech.nym_connect_android"
- minSdk = 24
- targetSdk = 33
- versionCode = 1
- versionName = "1.0"
+ compileSdk = 33
+ defaultConfig {
+ manifestPlaceholders["usesCleartextTraffic"] = "false"
+ applicationId = "net.nymtech.nym_connect_android"
+ minSdk = 24
+ targetSdk = 33
+ versionCode = 1
+ versionName = "1.0"
+ }
+ sourceSets.getByName("main") {
+ // Vulkan validation layers
+ val ndkHome = System.getenv("NDK_HOME")
+ jniLibs.srcDir("${ndkHome}/sources/third_party/vulkan/src/build-android/jniLibs")
+ }
+ buildTypes {
+ getByName("debug") {
+ manifestPlaceholders["usesCleartextTraffic"] = "true"
+ isDebuggable = true
+ isJniDebuggable = true
+ isMinifyEnabled = false
+ packagingOptions {
+ jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
+
+ jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
+
+ jniLibs.keepDebugSymbols.add("*/x86/*.so")
+
+ jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
+ }
}
- sourceSets.getByName("main") {
- // Vulkan validation layers
- val ndkHome = System.getenv("NDK_HOME")
- jniLibs.srcDir("${ndkHome}/sources/third_party/vulkan/src/build-android/jniLibs")
+ getByName("release") {
+ isMinifyEnabled = false
+ // proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
- buildTypes {
- getByName("debug") {
- manifestPlaceholders["usesCleartextTraffic"] = "true"
- isDebuggable = true
- isJniDebuggable = true
- isMinifyEnabled = false
- packagingOptions {
- jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
+ }
+ flavorDimensions.add("abi")
+ productFlavors {
+ create("universal") {
+ val abiList = findProperty("abiList") as? String
- jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
-
- jniLibs.keepDebugSymbols.add("*/x86/*.so")
-
- jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
- }
- }
- getByName("release") {
- isMinifyEnabled = false
- proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
- }
+ dimension = "abi"
+ ndk {
+ abiFilters += abiList?.split(",")?.map { it.trim() } ?: listOf(
+ "arm64-v8a", "armeabi-v7a", "x86", "x86_64",
+ )
+ }
}
- flavorDimensions.add("abi")
- productFlavors {
- create("universal") {
- val abiList = findProperty("abiList") as? String
-
- dimension = "abi"
- ndk {
- abiFilters += abiList?.split(",")?.map { it.trim() } ?: listOf( "arm64-v8a", "armeabi-v7a", "x86", "x86_64",
- )
- }
- }
- create("arm64") {
- dimension = "abi"
- ndk {
- abiFilters += listOf("arm64-v8a")
- }
- }
-
- create("arm") {
- dimension = "abi"
- ndk {
- abiFilters += listOf("armeabi-v7a")
- }
- }
-
- create("x86") {
- dimension = "abi"
- ndk {
- abiFilters += listOf("x86")
- }
- }
-
- create("x86_64") {
- dimension = "abi"
- ndk {
- abiFilters += listOf("x86_64")
- }
- }
+ create("arm64") {
+ dimension = "abi"
+ ndk {
+ abiFilters += listOf("arm64-v8a")
+ }
}
- assetPacks += mutableSetOf()
- namespace = "net.nymtech.nym_connect_android"
+ create("arm") {
+ dimension = "abi"
+ ndk {
+ abiFilters += listOf("armeabi-v7a")
+ }
+ }
+
+ create("x86") {
+ dimension = "abi"
+ ndk {
+ abiFilters += listOf("x86")
+ }
+ }
+
+ create("x86_64") {
+ dimension = "abi"
+ ndk {
+ abiFilters += listOf("x86_64")
+ }
+ }
+ }
+
+ assetPacks += mutableSetOf()
+ namespace = "net.nymtech.nym_connect_android"
}
rust {
- rootDirRel = "../../../../"
- targets = listOf("aarch64", "armv7", "i686", "x86_64")
- arches = listOf("arm64", "arm", "x86", "x86_64")
+ rootDirRel = "../../../../"
+ targets = listOf("aarch64", "armv7", "i686", "x86_64")
+ arches = listOf("arm64", "arm", "x86", "x86_64")
}
dependencies {
- implementation("androidx.webkit:webkit:1.5.0")
- implementation("androidx.appcompat:appcompat:1.5.1")
- implementation("com.google.android.material:material:1.7.0")
- testImplementation("junit:junit:4.13.2")
- androidTestImplementation("androidx.test.ext:junit:1.1.4")
- androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
+ implementation("androidx.webkit:webkit:1.5.0")
+ implementation("androidx.appcompat:appcompat:1.5.1")
+ implementation("com.google.android.material:material:1.7.0")
+ testImplementation("junit:junit:4.13.2")
+ androidTestImplementation("androidx.test.ext:junit:1.1.4")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
}
afterEvaluate {
- android.applicationVariants.all {
- tasks["mergeUniversalReleaseJniLibFolders"].dependsOn(tasks["rustBuildRelease"])
- tasks["mergeUniversalDebugJniLibFolders"].dependsOn(tasks["rustBuildDebug"])
- productFlavors.filter{ it.name != "universal" }.forEach { _ ->
- val archAndBuildType = name.capitalize()
- tasks["merge${archAndBuildType}JniLibFolders"].dependsOn(tasks["rustBuild${archAndBuildType}"])
- }
+ android.applicationVariants.all {
+ tasks["mergeUniversalReleaseJniLibFolders"].dependsOn(tasks["rustBuildRelease"])
+ tasks["mergeUniversalDebugJniLibFolders"].dependsOn(tasks["rustBuildDebug"])
+ productFlavors.filter { it.name != "universal" }.forEach { _ ->
+ val archAndBuildType = name.capitalize()
+ tasks["merge${archAndBuildType}JniLibFolders"].dependsOn(tasks["rustBuild${archAndBuildType}"])
}
+ }
}
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/arm64-v8a/libnym_connect_android.so b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/arm64-v8a/libnym_connect_android.so
new file mode 120000
index 0000000000..5963e98ea2
--- /dev/null
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/arm64-v8a/libnym_connect_android.so
@@ -0,0 +1 @@
+/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/target/aarch64-linux-android/debug/libnym_connect_android.so
\ No newline at end of file
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/armeabi-v7a/libnym_connect_android.so b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/armeabi-v7a/libnym_connect_android.so
new file mode 120000
index 0000000000..28db5686bb
--- /dev/null
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/armeabi-v7a/libnym_connect_android.so
@@ -0,0 +1 @@
+/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/target/armv7-linux-androideabi/debug/libnym_connect_android.so
\ No newline at end of file
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/x86/libnym_connect_android.so b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/x86/libnym_connect_android.so
new file mode 120000
index 0000000000..3041208a37
--- /dev/null
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/jniLibs/x86/libnym_connect_android.so
@@ -0,0 +1 @@
+/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/target/i686-linux-android/debug/libnym_connect_android.so
\ No newline at end of file
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values-night/themes.xml b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values-night/themes.xml
index 4e5d6f7ccf..7178979168 100644
--- a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values-night/themes.xml
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values-night/themes.xml
@@ -2,15 +2,15 @@
-
+
\ No newline at end of file
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/colors.xml b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/colors.xml
index f8c6127d32..fccc70b8de 100644
--- a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/colors.xml
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/colors.xml
@@ -1,10 +1,9 @@
- #FFBB86FC
- #FF6200EE
- #FF3700B3
- #FF03DAC5
- #FF018786
+ #212121
+ #424242
+ #4caf50
+ #1b5e20
#FF000000
#FFFFFFFF
\ No newline at end of file
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/strings.xml b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/strings.xml
index 95988e4202..74cf5d6f34 100644
--- a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/strings.xml
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
- nym-connect-android
+ Nym Connect
\ No newline at end of file
diff --git a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/themes.xml b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/themes.xml
index 8e37feb691..1de86a4c9a 100644
--- a/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/themes.xml
+++ b/nym-connect-android/src-tauri/gen/android/nym-connect-android/app/src/main/res/values/themes.xml
@@ -2,12 +2,12 @@