Merge branch 'migrate-material-3-library-to-111-droid-199'

4 files changed, 52 insertions, 55 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
index 447b8c6768..b66cb555b2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
@@ -33,12 +33,12 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.cell.RelayLocationCell
-import net.mullvad.mullvadvpn.compose.component.SearchTextField
 import net.mullvad.mullvadvpn.compose.component.textResource
 import net.mullvad.mullvadvpn.compose.constant.ContentType
 import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString
 import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState
 import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
+import net.mullvad.mullvadvpn.compose.textfield.SearchTextField
 import net.mullvad.mullvadvpn.compose.theme.AppTheme
 import net.mullvad.mullvadvpn.compose.theme.Dimens
 import net.mullvad.mullvadvpn.relaylist.RelayCountry
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SearchTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt
index c7e24883a1..8e68e7e2a0 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SearchTextField.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.compose.component
+package net.mullvad.mullvadvpn.compose.textfield
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -66,7 +66,7 @@ fun SearchTextField(
         cursorBrush = SolidColor(MaterialTheme.colorScheme.onSecondary),
         decorationBox =
             @Composable { innerTextField ->
-                TextFieldDefaults.TextFieldDecorationBox(
+                TextFieldDefaults.DecorationBox(
                     value = searchTerm,
                     innerTextField = innerTextField,
                     enabled = enabled,
@@ -91,13 +91,16 @@ fun SearchTextField(
                     },
                     shape = MaterialTheme.shapes.medium,
                     colors =
-                        TextFieldDefaults.textFieldColors(
-                            textColor = MaterialTheme.colorScheme.onSecondary,
-                            containerColor = backgroundColor,
+                        TextFieldDefaults.colors(
+                            focusedTextColor = MaterialTheme.colorScheme.onSecondary,
+                            unfocusedTextColor = MaterialTheme.colorScheme.onSecondary,
+                            focusedContainerColor = backgroundColor,
+                            unfocusedContainerColor = backgroundColor,
                             focusedIndicatorColor = Color.Transparent,
                             unfocusedIndicatorColor = Color.Transparent,
                             cursorColor = MaterialTheme.colorScheme.onSecondary,
-                            placeholderColor = MaterialTheme.colorScheme.onSecondary
+                            focusedPlaceholderColor = MaterialTheme.colorScheme.onSecondary,
+                            unfocusedPlaceholderColor = MaterialTheme.colorScheme.onSecondary
                         ),
                     contentPadding = PaddingValues(),
                 )
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index cf41917e6f..6590476f8f 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -44,7 +44,7 @@ object Versions {
         const val composeCollapsingToolbar = "2.3.5"
         const val constrainLayout = "1.0.1"
         const val foundation = base
-        const val material3 = "1.0.1"
+        const val material3 = "1.1.1"
         const val uiController = "0.30.1"
         const val viewModelLifecycle = "2.6.1"
     }
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index d824c6dabe..c80a21d839 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -64,6 +64,11 @@
             <sha256 value="2a746b0126a8ab2f576e7167f1a785b452ef7ee997abd979ee0c5a29c36f6ea6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity-compose" version="1.5.0">
+         <artifact name="activity-compose-1.5.0.module">
+            <sha256 value="bdd71e60ef32abd6d7d8ba82b5052e81b26e5a47dad447ab8f35e5f0e399e0c8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity-compose" version="1.5.1">
          <artifact name="activity-compose-1.5.1.aar">
             <sha256 value="8374138f15251cc3ed375425599e94a36038c05cf877f877281ae019b95b844a" origin="Generated by Gradle"/>
@@ -237,6 +242,11 @@
             <sha256 value="c4e548544f21d977ef7a80aeb8e388feb628c6bbf9099325559bbd8adb6992d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation" version="1.4.1">
+         <artifact name="animation-1.4.1.module">
+            <sha256 value="4f80d4941ac9d4547f4138725103ec728ca57d649b44b6b94cfbb86eb2e7cf0c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation" version="1.4.3">
          <artifact name="animation-1.4.3.aar">
             <sha256 value="bc00f44dad4c7b8dc7d73210797c9efacef6b029c8d0a46f50e203bbc9f0f9af" origin="Generated by Gradle"/>
@@ -245,11 +255,6 @@
             <sha256 value="d5b8621503f053f60186256dfc7f4ab45337b98228152751d7b22103cea2cf4b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.animation" name="animation-core" version="1.1.1">
-         <artifact name="animation-core-1.1.1.module">
-            <sha256 value="6834b1b466930369a6cb9f76df6257eff28428e42ef42a26515319638cceee3d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.compose.animation" name="animation-core" version="1.2.1">
          <artifact name="animation-core-1.2.1.aar">
             <sha256 value="e1a44dc558d1966e3345f5c51f63afaaf2b5aeea20f478f026594363ae910675" origin="Generated by Gradle"/>
@@ -258,9 +263,9 @@
             <sha256 value="9083ac53ad162f4167ecfb895469943504f4cd6a624e612936a5209144c5b6bf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.animation" name="animation-core" version="1.3.0">
-         <artifact name="animation-core-1.3.0.module">
-            <sha256 value="56c39013b7c99ccd0339badfef4452972d412dcd9862447ebf0788cde77eb698" origin="Generated by Gradle"/>
+      <component group="androidx.compose.animation" name="animation-core" version="1.4.1">
+         <artifact name="animation-core-1.4.1.module">
+            <sha256 value="681ee4ed6f028adcfb0d32bdaf238e877df35167f9757f5689bff801e3cbe9a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.compose.animation" name="animation-core" version="1.4.3">
@@ -306,51 +311,40 @@
          </artifact>
       </component>
       <component group="androidx.compose.material" name="material" version="1.3.0">
-         <artifact name="material-1.3.0.aar">
-            <sha256 value="568d02b36161968a899659e48cc0f901f2c14d7abab5b3e7890d31ca5bd1864e" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="material-1.3.0.module">
             <sha256 value="9f9e1162be3c13b77e0052cb075a152ee6a93bb2f6bef88fdcd73b6e4ce56ee8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.material" name="material-icons-core" version="1.0.2">
-         <artifact name="material-icons-core-1.0.2.aar">
-            <sha256 value="6a508acc9cc3ef872a9c445dce34e980ac39050edbf8e161d441b4a8c518f2f0" origin="Generated by Gradle"/>
+      <component group="androidx.compose.material" name="material" version="1.4.1">
+         <artifact name="material-1.4.1.aar">
+            <sha256 value="cb665f71b912a5973ac47653a3592d819c0ba792bdfdfe147a66faf1b7665fa7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-icons-core-1.0.2.module">
-            <sha256 value="c7e4c1410a139154b7e236b1cf4dc248a91d4c0f8e486ed6a2cdcf57fbc86f17" origin="Generated by Gradle"/>
+         <artifact name="material-1.4.1.module">
+            <sha256 value="66666f80df594463f85b756e524118cb56e3743a77631a6b0e2989a60b68613f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.material" name="material-icons-core" version="1.3.0">
-         <artifact name="material-icons-core-1.3.0.aar">
-            <sha256 value="587af5671ed6a1c6b1b6bfbf54bc63285692610abf9524e0318b19a4eee8a512" origin="Generated by Gradle"/>
+      <component group="androidx.compose.material" name="material-icons-core" version="1.4.1">
+         <artifact name="material-icons-core-1.4.1.aar">
+            <sha256 value="8c7fddd42a36b1108d23bd9ee61e974ab058532d08c8c2f2f55fdead904f4a97" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-icons-core-1.3.0.module">
-            <sha256 value="9014fba2e8ee93635dc70ed0f4c5b46fba1eb7ed34eb6332016f8846085f9c54" origin="Generated by Gradle"/>
+         <artifact name="material-icons-core-1.4.1.module">
+            <sha256 value="a351e6f3e4d99e14b9f653bb7a4f5d53b68beb9906d3b031c078cd79088baf88" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.material" name="material-ripple" version="1.0.0">
-         <artifact name="material-ripple-1.0.0.aar">
-            <sha256 value="0d3ac24c815fba15c57e1ca03f406399cd69ac1e41e390f61258c22a3226f550" origin="Generated by Gradle"/>
+      <component group="androidx.compose.material" name="material-ripple" version="1.4.1">
+         <artifact name="material-ripple-1.4.1.aar">
+            <sha256 value="1efdefc8dacf903cbcd06a33d41c6fa3a21dc9b1b9d798798547df0356e3b3aa" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-ripple-1.0.0.module">
-            <sha256 value="03eb853a7cb720707b49a50c29a16089033cc905b6cabe3220358c34902100b1" origin="Generated by Gradle"/>
+         <artifact name="material-ripple-1.4.1.module">
+            <sha256 value="2e86f0958ee36bd4638fc862cec92681a81b507a043d41b494324466e2d75847" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.material" name="material-ripple" version="1.3.0">
-         <artifact name="material-ripple-1.3.0.aar">
-            <sha256 value="d481800a414176a1cbe56a27ec517301a485d697047e6b76b5de7e6345382455" origin="Generated by Gradle"/>
+      <component group="androidx.compose.material3" name="material3" version="1.1.1">
+         <artifact name="material3-1.1.1.aar">
+            <sha256 value="93981e288632b43e585a0f73a237c5c926cccb75203a11fe5d8aa694b1f2d057" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-ripple-1.3.0.module">
-            <sha256 value="793e9bed644c0481b9f896fe172b3800d1da45463dcfcee784d336d9d5a9b5e9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.compose.material3" name="material3" version="1.0.1">
-         <artifact name="material3-1.0.1.aar">
-            <sha256 value="7204378ecadec4089da57492fbdb4cb637758e4bc740f26fe6f2db4d8876af05" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="material3-1.0.1.module">
-            <sha256 value="993a826a5cb89f2932d7e0d9dc2dc071c7b6f684420f93b304bd07ddbbfb902b" origin="Generated by Gradle"/>
+         <artifact name="material3-1.1.1.module">
+            <sha256 value="ae1777c22c67686561e3eb2bc2449ddc8ddedf38c3d139cfec56c0629b29ba34" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.compose.runtime" name="runtime" version="1.2.1">
@@ -390,16 +384,16 @@
             <sha256 value="43a9ea188350a9d24c03dda08a76798940a63c8946b36db8fd869ba49adc045c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.ui" name="ui-graphics" version="1.0.1">
-         <artifact name="ui-graphics-1.0.1.module">
-            <sha256 value="ad9ce40deec721b8988c43ab847d803d00bee88c67cfc838dee565691f35db95" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.compose.ui" name="ui-graphics" version="1.2.1">
          <artifact name="ui-graphics-1.2.1.module">
             <sha256 value="916e913d73c90dadd59e4e511158e838e3651d29f6eba06950210f31caa6d7b3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-graphics" version="1.4.1">
+         <artifact name="ui-graphics-1.4.1.module">
+            <sha256 value="a3ca7fbd40e359eaeda8d869d91984ee1affb443155986d15f0c1aa4ad5cd7ef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-graphics" version="1.4.3">
          <artifact name="ui-graphics-1.4.3.aar">
             <sha256 value="298cdc2ff4ea610a22b01f666a460239aa260f2467f7762d575d84e773545b2d" origin="Generated by Gradle"/>
@@ -437,9 +431,9 @@
             <sha256 value="96379248c6ddfef9566edcf39558c478d265bb99dbdaa34d6c02cc40567c4f88" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.ui" name="ui-text" version="1.3.1">
-         <artifact name="ui-text-1.3.1.module">
-            <sha256 value="7808e6a9bb1ebd8b208b0ab3b206ddc5d4254ace63657d636b463b71983c54d3" origin="Generated by Gradle"/>
+      <component group="androidx.compose.ui" name="ui-text" version="1.4.1">
+         <artifact name="ui-text-1.4.1.module">
+            <sha256 value="245704b923e77368b9c672e8a70de7ce93bee2386a2b9b239c07dad5afe4861c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.compose.ui" name="ui-text" version="1.4.3">