diff --git a/nym-connect-android/src-tauri/Cargo.lock b/nym-connect-android/src-tauri/Cargo.lock index 942d318fb4..1d419591d2 100644 --- a/nym-connect-android/src-tauri/Cargo.lock +++ b/nym-connect-android/src-tauri/Cargo.lock @@ -410,7 +410,7 @@ name = "build-information" version = "0.1.0" dependencies = [ "serde", - "vergen 7.5.0", + "vergen 7.5.1", ] [[package]] @@ -564,9 +564,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" dependencies = [ "bitflags", "clap_derive", @@ -579,18 +579,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" +checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe" dependencies = [ "clap", ] [[package]] name = "clap_complete_fig" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0c76d8fcf782a1102ccfcd10ca8246e7fdd609c1cd6deddbb96cb638e9bb5c" +checksum = "63a06158a72dbb088f864887b4409fd22600ba379f3cee3040f842234cc5c2d0" dependencies = [ "clap", "clap_complete", @@ -652,7 +652,7 @@ dependencies = [ "tap", "task", "thiserror", - "time 0.3.17", + "time 0.3.18", "tokio", "tokio-stream", "topology", @@ -1246,9 +1246,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -1258,9 +1258,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -1273,15 +1273,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", @@ -1605,9 +1605,9 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187" +checksum = "9ea166b3f7dc1032f7866d13f8d8e02c8d87507b61750176b86554964dc6a7bf" dependencies = [ "enum-iterator-derive 1.1.0", ] @@ -1694,9 +1694,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1743,14 +1743,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2188,19 +2188,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "git2" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "git2" version = "0.16.1" @@ -2523,9 +2510,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hex" @@ -2890,7 +2877,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" dependencies = [ - "hermit-abi 0.3.0", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", "windows-sys 0.45.0", @@ -3227,7 +3214,7 @@ dependencies = [ "dirs-next", "objc-foundation", "objc_id", - "time 0.3.17", + "time 0.3.18", ] [[package]] @@ -3312,14 +3299,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -3448,9 +3435,9 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce656bb6d22a93ae276a23de52d1aec5ba4db3ece3c0eb79dfd5add7384db6a" +checksum = "260208751689b605138bb55ab6af43ad75f628619a7e0b818d63bf6629e59467" dependencies = [ "dbus", "mac-notification-sys", @@ -3643,7 +3630,7 @@ dependencies = [ "serde_json", "serde_repr", "thiserror", - "time 0.3.17", + "time 0.3.18", ] [[package]] @@ -3908,9 +3895,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -4368,7 +4355,7 @@ dependencies = [ "line-wrap", "quick-xml 0.26.0", "serde", - "time 0.3.17", + "time 0.3.18", ] [[package]] @@ -4868,9 +4855,9 @@ dependencies = [ [[package]] name = "rfd" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2583255eadc4e0d816cb7648371cc91e49cbac85b0748b6ab417093bff4040" +checksum = "1fe3bae427b011620cf4436d5dd7405c1a86dce3dfcdc0cda12b41fd31569ac3" dependencies = [ "block", "dispatch", @@ -5261,9 +5248,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa 1.0.5", "ryu", @@ -5431,9 +5418,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -6096,7 +6083,7 @@ dependencies = [ "sha2 0.10.6", "tauri-utils", "thiserror", - "time 0.3.17", + "time 0.3.18", "url", "uuid 1.3.0", "walkdir", @@ -6236,7 +6223,7 @@ dependencies = [ "subtle 2.4.1", "subtle-encoding", "tendermint-proto", - "time 0.3.17", + "time 0.3.18", "zeroize", ] @@ -6269,7 +6256,7 @@ dependencies = [ "serde", "serde_bytes", "subtle-encoding", - "time 0.3.17", + "time 0.3.18", ] [[package]] @@ -6297,7 +6284,7 @@ dependencies = [ "tendermint-config", "tendermint-proto", "thiserror", - "time 0.3.17", + "time 0.3.18", "tokio", "tracing", "url", @@ -6353,10 +6340,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -6373,9 +6361,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "af0097eaf301d576d0b2aead7a59facab6d53cc636340f0291fab8446a2e8613" dependencies = [ "itoa 1.0.5", "js-sys", @@ -6500,9 +6488,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -6856,7 +6844,7 @@ dependencies = [ "chrono", "enum-iterator 0.8.1", "getset", - "git2 0.16.1", + "git2", "rustc_version 0.4.0", "rustversion", "thiserror", @@ -6864,19 +6852,19 @@ dependencies = [ [[package]] name = "vergen" -version = "7.5.0" +version = "7.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571b69f690c855821462709b6f41d42ceccc316fbd17b60bd06d06928cfe6a99" +checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749" dependencies = [ "anyhow", "cfg-if", - "enum-iterator 1.2.0", + "enum-iterator 1.3.0", "getset", - "git2 0.15.0", + "git2", "rustc_version 0.4.0", "rustversion", "thiserror", - "time 0.3.17", + "time 0.3.18", ] [[package]] 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..cf8fdbfa28 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 @@ -94,6 +94,7 @@ dependencies { implementation("androidx.webkit:webkit:1.5.0") implementation("androidx.appcompat:appcompat:1.5.1") implementation("com.google.android.material:material:1.7.0") + implementation("androidx.core:core-splashscreen:1.0.0") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.4") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0") 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 7178979168..7416b4c5cb 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 @@ -12,5 +12,8 @@ ?attr/colorPrimaryVariant + @color/grey_900 + @mipmap/ic_launcher_round + @style/Theme.nym_connect_android \ 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 7178979168..7416b4c5cb 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 @@ -12,5 +12,8 @@ ?attr/colorPrimaryVariant + @color/grey_900 + @mipmap/ic_launcher_round + @style/Theme.nym_connect_android \ No newline at end of file diff --git a/nym-connect-android/src/components/ConnectionStatus.tsx b/nym-connect-android/src/components/ConnectionStatus.tsx index 0a04f4993f..4ee49c5e14 100644 --- a/nym-connect-android/src/components/ConnectionStatus.tsx +++ b/nym-connect-android/src/components/ConnectionStatus.tsx @@ -38,6 +38,7 @@ const ConnectionStatusContent: FCWithChildren<{ justifyContent="center" sx={{ cursor: 'pointer' }} color="warning.main" + onClick={() => setShowGatewayWarn(true)} > {onClose && ( - - + + )} diff --git a/nym-connect-android/src/components/TooltipInfo.tsx b/nym-connect-android/src/components/TooltipInfo.tsx index 438d9f8da3..678b5337ed 100644 --- a/nym-connect-android/src/components/TooltipInfo.tsx +++ b/nym-connect-android/src/components/TooltipInfo.tsx @@ -3,7 +3,7 @@ import { Divider, Stack, Typography } from '@mui/material'; import { ServiceProvider } from 'src/types/directory'; export const ServiceProviderInfo = ({ serviceProvider }: { serviceProvider: ServiceProvider }) => ( - + Gateway {serviceProvider.gateway} @@ -15,7 +15,7 @@ export const ServiceProviderInfo = ({ serviceProvider }: { serviceProvider: Serv ); export const GatwayWarningInfo = () => ( - + Try disconnecting and connecting again );