Migrate to Compose Destinations

5 files changed, 9 insertions, 12 deletions

diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
index c95c8c9111..fe9564c45d 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
@@ -8,7 +8,6 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import android.service.quicksettings.Tile
-import android.widget.Toast
 
 object SdkUtils {
     fun getSupportedPendingIntentFlags(): Int {
@@ -41,10 +40,4 @@ object SdkUtils {
         } else {
             @Suppress("DEPRECATION") getInstalledPackages(flags)
         }
-
-    fun showCopyToastIfNeeded(context: Context, message: String) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
-        }
-    }
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountHistory.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountHistory.kt
index 008eb1ea7a..f003ee316b 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountHistory.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountHistory.kt
@@ -1,7 +1,7 @@
 package net.mullvad.mullvadvpn.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 sealed class AccountHistory : Parcelable {
     @Parcelize data class Available(val accountToken: String) : AccountHistory()
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index 0b690671ac..836f72cadc 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -171,7 +171,9 @@
     <string name="vpn_permission_error_notification_title">VPN permission error</string>
     <string name="vpn_permission_error_notification_message">Always-on VPN might be enabled for another app</string>
     <string name="new_device_notification_title">NEW DEVICE CREATED</string>
-    <string name="new_device_notification_message"><![CDATA[Welcome, this device is now called <b>%s</b>. For more details see the info button in Account.]]></string>
+    <string name="new_device_notification_message">
+        <![CDATA[Welcome, this device is now called <b>%s</b>. For more details see the info button in Account.]]>
+    </string>
     <string name="agree_and_continue">Agree and continue</string>
     <string name="privacy_disclaimer_title">Privacy</string>
     <string name="privacy_disclaimer_body_first_paragraph">To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you.</string>
diff --git a/android/lib/resource/src/main/res/values/styles.xml b/android/lib/resource/src/main/res/values/styles.xml
index 69ee118cac..5c94a24ebf 100644
--- a/android/lib/resource/src/main/res/values/styles.xml
+++ b/android/lib/resource/src/main/res/values/styles.xml
@@ -1,8 +1,8 @@
 <resources>
     <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="android:navigationBarColor">@color/blue</item>
-        <item name="android:statusBarColor">@color/blue</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowBackground">@color/blue</item>
         <item name="android:spotShadowAlpha">0</item>
         <item name="actionBarSize">48dp</item>
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
index c9eb73e9ad..1f131b9aac 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
@@ -70,9 +70,11 @@ data class Dimensions(
     val smallIconSize: Dp = 16.dp,
     val smallPadding: Dp = 8.dp,
     val spacingAboveButton: Dp = 22.dp,
+    val splashLogoSize: Dp = 120.dp,
+    val splashLogoTextHeight: Dp = 18.dp,
     val successIconVerticalPadding: Dp = 26.dp,
     val switchIconSize: Dp = 24.dp,
-    val titleIconSize: Dp = 24.dp,
+    val titleIconSize: Dp = 48.dp,
     val topBarHeight: Dp = 64.dp,
     val verticalDividerPadding: Dp = 12.dp,
     val verticalSpace: Dp = 20.dp,