diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png index d35370d878..850daa2d13 100644 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 1.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 1.png new file mode 100644 index 0000000000..d5c5cc5587 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 1.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 2.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 2.png new file mode 100644 index 0000000000..ad6bc2f522 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 2.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 3.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 3.png new file mode 100644 index 0000000000..84e64bf8a8 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 3.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 4.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 4.png new file mode 100644 index 0000000000..4c025b8744 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 4.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 5.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 5.png new file mode 100644 index 0000000000..e3ad37ebf7 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 5.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 6.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 6.png new file mode 100644 index 0000000000..8fcb412254 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 6.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 7.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 7.png new file mode 100644 index 0000000000..916176dd67 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 7.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 8.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 8.png new file mode 100644 index 0000000000..ba01b22695 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 8.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 9.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 9.png new file mode 100644 index 0000000000..6dfe0ee0b1 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/Tablet 9.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/countryScreenTablet10.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/countryScreenTablet10.png deleted file mode 100644 index f241af657a..0000000000 Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/countryScreenTablet10.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/homeScreenTablet10.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/homeScreenTablet10.png deleted file mode 100644 index f06cd8c7c9..0000000000 Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/homeScreenTablet10.png and /dev/null differ diff --git a/nym-vpn-android/app/src/main/AndroidManifest.xml b/nym-vpn-android/app/src/main/AndroidManifest.xml index 13db5958b2..98366021ad 100644 --- a/nym-vpn-android/app/src/main/AndroidManifest.xml +++ b/nym-vpn-android/app/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ android:supportsRtl="true" android:theme="@style/Theme.NymVPN" tools:node="merge" - tools:targetApi="33"> + tools:targetApi="tiramisu"> - - () - installSplashScreen().apply { setKeepOnScreenCondition { !appViewModel.isAppReady.value } } - this.resetTile() + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.auto(TRANSPARENT, TRANSPARENT), + navigationBarStyle = SystemBarStyle.auto(TRANSPARENT, TRANSPARENT), + ) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + window.isNavigationBarContrastEnforced = false + } + + super.onCreate(savedInstanceState) + + resetTile() setContent { val appState by appViewModel.uiState.collectAsStateWithLifecycle(lifecycle) diff --git a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Color.kt b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Color.kt index 9c7ac21ec4..440a2043c6 100644 --- a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Color.kt +++ b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Color.kt @@ -36,7 +36,7 @@ sealed class ThemeColors( secondary = secondary, onBackground = Color(0xFF1C1B1F), onSurface = Color(0xFF1C1B1F), - onPrimary = Color(0xFFEBEEF4), + onPrimary = Color(0xFF1C1B1F), onSurfaceVariant = Color(0xFF79747E), onSecondary = Color(0xFFA4A4A4), surfaceContainer = Color(0xFFFFFFFF), diff --git a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Theme.kt b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Theme.kt index 6e544266f3..a4dc630334 100644 --- a/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Theme.kt +++ b/nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/theme/Theme.kt @@ -82,9 +82,12 @@ fun NymVPNTheme(theme: Theme, content: @Composable () -> Unit) { SideEffect { val window = (view.context as Activity).window WindowCompat.setDecorFitsSystemWindows(window, false) - window.statusBarColor = Color.Transparent.toArgb() window.navigationBarColor = Color.Transparent.toArgb() - WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = !isDark + window.statusBarColor = Color.Transparent.toArgb() + WindowCompat.getInsetsController(window, window.decorView).apply { + isAppearanceLightStatusBars = !isDark + isAppearanceLightNavigationBars = !isDark + } } } diff --git a/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 7353dbd1fd..036d09bc5f 100644 --- a/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 7353dbd1fd..036d09bc5f 100644 --- a/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/nym-vpn-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c15500c737..e0d23672b0 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp index e97034da2b..da02c5a9e9 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and b/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index 1c5e56cd0d..c6c97056ea 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/nym-vpn-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher.webp index a35fd741ce..ed7d3935e3 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp index d9a890a385..279785f99d 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and b/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 83467fb7a4..2c31114570 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/nym-vpn-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 879f0b956a..89b3a5b3dd 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp index 360f31226a..8a04b4f65b 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and b/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 456fdd7df2..830e27a0b6 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/nym-vpn-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 61fb308fd4..89a7e368f0 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp index ff8ab99235..e5e7a476d0 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and b/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index fa3746f8ab..5213fe1976 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/nym-vpn-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index 8e4e06d0c1..aa9b1b4e92 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp index a2792c176f..f2f9f5b23c 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and b/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 847d35230d..cf3bab8884 100644 Binary files a/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/nym-vpn-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/nym-vpn-android/app/src/main/res/values/themes.xml b/nym-vpn-android/app/src/main/res/values/themes.xml index b9b35615fc..4b58f811ca 100644 --- a/nym-vpn-android/app/src/main/res/values/themes.xml +++ b/nym-vpn-android/app/src/main/res/values/themes.xml @@ -1,14 +1,12 @@ - +