From 047b3be16cbb5430668583de3e113825ced51f4f Mon Sep 17 00:00:00 2001
From: Jonatan Rhodin <jonatan.rhodin@mullvad.net>
Date: Thu, 20 Jun 2024 16:04:00 +0200
Subject: [PATCH] Update compose to 1.7.0-beta03

Also update some related libraries that were required

This fixes a crash on release build
---
 android/app/lint-baseline.xml                 |  4 ++--
 .../component/MullvadModalBottomSheet.kt      |  2 +-
 .../AutoConnectAndLockdownModeScreen.kt       |  2 +-
 .../compose/textfield/TextFieldColors.kt      |  6 +++++-
 android/buildSrc/src/main/kotlin/Versions.kt  | 16 +++++++-------
 .../net/mullvad/mullvadvpn/lib/theme/Theme.kt | 21 ++++++++-----------
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml
index 0ab48b375dca..9f67e68efad6 100644
--- a/android/app/lint-baseline.xml
+++ b/android/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0)" variant="all" version="8.3.0">
+<issues format="6" by="lint 8.4.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0)" variant="all" version="8.4.0">
 
     <issue
         id="UseCheckPermission"
@@ -25,7 +25,7 @@
 
     <issue
         id="QueryAllPackagesPermission"
-        message="A `&lt;queries>` declaration should generally be used instead of QUERY_ALL_PACKAGES; \&#xA;see https://g.co/dev/packagevisibility for details"
+        message="A `&lt;queries>` declaration should generally be used instead of QUERY_ALL_PACKAGES; see https://g.co/dev/packagevisibility for details"
         errorLine1="    &lt;uses-permission android:name=&quot;android.permission.QUERY_ALL_PACKAGES&quot; />"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt
index edd697dfece1..9cbd5df5bee0 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt
@@ -59,7 +59,7 @@ fun MullvadModalBottomSheet(
         sheetState = sheetState,
         containerColor = backgroundColor,
         modifier = modifier,
-        windowInsets = WindowInsets(0, 0, 0, 0), // No insets
+        contentWindowInsets = { WindowInsets(0, 0, 0, 0) }, // No insets
         dragHandle = { BottomSheetDefaults.DragHandle(color = onBackgroundColor) }
     ) {
         sheetContent()
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
index 95d5ca6dcf27..72d984b859a8 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
@@ -160,7 +160,7 @@ private fun ConstraintLayoutScope.AutoConnectCarousel(
 ) {
     HorizontalPager(
         state = pagerState,
-        beyondBoundsPageCount = 2,
+        beyondViewportPageCount = 2,
         modifier =
             Modifier.constrainAs(pager) {
                 top.linkTo(parent.top)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt
index 69b387ee7ade..3cae49889196 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt
@@ -36,7 +36,11 @@ fun mullvadWhiteTextFieldColors(): TextFieldColors =
         unfocusedSupportingTextColor = Color.Black,
         focusedIndicatorColor = MaterialTheme.colorScheme.onPrimary,
         unfocusedIndicatorColor = MaterialTheme.colorScheme.onPrimary,
-        errorIndicatorColor = MaterialTheme.colorScheme.error
+        errorIndicatorColor = MaterialTheme.colorScheme.error,
+        focusedContainerColor = MaterialTheme.colorScheme.onBackground,
+        unfocusedContainerColor = MaterialTheme.colorScheme.onBackground,
+        errorContainerColor = MaterialTheme.colorScheme.onBackground,
+        disabledContainerColor = MaterialTheme.colorScheme.onBackground
     )
 
 @Preview
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index e9772e555cea..e4bd866e7847 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -4,8 +4,8 @@ object Versions {
     const val junit = "5.10.2"
     const val jvmTarget = "17"
     const val konsist = "0.14.0"
-    const val kotlin = "1.9.22"
-    const val kotlinCompilerExtensionVersion = "1.5.10"
+    const val kotlin = "1.9.24"
+    const val kotlinCompilerExtensionVersion = "1.5.14"
     const val kotlinx = "1.8.0"
     const val leakCanary = "2.13"
     const val mockk = "1.13.11"
@@ -22,7 +22,7 @@ object Versions {
     }
 
     object AndroidX {
-        const val appcompat = "1.6.1"
+        const val appcompat = "1.7.0"
         const val coreKtx = "1.12.0"
         const val espresso = "3.5.1"
         const val lifecycle = "2.8.2"
@@ -40,10 +40,10 @@ object Versions {
 
     object Compose {
         const val destinations = "1.10.2"
-        const val base = "1.6.3"
+        const val base = "1.7.0-beta03"
         const val constrainLayout = "1.0.1"
         const val foundation = base
-        const val material3 = "1.2.1"
+        const val material3 = "1.3.0-beta03"
     }
 
     object Grpc {
@@ -56,8 +56,8 @@ object Versions {
         // The androidAapt plugin version must be in sync with the android plugin version.
         // Required for Gradle metadata verification to work properly, see:
         // https://github.com/gradle/gradle/issues/19228
-        const val android = "8.3.0"
-        const val androidAapt = "$android-10880808"
+        const val android = "8.4.0"
+        const val androidAapt = "$android-11315950"
         const val playPublisher = "3.9.0"
         const val protobuf = "0.9.4"
         const val dependencyCheck = "9.0.9"
@@ -67,7 +67,7 @@ object Versions {
         const val ktfmt = "0.17.0"
         // Ksp version is linked with kotlin version, find matching release here:
         // https://github.com/google/ksp/releases
-        const val ksp = "${kotlin}-1.0.17"
+        const val ksp = "${kotlin}-1.0.20"
     }
 
     object Koin {
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
index 69096ceccbb6..554eb6d4217b 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
@@ -1,17 +1,16 @@
 package net.mullvad.mullvadvpn.lib.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ripple.LocalRippleTheme
 import androidx.compose.material.ripple.RippleAlpha
-import androidx.compose.material.ripple.RippleTheme
-import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LocalRippleConfiguration
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RippleConfiguration
 import androidx.compose.material3.Shapes
 import androidx.compose.material3.Typography
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -137,6 +136,7 @@ fun ProvideDimens(dimensions: Dimensions, content: @Composable () -> Unit) {
 
 private val LocalAppDimens = staticCompositionLocalOf { defaultDimensions }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AppTheme(content: @Composable () -> Unit) {
     val colors = darkColorScheme
@@ -150,15 +150,12 @@ fun AppTheme(content: @Composable () -> Unit) {
             shapes = Shapes,
             typography = typography,
             content = {
-                CompositionLocalProvider(LocalRippleTheme provides MullvadRippleTheme) { content() }
+                CompositionLocalProvider(
+                    LocalRippleConfiguration provides RippleConfiguration(rippleAlpha = rippleAlpha)
+                ) {
+                    content()
+                }
             }
         )
     }
 }
-
-@Immutable
-object MullvadRippleTheme : RippleTheme {
-    @Composable override fun defaultColor() = LocalContentColor.current
-
-    @Composable override fun rippleAlpha() = rippleAlpha
-}