diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-05-07 09:30:47 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-05-07 09:30:47 +0200 |
| commit | 95bb5d4a6ecc83fb9a968fff941812231128d14f (patch) | |
| tree | 1dab3727a500e36f213635c56f2c39bcb29000b7 /android | |
| parent | f7aefa938f8047e8e59fd98ee0175545d585c822 (diff) | |
| parent | 7fb0b567faaff21c60009107a44840438ed67644 (diff) | |
| download | mullvadvpn-95bb5d4a6ecc83fb9a968fff941812231128d14f.tar.xz mullvadvpn-95bb5d4a6ecc83fb9a968fff941812231128d14f.zip | |
Merge branch 'update-compose-to-180-droid-1969'
Diffstat (limited to 'android')
10 files changed, 401 insertions, 600 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt index c0a005ef40..08eec406bf 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt @@ -24,7 +24,10 @@ import net.mullvad.mullvadvpn.lib.ui.tag.LOCATION_INFO_CONNECTION_IN_TEST_TAG import net.mullvad.mullvadvpn.lib.ui.tag.LOCATION_INFO_CONNECTION_OUT_TEST_TAG @Composable -fun ConnectionDetailPanel(connectionDetails: ConnectionDetails) { +fun ConnectionDetailPanel( + connectionDetails: ConnectionDetails, + enableSelectableText: Boolean = true, +) { ConnectionInfoHeader( stringResource(R.string.connect_panel_connection_details), @@ -37,6 +40,7 @@ fun ConnectionDetailPanel(connectionDetails: ConnectionDetails) { it.outIpv4Address, it.outIpv6Address, modifier = Modifier.padding(bottom = Dimens.smallPadding), + enableSelectableText = enableSelectableText, ) } } @@ -48,6 +52,7 @@ fun ConnectionDetails( outIPV4: String?, outIPV6: String?, modifier: Modifier = Modifier, + enableSelectableText: Boolean = true, ) { ConstraintLayout(modifier = modifier.fillMaxWidth()) { val (inAddrHeader, inAddr, outAddrV4Header, outAddrV4, outAddrV6Header, outAddrV6) = @@ -131,15 +136,21 @@ fun ConnectionDetails( width = Dimension.fillToConstraints } ) { - SelectionContainer { - Text( - modifier = Modifier.testTag(LOCATION_INFO_CONNECTION_OUT_TEST_TAG), - text = outIPV4, - color = MaterialTheme.colorScheme.onPrimary, - style = MaterialTheme.typography.bodySmall, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) + val outIpV4Text = + @Composable { + Text( + modifier = Modifier.testTag(LOCATION_INFO_CONNECTION_OUT_TEST_TAG), + text = outIPV4, + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.bodySmall, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + if (enableSelectableText) { + SelectionContainer(content = outIpV4Text) + } else { + outIpV4Text() } } } @@ -176,14 +187,20 @@ fun ConnectionDetails( width = Dimension.fillToConstraints } ) { - SelectionContainer { - Text( - text = outIPV6, - color = MaterialTheme.colorScheme.onPrimary, - style = MaterialTheme.typography.bodySmall, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) + val outIpV6Text = + @Composable { + Text( + text = outIPV6, + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.bodySmall, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + if (enableSelectableText) { + SelectionContainer(content = outIpV6Text) + } else { + outIpV6Text() } } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt index afd13a7382..a485dbe9d9 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt @@ -1,4 +1,5 @@ @file:OptIn(ExperimentalSharedTransitionApi::class) +@file:Suppress("DEPRECATION") package net.mullvad.mullvadvpn.compose.component.connectioninfo diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt index 45e9bdee52..94db024b41 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt @@ -33,6 +33,7 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableLongStateOf import androidx.compose.runtime.mutableStateOf @@ -43,16 +44,14 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.layout -import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.platform.LocalUriHandler +import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow @@ -352,26 +351,12 @@ fun ConnectScreen( if (isTv()) { Scaffold( - modifier = - Modifier.focusProperties { - enter = { focusDirection -> - // When we return to this screen from SelectLocationScreen the focus is - // sometimes put on the TV navigation drawer, which causes it expand - // (when it was previously not expanded). When returning from - // SelectLocationScreen we get a FocusDirection.Down event, so we focus - // on the switch location composable. - // When on TV and we return from account or settings we get a - // FocusDirection.Enter event, so focus remains on the navigation drawer. - if (focusDirection == FocusDirection.Down) contentFocusRequester - else FocusRequester.Default - } - }, snackbarHost = { SnackbarHost( snackbarHostState, snackbar = { snackbarData -> MullvadSnackbar(snackbarData = snackbarData) }, ) - }, + } ) { NavigationDrawerTv( daysLeftUntilExpiry = state.daysLeftUntilExpiry, @@ -382,6 +367,7 @@ fun ConnectScreen( content(it) } } + LaunchedEffect(Unit) { contentFocusRequester.requestFocus() } } else { ScaffoldWithTopBarAndDeviceName( topBarColor = state.tunnelState.topBarColor(), @@ -414,8 +400,7 @@ private fun Content( onDismissNewDeviceClick: () -> Unit, onNavigateToFeature: (FeatureIndicator) -> Unit, ) { - val configuration = LocalConfiguration.current - val screenHeight = configuration.screenHeightDp.dp + val screenHeight = LocalWindowInfo.current.containerSize.height.dp val indicatorPercentOffset = if (screenHeight < SCREEN_HEIGHT_THRESHOLD) SHORT_SCREEN_INDICATOR_BIAS else TALL_SCREEN_INDICATOR_BIAS @@ -666,7 +651,7 @@ private fun ConnectionInfo( FeatureIndicatorsPanel(featureIndicators, expanded, onToggleExpand, onNavigateToFeature) if (expanded && connectionDetails != null) { - ConnectionDetailPanel(connectionDetails) + ConnectionDetailPanel(connectionDetails, enableSelectableText = !isTv()) } } } @@ -689,7 +674,7 @@ fun TunnelState.Connected.toConnectionsDetails(): ConnectionDetails = @Composable private fun ButtonPanel( state: ConnectUiState, - focusRequester: FocusRequester, + selectButtonFocusRequester: FocusRequester, onSwitchLocationClick: () -> Unit, onDisconnectClick: () -> Unit, onReconnectClick: () -> Unit, @@ -714,12 +699,18 @@ private fun ButtonPanel( stringResource(id = R.string.switch_location) }, onSwitchLocation = onSwitchLocationClick, - reconnectClick = { handleThrottledAction(onReconnectClick) }, + reconnectClick = { + handleThrottledAction { + onReconnectClick() + selectButtonFocusRequester.requestFocus() + } + }, isReconnectButtonEnabled = state.tunnelState is TunnelState.Connected || state.tunnelState is TunnelState.Connecting, modifier = - Modifier.testTag(SELECT_LOCATION_BUTTON_TEST_TAG).focusRequester(focusRequester), + Modifier.testTag(SELECT_LOCATION_BUTTON_TEST_TAG) + .focusRequester(selectButtonFocusRequester), reconnectButtonTestTag = RECONNECT_BUTTON_TEST_TAG, ) Spacer(Modifier.height(Dimens.buttonVerticalPadding)) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt index c2c3a72c35..b41a95d64e 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt @@ -32,6 +32,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource @@ -372,7 +373,8 @@ private fun RelayLists( ) { // This is a workaround for the HorizontalPager being broken on Android TV when it contains // focusable views and you navigate with the D-pad. Remove this code once DROID-1639 is fixed. - val configuration = LocalContext.current.resources.configuration + val configuration = LocalConfiguration.current + if (configuration.navigation == Configuration.NAVIGATION_DPAD) { SelectLocationList( backgroundColor = backgroundColor, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Clipboard.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Clipboard.kt index 55bc1855d3..3dbe8e7565 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Clipboard.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Clipboard.kt @@ -7,8 +7,7 @@ import androidx.compose.material3.SnackbarDuration import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.ui.platform.ClipboardManager -import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.LocalClipboard import androidx.compose.ui.platform.toClipEntry import kotlinx.coroutines.launch @@ -22,7 +21,7 @@ fun createCopyToClipboardHandle( isSensitive: Boolean, ): CopyToClipboardHandle { val scope = rememberCoroutineScope() - val clipboardManager: ClipboardManager = LocalClipboardManager.current + val clipboardManager = LocalClipboard.current return { textToCopy: String, toastMessage: String? -> if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU && toastMessage != null) { @@ -34,14 +33,16 @@ fun createCopyToClipboardHandle( } } - val clip = - ClipData.newPlainText("", textToCopy) - .apply { - description.extras = - PersistableBundle().apply { putBoolean(IS_SENSITIVE_FLAG, isSensitive) } - } - .toClipEntry() + scope.launch { + val clip = + ClipData.newPlainText("", textToCopy) + .apply { + description.extras = + PersistableBundle().apply { putBoolean(IS_SENSITIVE_FLAG, isSensitive) } + } + .toClipEntry() - clipboardManager.setClip(clip) + clipboardManager.setClipEntry(clip) + } } } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 781a4b9213..50f37d11d8 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -29,7 +29,7 @@ androidx-tv = "1.0.0" arrow = "2.1.0" # Compose -compose = "1.7.8" +compose = "1.8.0" compose-destinations = "2.1.0" compose-constraintlayout = "1.1.1" compose-material3 = "1.3.2" diff --git a/android/gradle/verification-metadata.keys.xml b/android/gradle/verification-metadata.keys.xml index d4e71ccc2c..e108e91a04 100644 --- a/android/gradle/verification-metadata.keys.xml +++ b/android/gradle/verification-metadata.keys.xml @@ -334,16 +334,6 @@ <sha256 value="2bfc54475c047131913361f56d0f7f019c6e5bee53eeb0eb7d94a7c499a05227" origin="Generated by Gradle" reason="Artifact is not signed"/> </artifact> </component> - <component group="androidx.collection" name="collection-ktx" version="1.2.0"> - <artifact name="collection-ktx-1.2.0.module"> - <sha256 value="f65f46474d6e6ef108d66479b5f0471c0a4b349339d36bd39b41041125413277" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> - </component> - <component group="androidx.compose.animation" name="animation-core" version="1.0.0"> - <artifact name="animation-core-1.0.0.module"> - <sha256 value="2e3502f0deaf56b098b0412075fcc3e7c2d85b95ae9bf4230ec92c2a9008f842" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> - </component> <component group="androidx.compose.animation" name="animation-core" version="1.2.1"> <artifact name="animation-core-1.2.1.module"> <sha256 value="9083ac53ad162f4167ecfb895469943504f4cd6a624e612936a5209144c5b6bf" origin="Generated by Gradle" reason="Artifact is not signed"/> @@ -394,11 +384,6 @@ <sha256 value="69b79724566d49140846700690b8d2165231c577e93e66726a443e8f976bbe19" origin="Generated by Gradle" reason="Artifact is not signed"/> </artifact> </component> - <component group="androidx.core" name="core" version="1.1.0"> - <artifact name="core-1.1.0.aar"> - <sha256 value="76c7cfbe596fe3c09a6983bf1c89e889299c08ac9a3b52ce5182a088d056647e" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> - </component> <component group="androidx.core" name="core" version="1.13.0"> <artifact name="core-1.13.0.aar"> <sha256 value="1b96c8eb10c4b40283fdd6e9aa74ffff05fae4f15d54f61ba69d517fcd144695" origin="Generated by Gradle"/> @@ -509,14 +494,6 @@ <sha256 value="33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a" origin="Generated by Gradle" reason="Artifact is not signed"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.0"> - <artifact name="lifecycle-common-2.3.0.jar"> - <sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> - <artifact name="lifecycle-common-2.3.0.module"> - <sha256 value="47bfb037959169dde7eedc6294d83ad061724e4dae27c03a4836e392d5ad5ba7" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.1"> <artifact name="lifecycle-common-2.3.1.jar"> <sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle" reason="Artifact is not signed"/> @@ -540,14 +517,6 @@ <sha256 value="c82609ced8c498f0a701a30fb6771bb7480860daee84d82e0a81ee86edf7ba39" origin="Generated by Gradle" reason="Artifact is not signed"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.0"> - <artifact name="lifecycle-livedata-core-2.3.0.aar"> - <sha256 value="89f480888f2bb8eb62d9b7b1eb34be69b59ec84b24a1b0bdbeb49973478c6da3" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> - <artifact name="lifecycle-livedata-core-2.3.0.module"> - <sha256 value="1db780dc703f46140f87c8c6ad856e3d7bbd3ec1312dfdbb6467083913fe333b" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.1"> <artifact name="lifecycle-livedata-core-2.3.1.aar"> <sha256 value="e55d38c372460f0a03997ddc950c67227511340fd74f8634d99d29653cd81ab1" origin="Generated by Gradle"/> @@ -582,9 +551,6 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.0"> - <artifact name="lifecycle-runtime-2.3.0.aar"> - <sha256 value="94f528fd5fb123f75b6e65d07a6ef5cd6c0e69ac604d106aaa12705282456234" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-runtime-2.3.0.module"> <sha256 value="01f17f2bc714167f2cc1e66ccf74cbced329fd5be884872c786be69616ca5aad" origin="Generated by Gradle" reason="Artifact is not signed"/> </artifact> @@ -608,9 +574,6 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.0"> - <artifact name="lifecycle-viewmodel-2.3.0.aar"> - <sha256 value="cea8f26fa232037922b69af9cd1bde2df1211acc8b75253e425b7150a5fca59d" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> <artifact name="lifecycle-viewmodel-2.3.0.module"> <sha256 value="feeb5ec453c20d8c1900b0849d2066edc8a41532ce0088d641c4a886bae57a08" origin="Generated by Gradle" reason="Artifact is not signed"/> </artifact> @@ -639,9 +602,6 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.0"> - <artifact name="lifecycle-viewmodel-savedstate-2.3.0.aar"> - <sha256 value="49f9532b5104cc1ee64900ed4f696d031d807fba726e0d5d6a52459e8fba4a1d" origin="Generated by Gradle" reason="Artifact is not signed"/> - </artifact> <artifact name="lifecycle-viewmodel-savedstate-2.3.0.module"> <sha256 value="aaebeb10e23b2ca35346e767aead804254a9889623873fc5cab2041dc931ad9c" origin="Generated by Gradle" reason="Artifact is not signed"/> </artifact> diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index 95a071403a..b77adc58ad 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -212,9 +212,6 @@ <artifact name="annotation-1.8.0.module"> <sha256 value="d590a0d8e02f405de749e8dc80b741dc503c6e3e4c9c016d614d76b65f0b59ef" origin="Generated by Gradle"/> </artifact> - <artifact name="annotation-metadata-1.8.0.jar"> - <sha256 value="fe70ace6f942a5fc29045bb2fe25b4e77bdc742dc69f76ed65b39c3ae185888e" origin="Generated by Gradle"/> - </artifact> </component> <component group="androidx.annotation" name="annotation" version="1.8.1"> <artifact name="annotation-1.8.1.module"> @@ -224,6 +221,14 @@ <sha256 value="fa5e67ffcc52a0413f4b39c2737b43c1ba6c6975b4bd4a4ea8627549e766285b" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.annotation" name="annotation" version="1.9.1"> + <artifact name="annotation-1.9.1.module"> + <sha256 value="f204b05b728a97561718bc716242e47c629c0085a80ee74fca53d4d638bcbe3f" origin="Generated by Gradle"/> + </artifact> + <artifact name="annotation-metadata-1.9.1.jar"> + <sha256 value="38322afa7345c37e29c65ec8852178ae1c26e23096a0634d07a4a3893931f58c" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.annotation" name="annotation-experimental" version="1.1.0"> <artifact name="annotation-experimental-1.1.0.module"> <sha256 value="0361d1526a4d7501255e19779e09e93cdbd07fee0e2f5c50b7a137432d510119" origin="Generated by Gradle"/> @@ -274,6 +279,14 @@ <sha256 value="c959e3b0cdc75c15efe01605fa56aa79f033e39238e150638b8fabde6aa121a0" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.annotation" name="annotation-jvm" version="1.9.1"> + <artifact name="annotation-jvm-1.9.1.jar"> + <sha256 value="1e343917ebf27ba96fe4dc52b1cad7fd32b738fbc6355bb6cd5b3b305d7212d0" origin="Generated by Gradle"/> + </artifact> + <artifact name="annotation-jvm-1.9.1.module"> + <sha256 value="03fb659177c8618e47425925c11bc91f384703ea26c265be9b25cd79292b511c" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.appcompat" name="appcompat" version="1.7.0"> <artifact name="appcompat-1.7.0.aar"> <sha256 value="67189713b30a3fab6971713cc5fab1cb7f022bcf648a257563715c91d719d584" origin="Generated by Gradle"/> @@ -349,14 +362,12 @@ <sha256 value="0326d2cf5adbe592312810ca1f71c6c0cc30f753c43f07c7402361b788a7784c" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.collection" name="collection" version="1.4.4"> - <artifact name="collection-1.4.4.module"> - <sha256 value="aa919993e564c8a246615d0413d6acce734252dab0f1dc1e08a1563b785f6001" origin="Generated by Gradle"/> + <component group="androidx.collection" name="collection" version="1.5.0"> + <artifact name="collection-1.5.0.module"> + <sha256 value="bfeb7bd84f3f7dda7bd73b6709d4a1f61f5a37f843728bae08a067e3df9a0aef" origin="Generated by Gradle"/> </artifact> - </component> - <component group="androidx.collection" name="collection-jvm" version="1.4.0"> - <artifact name="collection-jvm-1.4.0.module"> - <sha256 value="21b0b02ea68abe418f3dd4e4d42876ecf3bd9a1cada458b460cae1cd9d58ef6d" origin="Generated by Gradle"/> + <artifact name="collection-metadata-1.5.0.jar"> + <sha256 value="f5ffb8f461c4b5d6f2883a2c7047977773b31d5b23ef030c057514c0c9eceb47" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.collection" name="collection-jvm" version="1.4.2"> @@ -367,12 +378,12 @@ <sha256 value="aad6b3536c0f0e570aa733d5141d70fa6b9b3add370f73a311ca4ca5dee25448" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.collection" name="collection-jvm" version="1.4.4"> - <artifact name="collection-jvm-1.4.4.jar"> - <sha256 value="539a43428df8a337622fb781401f5f0cdcd52d8b3615f0085af51c90002ff333" origin="Generated by Gradle"/> + <component group="androidx.collection" name="collection-jvm" version="1.5.0"> + <artifact name="collection-jvm-1.5.0.jar"> + <sha256 value="70b35924e4babcdffa37d0e575ee039c56a2d97123342624c48b603233704341" origin="Generated by Gradle"/> </artifact> - <artifact name="collection-jvm-1.4.4.module"> - <sha256 value="666e6efded2659a050fdd22107998faaacc350c8ecab3d875e5142159d9b8a54" origin="Generated by Gradle"/> + <artifact name="collection-jvm-1.5.0.module"> + <sha256 value="dde85e292509231b5471bb091b575099d4f43161eb281e87385038a0161072e6" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.collection" name="collection-ktx" version="1.1.0"> @@ -380,24 +391,6 @@ <sha256 value="2bfc54475c047131913361f56d0f7f019c6e5bee53eeb0eb7d94a7c499a05227" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.collection" name="collection-ktx" version="1.2.0"> - <artifact name="collection-ktx-1.2.0.module"> - <sha256 value="f65f46474d6e6ef108d66479b5f0471c0a4b349339d36bd39b41041125413277" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="androidx.collection" name="collection-ktx" version="1.3.0"> - <artifact name="collection-ktx-1.3.0.module"> - <sha256 value="14908a30ca887e59b12759505a8959b57f153db611c242c36ee92fc59e8164ed" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="androidx.collection" name="collection-ktx" version="1.4.0"> - <artifact name="collection-ktx-1.4.0.jar"> - <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> - </artifact> - <artifact name="collection-ktx-1.4.0.module"> - <sha256 value="3770999ec32d1c082d1a34cf1d64d16d9eca9b6b1263c979954407f461fba82b" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.collection" name="collection-ktx" version="1.4.2"> <artifact name="collection-ktx-1.4.2.jar"> <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> @@ -406,12 +399,12 @@ <sha256 value="8a68e297cd92c80789acc033e2b3d7cbd7941f9234335f00c037205df200bcf5" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.collection" name="collection-ktx" version="1.4.4"> - <artifact name="collection-ktx-1.4.4.jar"> - <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> + <component group="androidx.collection" name="collection-ktx" version="1.5.0"> + <artifact name="collection-ktx-1.5.0.jar"> + <sha256 value="939b4a8697640e77d83e4e8b4c4a9d18f8130198c5961194af8dd9db9dc7c353" origin="Generated by Gradle"/> </artifact> - <artifact name="collection-ktx-1.4.4.module"> - <sha256 value="da54de615618b93cd9eeda5c9935955b7d786e99d436c33b03797c483e9f4c99" origin="Generated by Gradle"/> + <artifact name="collection-ktx-1.5.0.module"> + <sha256 value="4228894e25eec7e17329b206ba72e8aad255bc535018dc62acc5eff3b5c7aaa5" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation" version="1.6.0"> @@ -440,12 +433,12 @@ <sha256 value="a2773807796a9ea149e4d567d3e4746bc3b2514147a180b00be2ca307f732c4d" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation" version="1.7.8"> - <artifact name="animation-1.7.8.module"> - <sha256 value="a259b065c04e0a8ff26ee0ce2295d593a0de0b8db9d797a744070eb5d2144406" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation" version="1.8.0"> + <artifact name="animation-1.8.0.module"> + <sha256 value="fe1a553dffdf743d8c8e3551a3cf4d245d5362377015f5f84df3f28c35b9daac" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-metadata-1.7.8.jar"> - <sha256 value="a2773807796a9ea149e4d567d3e4746bc3b2514147a180b00be2ca307f732c4d" origin="Generated by Gradle"/> + <artifact name="animation-metadata-1.8.0.jar"> + <sha256 value="ead8c56623fd4b2af236f38d3012aa22da1428ba92170f6654b8f6c24dd1672c" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-android" version="1.6.8"> @@ -453,22 +446,28 @@ <sha256 value="4f2718c77ef295fbbba8a92b0deaf6d97fc21d0bcd1753d9cba3c20b25c4a076" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.animation" name="animation-android" version="1.7.0"> + <artifact name="animation-android-1.7.0.module"> + <sha256 value="361ca92ee204beee96904b61ea5f95c8af618ec38fd0f92e38d50a0164a2fb6f" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation-release.aar"> + <sha256 value="439c9bc8dd9542ea7c208519077b8d47c4c68d3e699f8e961fb80bc2955bbbc4" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.animation" name="animation-android" version="1.7.2"> <artifact name="animation-android-1.7.2.module"> <sha256 value="7f4773c5800c09adb41f37a266effaac1618737eeadae80310a771a37cd8b547" origin="Generated by Gradle"/> </artifact> - </component> - <component group="androidx.compose.animation" name="animation-android" version="1.7.8"> - <artifact name="animation-android-1.7.8.module"> - <sha256 value="a2cb4c3f63134ce1b3eb152e8ec157661869c0700ce27198ee77a33c77bb816a" origin="Generated by Gradle"/> - </artifact> <artifact name="animation-release.aar"> - <sha256 value="a945d77b553a758e4ffe9c93afe2f52435e497e9b218ae8be2c1eba47f3e259c" origin="Generated by Gradle"/> + <sha256 value="cbd5746f38201f19511c4afc99311c646647b2bed1f902ec677d3e17d83576da" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core" version="1.0.0"> - <artifact name="animation-core-1.0.0.module"> - <sha256 value="2e3502f0deaf56b098b0412075fcc3e7c2d85b95ae9bf4230ec92c2a9008f842" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-android" version="1.8.0"> + <artifact name="animation-android-1.8.0.module"> + <sha256 value="d1cd5e873c08a829a18ab00a2da0084d3869d67f892b9ba5ae33a083be4ec06d" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation.aar"> + <sha256 value="034633546fe3d2637843c1ed71fcba4af138add2768ff8cc21663fc7aa9193b6" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-core" version="1.2.1"> @@ -502,12 +501,12 @@ <sha256 value="b176280266779690730c7e6ebbe054bbc247b22e82fb38d900614f82888ce198" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core" version="1.7.8"> - <artifact name="animation-core-1.7.8.module"> - <sha256 value="bc1305acff82ff7bf6d024cb8e5fa4ed6ebd9aa4e0aa2094c0edebfac06d4e8a" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-core" version="1.8.0"> + <artifact name="animation-core-1.8.0.module"> + <sha256 value="1eab993fd214cbca284cc651ec64b1acbf6ff5e4a740b67f5b3402c014c857dd" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-core-metadata-1.7.8.jar"> - <sha256 value="b176280266779690730c7e6ebbe054bbc247b22e82fb38d900614f82888ce198" origin="Generated by Gradle"/> + <artifact name="animation-core-metadata-1.8.0.jar"> + <sha256 value="22581989eeb4c6b7a1b66916047c24f1bc01372f29295f170c379406aaca1a99" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-core-android" version="1.6.0"> @@ -520,12 +519,28 @@ <sha256 value="2814fcf1645cb1d5782b216236b99a4e2dde5bdcbb8e815f4514c044c28b2bef" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core-android" version="1.7.8"> - <artifact name="animation-core-android-1.7.8.module"> - <sha256 value="3ce792d09bcf03a1cc1d55f1424822f0961ec9bb019450d2f036c7af1205a10c" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-core-android" version="1.7.0"> + <artifact name="animation-core-android-1.7.0.module"> + <sha256 value="4c6bed497979faa58f3252b7922da7cab80da247ef40aca8eb513243e9d40cdc" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation-core-release.aar"> + <sha256 value="2dc22359de83ed0259a8b7834f16d987d82a90c7197eabb44d72cbdac67bf82c" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="androidx.compose.animation" name="animation-core-android" version="1.7.2"> + <artifact name="animation-core-android-1.7.2.module"> + <sha256 value="81c5eb129bdc1d09567726b7a88297c6d43def70a1065734bc64fba648403c5b" origin="Generated by Gradle"/> </artifact> <artifact name="animation-core-release.aar"> - <sha256 value="8237488870c73e9b66f7ecab5ec1855b0cafc023b0a937f3f7c65602e2c8c7b2" origin="Generated by Gradle"/> + <sha256 value="a44134a34b934b75e93a06b4605a581073902f7d232a167fd1446c95200b5c4d" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="androidx.compose.animation" name="animation-core-android" version="1.8.0"> + <artifact name="animation-core-android-1.8.0.module"> + <sha256 value="f949097048f6ead24996b691a6cd24611699cbec26514cc9fd8140acddcf9dff" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation-core-release.aar"> + <sha256 value="89e48f6849cb0e27b0b52ea1194c58a998fd57e4049518d7ac9c4b970fa280e6" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-core-desktop" version="1.6.0"> @@ -533,12 +548,12 @@ <sha256 value="ff50ff710a7afc7b610672238fc925981d498bb2ee27ca84b9992acb7a113a3f" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core-jvmstubs" version="1.7.8"> - <artifact name="animation-core-jvmstubs-1.7.8.jar"> - <sha256 value="0e0d69da42b6dd0bbaebadb2000c0a320553c8d1c40c480e1188924dd5faec93" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-core-jvmstubs" version="1.8.0"> + <artifact name="animation-core-jvmstubs-1.8.0.jar"> + <sha256 value="96f00326652799a6d8413fd61ec506a7f7e493f95d4f9db3607230784e762c72" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-core-jvmstubs-1.7.8.module"> - <sha256 value="7d45e05892d2b9a14341e56e40c090bf9970128ab25c0d2140ba51a0389ce639" origin="Generated by Gradle"/> + <artifact name="animation-core-jvmstubs-1.8.0.module"> + <sha256 value="036bd336d65ee072c9bee9dbea37acf319f50973e9c6667cc0ed96c320cf9b28" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-desktop" version="1.6.8"> @@ -546,14 +561,6 @@ <sha256 value="1ab7498b6321262d6c42611a8d9034d950bc11ede7eac09b7e2fc6bf97dbf8c2" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-jvmstubs" version="1.7.8"> - <artifact name="animation-jvmstubs-1.7.8.jar"> - <sha256 value="085168cfa19c0bf96ce0e1ef5bd2586997555d706ae2572d522aef141cb4d335" origin="Generated by Gradle"/> - </artifact> - <artifact name="animation-jvmstubs-1.7.8.module"> - <sha256 value="9a3c2e37dd9715444b0c55358dbe1bdca4d042e6d5071e512a029d3c65bda225" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.compose.foundation" name="foundation" version="1.6.8"> <artifact name="foundation-1.6.8.module"> <sha256 value="045615477691111fefca60926d3657707d4af3dc5d0221a9cfbbe9cf92399699" origin="Generated by Gradle"/> @@ -567,12 +574,17 @@ <sha256 value="548f57ae3f6aa9ec87aaac82572f225f99830ec1ece01b622721947c8fb3075d" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation" version="1.7.8"> - <artifact name="foundation-1.7.8.module"> - <sha256 value="75135e9fae4a1dafa1fb580147d1ae2d8d7ed3f96699b2eb5a3206c06bc8d752" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation" version="1.7.2"> + <artifact name="foundation-1.7.2.module"> + <sha256 value="80a589db686d62366a09adc42f5c5ae8eba61ef4a37ebbbcad55f8277cd14170" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="androidx.compose.foundation" name="foundation" version="1.8.0"> + <artifact name="foundation-1.8.0.module"> + <sha256 value="1b6b278d4ac8ce7acf938b8d551e8655e873ec2abfcb1a9b366ed83b09e9d45f" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-metadata-1.7.8.jar"> - <sha256 value="40c973f6464c280219e3e96443c5c6d536e84a077a8d493d55a545b3869744bd" origin="Generated by Gradle"/> + <artifact name="foundation-metadata-1.8.0.jar"> + <sha256 value="1e7a955b8b337a45b7dc65b31b6b3a998a36e7e0ca790d3c31958ae90b70d594" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.foundation" name="foundation-android" version="1.6.8"> @@ -580,20 +592,36 @@ <sha256 value="b92502e46bc91f147a8569758db9430bba34e6af477068c3cfea1207f872ab27" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-android" version="1.7.8"> - <artifact name="foundation-android-1.7.8.module"> - <sha256 value="dc733df156257961210fca6e715d1b5406afd2ed92989e44ed44366fc395bb1e" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-android" version="1.7.0"> + <artifact name="foundation-android-1.7.0.module"> + <sha256 value="eb664a01e8332bec4e8b66c858a5e1d59ecafd8254c09158ec815d7a44055739" origin="Generated by Gradle"/> </artifact> <artifact name="foundation-release.aar"> - <sha256 value="8445301ed64e3aa3150b27f572855c73238b7824aac164758a8726b7afdff481" origin="Generated by Gradle"/> + <sha256 value="631276d808c33e35abf2f917c072fa1cd17a95929b883c74c942a8d287329b0b" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-jvmstubs" version="1.7.8"> - <artifact name="foundation-jvmstubs-1.7.8.jar"> - <sha256 value="bab38a28fc4c0112cca7dcc67c3575d6495fba80d2309acf71e998c793747577" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-android" version="1.7.2"> + <artifact name="foundation-android-1.7.2.module"> + <sha256 value="d1d33ea24a8dde06b182bf34e2509bd3f6a1217a9cb411c82645d705fe377b24" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-jvmstubs-1.7.8.module"> - <sha256 value="a693be7c9683ab7a2932de9624047f92457a7543546c8f624f1e6528df892505" origin="Generated by Gradle"/> + <artifact name="foundation-release.aar"> + <sha256 value="93c53326154ea17b4d8c3e04b54361da1e1715bc9b40461a44ffc23b37227a87" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="androidx.compose.foundation" name="foundation-android" version="1.8.0"> + <artifact name="foundation-android-1.8.0.module"> + <sha256 value="9fbd3f32dc2b71f599f3dc3eacf41e8a7c072fb6842c3a76607ff01a4cbb09cc" origin="Generated by Gradle"/> + </artifact> + <artifact name="foundation-release.aar"> + <sha256 value="65baff71c77bda622a21202c9bbc7427568fe6ffaec89430dbf74ef37716da54" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="androidx.compose.foundation" name="foundation-jvmstubs" version="1.8.0"> + <artifact name="foundation-jvmstubs-1.8.0.jar"> + <sha256 value="1c717bc27ae775c2b2696a3bb1c7b16122243657bb6310d8a67d76bfb84e1a68" origin="Generated by Gradle"/> + </artifact> + <artifact name="foundation-jvmstubs-1.8.0.module"> + <sha256 value="5c0214a4a88554f1158d9eaeac4802150b059d9604e51b05301f9e12bfd4cde3" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.foundation" name="foundation-layout" version="1.6.8"> @@ -617,12 +645,12 @@ <sha256 value="4094e5a3626380b22b684086e548be51afe18e7979f46d261d4f1e0b6898fb39" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-layout" version="1.7.8"> - <artifact name="foundation-layout-1.7.8.module"> - <sha256 value="80b7a5cce7a6ac8cbfed1e839fb09f8ca75389b2ebe13fa16e09be8033310ef0" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-layout" version="1.8.0"> + <artifact name="foundation-layout-1.8.0.module"> + <sha256 value="1cc54d7f428f9f265a279590b54df3c70069257ab5876dfc071d6adc8f75ce06" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-layout-metadata-1.7.8.jar"> - <sha256 value="4094e5a3626380b22b684086e548be51afe18e7979f46d261d4f1e0b6898fb39" origin="Generated by Gradle"/> + <artifact name="foundation-layout-metadata-1.8.0.jar"> + <sha256 value="261826b42b2de8d6f9b5afa8f3c5476bbdf1e39fe640a2f278a4ae0ce9d9641b" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.6.8"> @@ -634,18 +662,24 @@ <artifact name="foundation-layout-android-1.7.0.module"> <sha256 value="4f6877bd205bd23a54f6f8209b07333fb878fcbd5187ba9a9881b298cd12b8a8" origin="Generated by Gradle"/> </artifact> + <artifact name="foundation-layout-release.aar"> + <sha256 value="d3e0f980fe998eccdbf0e978ece6d429e5e6ad89957a32c3f0723829eeed8624" origin="Generated by Gradle"/> + </artifact> </component> <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.7.2"> <artifact name="foundation-layout-android-1.7.2.module"> <sha256 value="34978d5115d736c20a6ae0aa8805a5799c8f4bd902059171a8e644b9484702f5" origin="Generated by Gradle"/> </artifact> + <artifact name="foundation-layout-release.aar"> + <sha256 value="1cbdce4b394da76b0f98ff8d31a3613c4ec355c9198cfe4d8c06bb02f7b76b38" origin="Generated by Gradle"/> + </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.7.8"> - <artifact name="foundation-layout-android-1.7.8.module"> - <sha256 value="9869703c7a7455b5bdffb5debab7701318f37ba61f0b4b5251fa018c7b600da6" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.8.0"> + <artifact name="foundation-layout-android-1.8.0.module"> + <sha256 value="5ff615c36ae5508b10c8c6da51066b0f7a246d75bdc008498a4a8684bc52e30a" origin="Generated by Gradle"/> </artifact> <artifact name="foundation-layout-release.aar"> - <sha256 value="a83233e768e30aab870e6667277ec91dd40adb5663d32f36dfa5dbad367db561" origin="Generated by Gradle"/> + <sha256 value="e02d55c6dedef63926cfc2a88693e5cc2c569d000f349e43ae616c9c03bdb70e" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.foundation" name="foundation-layout-desktop" version="1.6.8"> @@ -653,12 +687,12 @@ <sha256 value="47a7bcfbd1473204da930c9a3611e967ef1953cbfdae64e785863012573e7487" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-layout-jvmstubs" version="1.7.8"> - <artifact name="foundation-layout-jvmstubs-1.7.8.jar"> - <sha256 value="c03f5dca426beedbdfdf53abcf90ca5445dc6eb354688db763078c47f74bb5e3" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-layout-jvmstubs" version="1.8.0"> + <artifact name="foundation-layout-jvmstubs-1.8.0.jar"> + <sha256 value="eaf603860d3676e185a28ced35090e1e6d8944081de502772ff8d8dab02f34d4" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-layout-jvmstubs-1.7.8.module"> - <sha256 value="807308ed3ed4da2448724d085eeae6aa40cc4c48f73710cab374b4c952436879" origin="Generated by Gradle"/> + <artifact name="foundation-layout-jvmstubs-1.8.0.module"> + <sha256 value="64ad8c62571be5e9ef4fdb4de20478d78ac258c275aa3b8ad4d99e8e831eb4d3" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.material" name="material" version="1.0.0"> @@ -848,12 +882,12 @@ <sha256 value="be6e4afbc5e3be8f24b5f1d602cbbd3af46de26293d627af56c420fa440dd0a3" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime" version="1.7.8"> - <artifact name="runtime-1.7.8.module"> - <sha256 value="baa8582027cb69f1d589b5ae16a4dfc6de233859f794b706f9e47b5fb02d0f6d" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime" version="1.8.0"> + <artifact name="runtime-1.8.0.module"> + <sha256 value="9ee89d7a0172424bd42ac7a53790d0a342c26e4bd355897ba9fde464caaaba00" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-metadata-1.7.8.jar"> - <sha256 value="6b5bf70cd2267e64d9b04afa4bddf39d145cfa52cc36e3ee197267752fbfa7d3" origin="Generated by Gradle"/> + <artifact name="runtime-metadata-1.8.0.jar"> + <sha256 value="a2c86b1ababf345ae76284848c1041872b25a339a81cc39309fccd4217b1d6f9" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.runtime" name="runtime-android" version="1.7.0"> @@ -861,20 +895,20 @@ <sha256 value="a3420bad0eedce8adfe63e6a2446f770bee0bc8d17ecc3e146f357ae384ae5d0" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-android" version="1.7.8"> - <artifact name="runtime-android-1.7.8.module"> - <sha256 value="9bae3b2e36690b43c167312f75a04b24cbe708c92a6cfd91f9a367c4404cd192" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-android" version="1.8.0"> + <artifact name="runtime-android-1.8.0.module"> + <sha256 value="0f2b7ba5435a7b2c8413b9feab846827bd8d8f655b77339d3b1344f9ca7be6a3" origin="Generated by Gradle"/> </artifact> <artifact name="runtime-release.aar"> - <sha256 value="0c4e6366a30cf1f464601a349e0e2cdedb70df5372f2da8597e61087a910a8f8" origin="Generated by Gradle"/> + <sha256 value="08026344536084655958120bcc3aa8fd812bb44e0b819b3fe2e7a023f421afd8" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-jvmstubs" version="1.7.8"> - <artifact name="runtime-jvmstubs-1.7.8.jar"> - <sha256 value="a36ed2abaa9267d2f15d593e798a6bc169c278b46775de5f2857af59323fb1ae" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-jvmstubs" version="1.8.0"> + <artifact name="runtime-jvmstubs-1.8.0.jar"> + <sha256 value="ce04da5dbf27304c9a17a24d5d8fc77b34691cb64a0f474fa3da89b02eca8c42" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-jvmstubs-1.7.8.module"> - <sha256 value="86c945f6b05489c21d5713115a80226ba24394a28781d2d554384658f7369ffb" origin="Generated by Gradle"/> + <artifact name="runtime-jvmstubs-1.8.0.module"> + <sha256 value="36fea9aaa9a8f1cfe11d071c4eda914e73c614bbd25669a9ca8422211e13f977" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.runtime" name="runtime-saveable" version="1.7.0"> @@ -887,12 +921,12 @@ <sha256 value="17154c45c5b08189d3048b855b8a8a87ca16ead3eb49294d3f081be5f53c80d5" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-saveable" version="1.7.8"> - <artifact name="runtime-saveable-1.7.8.module"> - <sha256 value="f09c4235c4af2e43e41d36301a810961f5156cb352df01ee992203170e6f441a" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-saveable" version="1.8.0"> + <artifact name="runtime-saveable-1.8.0.module"> + <sha256 value="6ba1d367cec28616a687bbb513a8d5090c00360b3aa3d133e52d42f257b8b5fd" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-saveable-metadata-1.7.8.jar"> - <sha256 value="8b1c04e6bc7b322a34718ae57f26c842117a93b627f75dcde3d02da8b3f0edc6" origin="Generated by Gradle"/> + <artifact name="runtime-saveable-metadata-1.8.0.jar"> + <sha256 value="219251d68fe316f9889a5e11558ecc4a7f8ec60d2aa687826ae67295a62e7262" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.7.0"> @@ -900,12 +934,12 @@ <sha256 value="14f53cf2c80105c75eeb5bf19904439ad5dfa4327ddd944829dcb7283ada0960" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.7.8"> - <artifact name="runtime-saveable-android-1.7.8.module"> - <sha256 value="fb7c361386a62ef9b524dbe6b895e875e0919b01461598dcadd1ce6fe0ac1ff3" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.8.0"> + <artifact name="runtime-saveable-android-1.8.0.module"> + <sha256 value="8703a8187e16318e88874bd9cc0399c0f380e09f7ce55bee2bcb5a358d41e0dd" origin="Generated by Gradle"/> </artifact> <artifact name="runtime-saveable-release.aar"> - <sha256 value="6282f4ae73948d54d0481c5a7ccf5f270fd9ee747199f14e6313f3ccd039b694" origin="Generated by Gradle"/> + <sha256 value="b47aad0ca15212fe95c15c4048b4f089ce054a6f798b1cb6c457f6bafb132918" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.runtime" name="runtime-saveable-desktop" version="1.7.0"> @@ -913,52 +947,44 @@ <sha256 value="1743735da40e39b36a2ac1593a10e9d385e8eec8142a67a72a7cb4b1eae9bda2" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-saveable-jvmstubs" version="1.7.8"> - <artifact name="runtime-saveable-jvmstubs-1.7.8.jar"> - <sha256 value="f6c98b0c719abd8b55499be90830681c915d78c0e6581f7cc37c86fde52cec04" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-saveable-jvmstubs" version="1.8.0"> + <artifact name="runtime-saveable-jvmstubs-1.8.0.jar"> + <sha256 value="e54541421fd823a6382a665cd5de3af1d129696894afed2abfd56c073cb896b7" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-saveable-jvmstubs-1.7.8.module"> - <sha256 value="01c6bfc4ca895de583e5a0100a85bf2aebf6b34d7e764e6951d0074f3838c167" origin="Generated by Gradle"/> + <artifact name="runtime-saveable-jvmstubs-1.8.0.module"> + <sha256 value="337cbd709febaee016ec58aa9993133b68bab4fb3b8f015748a88248187b0b8e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui" version="1.7.8"> - <artifact name="ui-1.7.8.module"> - <sha256 value="afb4a970a9d61a96b7dae6c7c86c6586a54aa044045cb0050cdbe16b05ebf7df" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui" version="1.8.0"> + <artifact name="ui-1.8.0.module"> + <sha256 value="e9c56750b6a2e3de9741fc126d9a0b3b9c1b5bf84238b28924555e3d7947864f" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-metadata-1.7.8.jar"> - <sha256 value="0db108477257620c685b18e3541ced4c6a0c1172bd6ae6a0836e8ead5c408ad9" origin="Generated by Gradle"/> + <artifact name="ui-metadata-1.8.0.jar"> + <sha256 value="60510ddf51293eea169ab9d97ee3d9c81e026ad6d1afb2a6a8436341dd8d381f" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-android" version="1.7.8"> - <artifact name="ui-android-1.7.8.module"> - <sha256 value="66080dbacb9372ac045ce16b144362381fb2b05a3c6864dac9b7b8df68dbeaa4" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-android" version="1.8.0"> + <artifact name="ui-android-1.8.0.module"> + <sha256 value="4dbc56b45fb59de6f0cd95ab8fdcd6354bf9052cad86361990107f12097b4ac8" origin="Generated by Gradle"/> </artifact> <artifact name="ui-release.aar"> - <sha256 value="d54fb17a87e404f0602c49f5ca48ff0aee4055451c9a5a3c8f14420e0753d1a3" origin="Generated by Gradle"/> + <sha256 value="afdb5045a34bbd5929000b798066e14ee8a2d17b9573e6d14dcd9e80245ec7b9" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-geometry" version="1.7.8"> - <artifact name="ui-geometry-1.7.8.module"> - <sha256 value="c336151c57b130c85cec483694eafc3f9172b4bddf616efe3421989b3e903a64" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-geometry" version="1.8.0"> + <artifact name="ui-geometry-1.8.0.module"> + <sha256 value="d76e0d5789fa7b0b14c318cb5b36a6bf2b2c19fdb8d7260461cde8fbedca5c39" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-geometry-metadata-1.7.8.jar"> - <sha256 value="74d9348a19fe1150c20989bae6783d2f87b51ea3c10268b7b46d3024f22b3d4a" origin="Generated by Gradle"/> + <artifact name="ui-geometry-metadata-1.8.0.jar"> + <sha256 value="647989f5ad847378d3c2a4b87defa7455aea1f4220197b4b28fe608115481b28" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-geometry-android" version="1.7.8"> - <artifact name="ui-geometry-android-1.7.8.module"> - <sha256 value="ca72e6c89c55e0b5cc582ef814aaebafafd5c07b64243980798cdd8ad7363f37" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-geometry-android" version="1.8.0"> + <artifact name="ui-geometry-android-1.8.0.module"> + <sha256 value="37bfb0b2a2775fd50be0e1de9026ec2db6959cd8340cf70c180d43dbf61d8142" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-geometry-release.aar"> - <sha256 value="885496763d8c8ba32f3e6a765bcdb5a39e640bd3577fc5452118d1273e2c0a4a" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="androidx.compose.ui" name="ui-geometry-jvmstubs" version="1.7.8"> - <artifact name="ui-geometry-jvmstubs-1.7.8.jar"> - <sha256 value="6bfff1ca29461a7f0ab0e5204d6c7cbe75b5bb8936add7b8dc055162a68fa1d0" origin="Generated by Gradle"/> - </artifact> - <artifact name="ui-geometry-jvmstubs-1.7.8.module"> - <sha256 value="56366721d8a87924773839c2725e72ef252da662b306b9ed662afd64b6508e6e" origin="Generated by Gradle"/> + <artifact name="ui-geometry.aar"> + <sha256 value="6feafca0f09b6fa2d91b8c4216f534be9a59af01990dc2143b7e0829a8e1e58e" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-graphics" version="1.6.8"> @@ -966,12 +992,12 @@ <sha256 value="eb4d03821a8d2c7919743a8b80ba9f96186c6022bd7ecec02940bc1555abee20" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-graphics" version="1.7.8"> - <artifact name="ui-graphics-1.7.8.module"> - <sha256 value="809d8da1b129997269435728c351a7939260d9acd28e2ccb9f7400eec2ec2d56" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-graphics" version="1.8.0"> + <artifact name="ui-graphics-1.8.0.module"> + <sha256 value="c02953f6c6fa85b71e124b98b5695f6962d588e381fefdad75452e40359f4d2f" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-graphics-metadata-1.7.8.jar"> - <sha256 value="5ba9ece097ba31fea936095e1c34b1f517645a1af55e4a641e707c583e61d94b" origin="Generated by Gradle"/> + <artifact name="ui-graphics-metadata-1.8.0.jar"> + <sha256 value="ad698fc22dd4380a9bcd66b81b60e9afbbdb3a2dd49be0f0c47a2ee8bc0f4168" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-graphics-android" version="1.6.8"> @@ -979,68 +1005,68 @@ <sha256 value="39bece706d28b44b3fb2a3ae5b1508f3247ba35d5d405d96033378c98e615965" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-graphics-android" version="1.7.8"> - <artifact name="ui-graphics-android-1.7.8.module"> - <sha256 value="fafcba9f63c7bbd89304e7dae09327b2f2ae9ae1a3676b0fe60469403b973dcd" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-graphics-android" version="1.8.0"> + <artifact name="ui-graphics-android-1.8.0.module"> + <sha256 value="42f2d3973b79c796a9cefd8ff3f0a9b21d74c5597a869bf005797fe34faefb70" origin="Generated by Gradle"/> </artifact> <artifact name="ui-graphics-release.aar"> - <sha256 value="eb4862ce3997e9dc5c322da5da6b415ee2907f40807766f2a563529bbad46905" origin="Generated by Gradle"/> + <sha256 value="45fadd2d08b4527021651320149503c85ca6ed40b026470db17651661a1b30f4" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-graphics-jvmstubs" version="1.7.8"> - <artifact name="ui-graphics-jvmstubs-1.7.8.jar"> - <sha256 value="d9a0b6f15dcde98b125d7d01a2219ea7f8c1d6ea315bdc050a2048dc2492bc18" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-graphics-jvmstubs" version="1.8.0"> + <artifact name="ui-graphics-jvmstubs-1.8.0.jar"> + <sha256 value="a9a2b371b5b5b41d70a44bec2f764f4ddb203daebf4e776c988bf6e032d5555d" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-graphics-jvmstubs-1.7.8.module"> - <sha256 value="43b2cf98e852642508e92efefe18c9ef630542640502038d3ac3884a2a6d92c4" origin="Generated by Gradle"/> + <artifact name="ui-graphics-jvmstubs-1.8.0.module"> + <sha256 value="190253b536c9236897ec9e2d8f09d8553411e5d8b5e8883193ef9a7d8e1937f3" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-jvmstubs" version="1.7.8"> - <artifact name="ui-jvmstubs-1.7.8.jar"> - <sha256 value="923ae372037105746bc661183a8d08a83ef8cf663bc34bdc9ff8740647a53fa0" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-jvmstubs" version="1.8.0"> + <artifact name="ui-jvmstubs-1.8.0.jar"> + <sha256 value="ed58994cc35d37d45b0737911ebe85242b6ec91cb3a0864949c96e8e16fba892" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-jvmstubs-1.7.8.module"> - <sha256 value="8e0c362a649f4360c7ce2f6f66fbea3c2690aaad5a69b0dcc05a94e2b354b2c9" origin="Generated by Gradle"/> + <artifact name="ui-jvmstubs-1.8.0.module"> + <sha256 value="c505b95babeeee6251f2af04aa9c63d5f771f2d393252922b28353a5b3336ba5" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test" version="1.7.8"> - <artifact name="ui-test-1.7.8.module"> - <sha256 value="98d18dbb14e7d5c535cabcb254073bf513991f2b5ac39ebbbdc8454837ac5cc6" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test" version="1.8.0"> + <artifact name="ui-test-1.8.0.module"> + <sha256 value="2ee10be68c766cc5da6ba8bbc7d2ca2ba012b0f3446857cbbce359f8b58f92ed" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-metadata-1.7.8.jar"> - <sha256 value="a79ffab96e477d235ff6f30b3b6db8afc7a22134b9e20165696943f09b42f609" origin="Generated by Gradle"/> + <artifact name="ui-test-metadata-1.8.0.jar"> + <sha256 value="b2e1aec828c224677b76e583283f35ebe81b1052f45eda3c59344a6d23525984" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-android" version="1.7.8"> - <artifact name="ui-test-android-1.7.8.module"> - <sha256 value="fec4ac570095e79d238d26a8a0fde545938d648cdbd9e49d3c40868da36af217" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-android" version="1.8.0"> + <artifact name="ui-test-android-1.8.0.module"> + <sha256 value="06a023c5d9181814f1124e529a2bd88ff75f9bfe563b72d033b724fdeb170beb" origin="Generated by Gradle"/> </artifact> <artifact name="ui-test-release.aar"> - <sha256 value="2d19ea84669da88a403dae0945ae14f1268bb6c6afdc00cea365a0b11fd12223" origin="Generated by Gradle"/> + <sha256 value="7d6a24fc86617bcd3fb1c87ffcab41c572e0517c6e8ddedc034d8db73ecee841" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-junit4" version="1.7.8"> - <artifact name="ui-test-junit4-1.7.8.module"> - <sha256 value="f0f9a96493e373b523194eaf2ec9ec660047545a90d3da7710adb14eae8c63c2" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-junit4" version="1.8.0"> + <artifact name="ui-test-junit4-1.8.0.module"> + <sha256 value="8bd7418a60ffe0ad76fe7cd1498b63808a511741ad1ce913c5ee8fc9608624dd" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-junit4-metadata-1.7.8.jar"> - <sha256 value="71d3b81d23a8350c7cbb8a6b6773ed3901c849bb2405fa9a7c47fddf35c5336e" origin="Generated by Gradle"/> + <artifact name="ui-test-junit4-metadata-1.8.0.jar"> + <sha256 value="98acc85c5fbc64f5135b9cd3f705d7af9b86f0c7a61741a3f60de00af59d22fc" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-junit4-android" version="1.7.8"> - <artifact name="ui-test-junit4-android-1.7.8.module"> - <sha256 value="bc02b2492e25ca72bae5bfe85737f5564e657f7d7b67436586722bae4804a295" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-junit4-android" version="1.8.0"> + <artifact name="ui-test-junit4-android-1.8.0.module"> + <sha256 value="6d11e6def7872ce2746b04f7f6102d8a272249e18b9b4a6009a2b3a771da507c" origin="Generated by Gradle"/> </artifact> <artifact name="ui-test-junit4-release.aar"> - <sha256 value="040149e0ed91f91bda429baafd2e45dd9e9b3398ed5310495b08b4f73ec29f8f" origin="Generated by Gradle"/> + <sha256 value="1e540a541a64489f7f8b7506682489cc1c702afe12e0e0ce25359f5937198c1b" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-manifest" version="1.7.8"> - <artifact name="ui-test-manifest-1.7.8.aar"> - <sha256 value="da02ef8d80ea200daeefdae312c501a03c158d54ee8dc098aff30b475427fdd7" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-manifest" version="1.8.0"> + <artifact name="ui-test-manifest-1.8.0.aar"> + <sha256 value="2be40216ea6bc3a378db6bcfaf382e610d8d30c40fa3fbdb9450b73378047bba" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-manifest-1.7.8.module"> - <sha256 value="714fdda5aba5e0a62f20b2ce8b62f3848799e6fea509f77633727c68dda9d6b7" origin="Generated by Gradle"/> + <artifact name="ui-test-manifest-1.8.0.module"> + <sha256 value="47ca7a79ccea1b34309e8ddffe28c0818aeafeef87c08f70f45ebcb453a74344" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-text" version="1.6.0"> @@ -1053,12 +1079,12 @@ <sha256 value="0fae7dc013e91f4792b34b13b36416684cd1750cbb360e498d09e79bd7ce4af7" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-text" version="1.7.8"> - <artifact name="ui-text-1.7.8.module"> - <sha256 value="1ec485dbc361a0b132a0c01b441d42932ee207542ca4f8d82fb3e2a1560e3143" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-text" version="1.8.0"> + <artifact name="ui-text-1.8.0.module"> + <sha256 value="d4bf192760e811bc4febe1c58b39e3d058e8764cebd9ad49406bd77f57ce4dea" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-text-metadata-1.7.8.jar"> - <sha256 value="5bd379bebabeb47ea92b3777bb1ceb31dc93c294b46f264dcf8e4c010f4699fc" origin="Generated by Gradle"/> + <artifact name="ui-text-metadata-1.8.0.jar"> + <sha256 value="28391893c1d3431e700450f40bd1ba773cf1895f62aceaa90893e8ac679b3775" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-text-android" version="1.6.8"> @@ -1066,92 +1092,76 @@ <sha256 value="31c5457679534b6bdeaffa0071266614f6fb9af0b7119928427eb2fb00ff6748" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-text-android" version="1.7.8"> - <artifact name="ui-text-android-1.7.8.module"> - <sha256 value="1fa981ca4d73faea7079a722564237f05465ebb257e81509895aebf207392331" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-text-android" version="1.8.0"> + <artifact name="ui-text-android-1.8.0.module"> + <sha256 value="dc341c64b92baf972a7bb38f7c37c6717e726b305d0e7dc5b2c1a19115b27f4c" origin="Generated by Gradle"/> </artifact> <artifact name="ui-text-release.aar"> - <sha256 value="5f7757ad176bf0807a3f98d4e1cd9004ee059cbf05a232062d93e4a050d7dfba" origin="Generated by Gradle"/> + <sha256 value="1e229e09be640e3a84a952da01363b74eadb637f0e0b8a61d55947c813bfb90e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-text-jvmstubs" version="1.7.8"> - <artifact name="ui-text-jvmstubs-1.7.8.jar"> - <sha256 value="0c667271fad95bd3acfcbcfe607b1ef234cf81eb59eb7caf1e0f6e874734fc1e" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-text-jvmstubs" version="1.8.0"> + <artifact name="ui-text-jvmstubs-1.8.0.jar"> + <sha256 value="f927f06f57ba385b9938a25660ac354e340bb13dea062915d3808e7ce7025df2" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-text-jvmstubs-1.7.8.module"> - <sha256 value="424fb754bcbf1aac19d2af789ffad1cf1cc3c5d0a44e1f71d3d658ef1006bb2c" origin="Generated by Gradle"/> + <artifact name="ui-text-jvmstubs-1.8.0.module"> + <sha256 value="50d161dad49fed4a23cdc41df19fa21a06f57e2c984f9d0a5e99ed34d8abfab0" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling" version="1.7.8"> - <artifact name="ui-tooling-1.7.8.module"> - <sha256 value="08819b8cf801dead068fd664dd557d8dfa2e1c32a8793ee9618c3a5554c350df" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling" version="1.8.0"> + <artifact name="ui-tooling-1.8.0.module"> + <sha256 value="e725fb4fd888f5fe9526dd4dc4aad0bddb520d80820b060ccb3ce88bb604b6ba" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-metadata-1.7.8.jar"> - <sha256 value="fbf2eaab5603fc2f9df5325f3324f454afa107956b924e033aa1f4e2e6b4d8d2" origin="Generated by Gradle"/> + <artifact name="ui-tooling-metadata-1.8.0.jar"> + <sha256 value="059535329d4e6746a57becc93f9afed723940badd475b92f2c4494b5a07e9cc9" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-android" version="1.7.8"> - <artifact name="ui-tooling-android-1.7.8.module"> - <sha256 value="bb8e1887cba5d6b2dff812e6aacf04da500cb9089afb5678684c946c1b10cf8b" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-android" version="1.8.0"> + <artifact name="ui-tooling-android-1.8.0.module"> + <sha256 value="033dcadb726430cd09dd4dd31be07dc1a2113d42bdc8960bf563774007cb4c0c" origin="Generated by Gradle"/> </artifact> <artifact name="ui-tooling-release.aar"> - <sha256 value="99691d3730a815f19850f4403348d042541c04a90bd2b07f0225e72f2036a5e0" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="androidx.compose.ui" name="ui-tooling-data" version="1.7.8"> - <artifact name="ui-tooling-data-1.7.8.module"> - <sha256 value="017ffaa5ed42651571ac5b92c4001ae2385458de78b0babe1371c1c25a4ca879" origin="Generated by Gradle"/> - </artifact> - <artifact name="ui-tooling-data-metadata-1.7.8.jar"> - <sha256 value="6b8231847e4ff969a213a61fc0dcebc0a8250c451ada7ac7a430dd2fc7b3a0cf" origin="Generated by Gradle"/> + <sha256 value="3fd98814504137b451c7e0a7a937d447e777cc334044899dc097c0b9372125a7" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.7.8"> - <artifact name="ui-tooling-data-android-1.7.8.module"> - <sha256 value="e24cff3a06e2101f9d31c12958c17b8b046fdf22f8dcba76caafe89c5f1c6537" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-data" version="1.8.0"> + <artifact name="ui-tooling-data-1.8.0.module"> + <sha256 value="98f85b7b0da87af490c288f423070b3e32d210fa74176f3e1d969a65d597ddc4" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-data-release.aar"> - <sha256 value="b98dbf26c51394ea4044f746b87268ec8e6165a206c3d5b74752eac1d95df3f4" origin="Generated by Gradle"/> + <artifact name="ui-tooling-data-metadata-1.8.0.jar"> + <sha256 value="53c64e375484a84b86c54fa5969d45a74c6f6d0ffd35f42efeb6ee9332f9084e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-data-jvmstubs" version="1.7.8"> - <artifact name="ui-tooling-data-jvmstubs-1.7.8.jar"> - <sha256 value="e217a177e64d450f68c43964d221afe92bee3b096bb02e9a9644bf23c210aae7" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.8.0"> + <artifact name="ui-tooling-data-android-1.8.0.module"> + <sha256 value="e1654940396e7b15e703dafdf0bc4bcbf266e998b42bb7816c228a8df5c7dd21" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-data-jvmstubs-1.7.8.module"> - <sha256 value="decbe970642190faced32ef06401fe0a10c414af3f1c078c795defc9a775e131" origin="Generated by Gradle"/> + <artifact name="ui-tooling-data.aar"> + <sha256 value="3b49013028a098560041cfbf650d9737d6b2e8129171ff232f2f47d2b726209c" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-jvmstubs" version="1.7.8"> - <artifact name="ui-tooling-jvmstubs-1.7.8.jar"> - <sha256 value="6fa09b0440174341645c58429d172a02dee9ae89fb123c4d0111cf0700632bed" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-jvmstubs" version="1.8.0"> + <artifact name="ui-tooling-jvmstubs-1.8.0.jar"> + <sha256 value="6b5d0496a2885a0e9fc5d0fe93dc463c7595666c01a7e4169ca5184f9aa19283" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-jvmstubs-1.7.8.module"> - <sha256 value="7772c922962b28da9167962da25439480b1a7ca97b75c18ae0791cd7e18f986c" origin="Generated by Gradle"/> + <artifact name="ui-tooling-jvmstubs-1.8.0.module"> + <sha256 value="18b5342200d24c391100940fa6c950d581f223740d2c8cde95cfbd83e3b9b72a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.7.8"> - <artifact name="ui-tooling-preview-1.7.8.module"> - <sha256 value="e42ed28427d6715270387f6cd444b614182d7bbd7b67313b1a91fd20c2b92c14" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.8.0"> + <artifact name="ui-tooling-preview-1.8.0.module"> + <sha256 value="766507798084339f0578eb4276f54ca45390ca5072afd7b607d4b6be8ca8d2c8" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-preview-metadata-1.7.8.jar"> - <sha256 value="c4bfdfd326ccc96073aca33abdbd04ec0c048e7b9458c12767b753aa1e44ffc9" origin="Generated by Gradle"/> + <artifact name="ui-tooling-preview-metadata-1.8.0.jar"> + <sha256 value="d268e21302ca0559ce914d2da64a9813edaabb5edd0540f4ca298403793ba234" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.7.8"> - <artifact name="ui-tooling-preview-android-1.7.8.module"> - <sha256 value="1fae69ee343eb7a2dedc9224530b3267902b5801c2d9486c1e218f688670f7ef" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.8.0"> + <artifact name="ui-tooling-preview-android-1.8.0.module"> + <sha256 value="9d3fafd8ff3786c8cc41bc56e16f97df43745349226f5cc4f059bba04d91899f" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-preview-release.aar"> - <sha256 value="e17661a807e11fed2ebc6f92fb5911b3824ee6a15790a381167208d5b7d7fe66" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="androidx.compose.ui" name="ui-tooling-preview-jvmstubs" version="1.7.8"> - <artifact name="ui-tooling-preview-jvmstubs-1.7.8.jar"> - <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> - </artifact> - <artifact name="ui-tooling-preview-jvmstubs-1.7.8.module"> - <sha256 value="987f71e0a860f5a10e41e9aed997fe78036a89190095c3550961f8136407b328" origin="Generated by Gradle"/> + <artifact name="ui-tooling-preview.aar"> + <sha256 value="36dbe5fcce114b4610565d69c11ea61a44e0e1a622e7239c5ccc550051c51731" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-unit" version="1.7.2"> @@ -1159,28 +1169,28 @@ <sha256 value="d67c73d878486c33c5b0b5a60187558687052605223beaef2643b926bdfbdde8" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-unit" version="1.7.8"> - <artifact name="ui-unit-1.7.8.module"> - <sha256 value="ca7a00e086e5a4e56045467d815c4156b2d4901feb35cfb31ffe6a4356987379" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-unit" version="1.8.0"> + <artifact name="ui-unit-1.8.0.module"> + <sha256 value="e8c139333c97ac94cb40bf85651d62aec9acd2b243651264762469c679f7b460" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-unit-metadata-1.7.8.jar"> - <sha256 value="254bd27dc799c63b1b59614beef214058c7fbf6cf800c70848bc1fac51b06218" origin="Generated by Gradle"/> + <artifact name="ui-unit-metadata-1.8.0.jar"> + <sha256 value="a7c77aa13240e2565bac052e23c129d9692c3bc3b83f9db2634a924a553d2b05" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-unit-android" version="1.7.8"> - <artifact name="ui-unit-android-1.7.8.module"> - <sha256 value="fc56c1c0b571b1d6fe901b2abd59cdd881335dc08028c966acdb284ec8ff626c" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-unit-android" version="1.8.0"> + <artifact name="ui-unit-android-1.8.0.module"> + <sha256 value="568485ccb978ca809957e86427826bc5da39dfa23af079375ae1cb6739ec695b" origin="Generated by Gradle"/> </artifact> <artifact name="ui-unit-release.aar"> - <sha256 value="9c37f165af397b6ce8f2b990126e88acda81e158307cf7e0334cc6ba5d41ed49" origin="Generated by Gradle"/> + <sha256 value="948888d377c05d00709d1e84c65cbb8cf3d8dc567a06b97b22a1855c4fe72057" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-unit-jvmstubs" version="1.7.8"> - <artifact name="ui-unit-jvmstubs-1.7.8.jar"> - <sha256 value="adab6b0837de96bd435937b0202431f1f7071900fc5835a49cf561c85ca30c32" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-unit-jvmstubs" version="1.8.0"> + <artifact name="ui-unit-jvmstubs-1.8.0.jar"> + <sha256 value="8425b4a92d6080ef8f7a57db931b7009dcb3942e507a31f988e6b82ad8330b50" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-unit-jvmstubs-1.7.8.module"> - <sha256 value="9111076640a867ab1bc4798c855db41da3c485aa886ff36a1e803df0056abd91" origin="Generated by Gradle"/> + <artifact name="ui-unit-jvmstubs-1.8.0.module"> + <sha256 value="f0a1601297f65480465505bff913fa81e0f371e337f9d77716ded12898d0e07d" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-util" version="1.6.0"> @@ -1193,12 +1203,12 @@ <sha256 value="c91b6fe99cd05baae7c6858dc0d52dd643c9ce3edf15308b51b6c6e6bb22873c" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util" version="1.7.8"> - <artifact name="ui-util-1.7.8.module"> - <sha256 value="c6489709dad543bdfee77f42784a7b26284ce913e2e8cf33554ad2ed79c7dea7" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-util" version="1.8.0"> + <artifact name="ui-util-1.8.0.module"> + <sha256 value="4d482543dfdaa9bd6a735c05b006b3cebe922d77c78a817d0c0622850ad336f5" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-util-metadata-1.7.8.jar"> - <sha256 value="25afa139ccbda2c33c6d9e7be3579e2ca9295f986e3b4f5b96297d6ce0fba86a" origin="Generated by Gradle"/> + <artifact name="ui-util-metadata-1.8.0.jar"> + <sha256 value="2b21aa10b58dbc60b0b3408e91c1133a106507dce5e5d129c0ad3a27614579a6" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-util-android" version="1.6.8"> @@ -1206,20 +1216,20 @@ <sha256 value="c6fccb2b21c7187a0905c5b667939680c8996b7cbe0c33a8c8a477a2f6b5e53c" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util-android" version="1.7.8"> - <artifact name="ui-util-android-1.7.8.module"> - <sha256 value="a18c49781d7324410966e1faa76dd165a874474a13f8bb0c6f2214b50bbb4d6c" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-util-android" version="1.8.0"> + <artifact name="ui-util-android-1.8.0.module"> + <sha256 value="8ee7f2f0084e6a65b75a53bf1f1c179e0cb449a708472a90a4a922b954e872a7" origin="Generated by Gradle"/> </artifact> <artifact name="ui-util-release.aar"> - <sha256 value="5686aaaffc6bed1e93d5edb70c16cd2a14296fb1470c52f6c5a627b1188c235c" origin="Generated by Gradle"/> + <sha256 value="24c8c6fdd1ee2d883f2c7cb97c71db09fe91d5b49f12d5922db1633a23070be8" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util-jvmstubs" version="1.7.8"> - <artifact name="ui-util-jvmstubs-1.7.8.jar"> - <sha256 value="ad9516e0310a7ae89356551413aa5ef8578007a528363f462c6b7b30f3538636" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-util-jvmstubs" version="1.8.0"> + <artifact name="ui-util-jvmstubs-1.8.0.jar"> + <sha256 value="a44342113e3c4a4a64b1d83daa3a48ffa7a248b83e19c5c191817507d06ce888" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-util-jvmstubs-1.7.8.module"> - <sha256 value="ed6ed43e30c31773732afc4e94a2fa6133292c74542da5040c5501073de62aba" origin="Generated by Gradle"/> + <artifact name="ui-util-jvmstubs-1.8.0.module"> + <sha256 value="6986140ab8559c05a2312e858f19ee7093d1ddaf161ba096aac7f1b9eb1c8e4a" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.concurrent" name="concurrent-futures" version="1.1.0"> @@ -1262,11 +1272,6 @@ <sha256 value="d4ac5714d051734c2087a482a7dcd4fcc0b7f9e011c81d2cddf4b0f94580e30b" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.core" name="core" version="1.1.0"> - <artifact name="core-1.1.0.aar"> - <sha256 value="76c7cfbe596fe3c09a6983bf1c89e889299c08ac9a3b52ce5182a088d056647e" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.core" name="core" version="1.12.0"> <artifact name="core-1.12.0.module"> <sha256 value="2f63fbeda23ca0919738d09e406de661f21bac583d6e04a1797dcb77e3b6ae95" origin="Generated by Gradle"/> @@ -1487,6 +1492,14 @@ <sha256 value="ddc851edba65fd15a7a1bc3ad18648e2f732dd5ad8ef3602224bce0647f5b4d1" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.emoji2" name="emoji2" version="1.4.0"> + <artifact name="emoji2-1.4.0.aar"> + <sha256 value="433febd3434a45667176c76a64f3f205ca6335a6b544c5b5d57f25a38a375242" origin="Generated by Gradle"/> + </artifact> + <artifact name="emoji2-1.4.0.module"> + <sha256 value="92be16cccb757f807bddd92f1fca95a038a810ccca051c4149c11682478954b8" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.emoji2" name="emoji2-views-helper" version="1.2.0"> <artifact name="emoji2-views-helper-1.2.0.module"> <sha256 value="a3a9db581abf1787b01ff15c40f059530e8e64f3937caa2d788f42eb39893268" origin="Generated by Gradle"/> @@ -1500,6 +1513,14 @@ <sha256 value="09974bb5ef9780de9d56715d71171a35c78fb2e17fd865773b0c83a3acac039c" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.emoji2" name="emoji2-views-helper" version="1.4.0"> + <artifact name="emoji2-views-helper-1.4.0.aar"> + <sha256 value="ed5d3ed772a5fbf0d570f7526f585cd61a180e60f9372584c328a68e2cff3375" origin="Generated by Gradle"/> + </artifact> + <artifact name="emoji2-views-helper-1.4.0.module"> + <sha256 value="248aa276fdba8116e656233cac3f3fd541444df2305de93e6813795fcd0ba26a" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.fragment" name="fragment" version="1.1.0"> <artifact name="fragment-1.1.0.aar"> <sha256 value="a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496" origin="Generated by Gradle"/> @@ -1542,14 +1563,6 @@ <sha256 value="33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.0"> - <artifact name="lifecycle-common-2.3.0.jar"> - <sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-common-2.3.0.module"> - <sha256 value="47bfb037959169dde7eedc6294d83ad061724e4dae27c03a4836e392d5ad5ba7" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.1"> <artifact name="lifecycle-common-2.3.1.jar"> <sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle"/> @@ -1571,11 +1584,6 @@ <sha256 value="0fa7f28f5cff8a406a4f7870b243cb0d6d7a7c20faa7a2becaff5907ae12f9cc" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-common" version="2.8.3"> - <artifact name="lifecycle-common-2.8.3.module"> - <sha256 value="056db8ab7dfcc25497051143d928e7cf8a11160f9fb217dbcd277a6fa34fe208" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-common" version="2.8.7"> <artifact name="lifecycle-common-2.8.7.module"> <sha256 value="0de78fc06ee5045d68fc7e81c313a2a3d53ac7d127f79f9bc95abf7be49e5764" origin="Generated by Gradle"/> @@ -1590,21 +1598,10 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.6.2"> - <artifact name="lifecycle-common-java8-2.6.2.jar"> - <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-common-java8-2.6.2.module"> <sha256 value="3d538207d68eb89aa0166edac09422b9374819506da39be62c01f0c0f6384f7e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.8.3"> - <artifact name="lifecycle-common-java8-2.8.3.jar"> - <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-common-java8-2.8.3.module"> - <sha256 value="0a63c3ebc7470da088520775ed9de23a2053246e762f33453bae5fd0a0435979" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.8.7"> <artifact name="lifecycle-common-java8-2.8.7.jar"> <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> @@ -1613,14 +1610,6 @@ <sha256 value="e27df2ab2f9c1c02fc16fe87e19da0ebb79b4b3f1e2bd2af17364bed59a0a2a9" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-common-jvm" version="2.8.3"> - <artifact name="lifecycle-common-jvm-2.8.3.jar"> - <sha256 value="61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-common-jvm-2.8.3.module"> - <sha256 value="d054fb08ef9e789886cecb20bb4b96b7f5c43f1a4cfb87bf120046ff9619b337" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-common-jvm" version="2.8.7"> <artifact name="lifecycle-common-jvm-2.8.7.jar"> <sha256 value="61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf" origin="Generated by Gradle"/> @@ -1642,14 +1631,6 @@ <sha256 value="19a287b46d1b1ffe297bee0df7dee5183aeba95600ec0de8742adeb5b67c8bab" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.8.3"> - <artifact name="lifecycle-livedata-2.8.3.aar"> - <sha256 value="fdbf70620b48550ab23fcf04d9ee59123bf8c31db26016ca74d3332a79444aee" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-livedata-2.8.3.module"> - <sha256 value="c5eb3d6241a79b06ffc6fdf7cb53a4afb9cc01f6fce6ce1d1a4e4a5459e8b8f3" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.8.7"> <artifact name="lifecycle-livedata-2.8.7.aar"> <sha256 value="703634525a67b1c6beaaab4f980dfa0bacdf7e143d0b5d51f5ac0d9404400290" origin="Generated by Gradle"/> @@ -1658,14 +1639,6 @@ <sha256 value="d72516cfce78bef654fe5df4c99b9dabd19780c95053268a6d5b4b0dda2d4323" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.0"> - <artifact name="lifecycle-livedata-core-2.3.0.aar"> - <sha256 value="89f480888f2bb8eb62d9b7b1eb34be69b59ec84b24a1b0bdbeb49973478c6da3" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-livedata-core-2.3.0.module"> - <sha256 value="1db780dc703f46140f87c8c6ad856e3d7bbd3ec1312dfdbb6467083913fe333b" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.1"> <artifact name="lifecycle-livedata-core-2.3.1.aar"> <sha256 value="e55d38c372460f0a03997ddc950c67227511340fd74f8634d99d29653cd81ab1" origin="Generated by Gradle"/> @@ -1692,14 +1665,6 @@ <sha256 value="527d0e1ac467d1f47cc20ed7c30db170217299fabb868154cf5d1765e4e4dad9" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.8.3"> - <artifact name="lifecycle-livedata-core-2.8.3.aar"> - <sha256 value="01779694b1e822d2eeb9decec86f40dc2983806b985fb48ee116c860534e7ac5" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-livedata-core-2.8.3.module"> - <sha256 value="419354ed1fcf98b7fad9dbdc9c60cb3772a46e734c10d6b54e1567916b263d15" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.8.7"> <artifact name="lifecycle-livedata-core-2.8.7.aar"> <sha256 value="d786e5e6f79b8fab026f09a2d4ae3de1d72875f7645a6b7be48f1d9ab384734b" origin="Generated by Gradle"/> @@ -1713,14 +1678,6 @@ <sha256 value="d8699c515516aee3a0613de951649d9f1e137d33fedf077be0a6aa9e01ae211f" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.8.3"> - <artifact name="lifecycle-livedata-core-ktx-2.8.3.aar"> - <sha256 value="d6bedec258e3bfc86d2cba27fea4c03d82872057bfca2a4342461e6defb2d35e" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-livedata-core-ktx-2.8.3.module"> - <sha256 value="4d73c52e4cc5e945350a9eead0521b846428c723111ef70bdb412aaaf45cf114" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.8.7"> <artifact name="lifecycle-livedata-core-ktx-2.8.7.aar"> <sha256 value="b6e785e8532b155921310563a90fd262b5dacf6964aeea6cbbe412ac1da59460" origin="Generated by Gradle"/> @@ -1747,14 +1704,6 @@ <sha256 value="d927d41903a2ff02ba1b9fefa4c25cb58187b1ce3a054945f43ce6a29918a3f3" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-process" version="2.8.3"> - <artifact name="lifecycle-process-2.8.3.aar"> - <sha256 value="d3fa2257cd4cf512717dc08c13338872b136b97d2d510fce373b9cc391ea19b9" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-process-2.8.3.module"> - <sha256 value="e34ce64204e8e92713e7f98366f942f01c07bd344426050dad2a1f5d74ff962d" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-process" version="2.8.7"> <artifact name="lifecycle-process-2.8.7.aar"> <sha256 value="62e076a2de2d650a23bf79495419f8a4357ad8e9b28d801318d0fcdd6e35fa87" origin="Generated by Gradle"/> @@ -1764,9 +1713,6 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.0"> - <artifact name="lifecycle-runtime-2.3.0.aar"> - <sha256 value="94f528fd5fb123f75b6e65d07a6ef5cd6c0e69ac604d106aaa12705282456234" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-runtime-2.3.0.module"> <sha256 value="01f17f2bc714167f2cc1e66ccf74cbced329fd5be884872c786be69616ca5aad" origin="Generated by Gradle"/> </artifact> @@ -1792,12 +1738,10 @@ <sha256 value="ea0131846abe1fe9dea59ac6dfe1f0fb9d8b6d600c9eff9a1fd4ad5ee5e7cbc7" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.8.3"> - <artifact name="lifecycle-runtime-2.8.3.module"> - <sha256 value="bb03b4ef4bccd8a9e5fd384c84497745adf7d4c217e12cb15df8d9be4a629ef1" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.8.7"> + <artifact name="lifecycle-runtime-2.8.7.aar"> + <sha256 value="d4ae4e8dc0ca6265b683d7b2333a102a3ee84ad97ccb9fbec4334f5cd0e3f54d" origin="Generated by Gradle"/> + </artifact> <artifact name="lifecycle-runtime-2.8.7.module"> <sha256 value="cb00e5cb9283b75948dcc0d27234fb6d72a80c34dcb7b3b8d493185e4316bf85" origin="Generated by Gradle"/> </artifact> @@ -1805,14 +1749,6 @@ <sha256 value="4ee784530e550754230395d4f4f56817c9fcbc08db4d645e77441f3dd82c56b5" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-runtime-android" version="2.8.3"> - <artifact name="lifecycle-runtime-android-2.8.3.module"> - <sha256 value="7f881812b61b2b4ecde7a5a463a3fd8005366d45db36f14e5b539a24095379f7" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-runtime-release.aar"> - <sha256 value="e761ff6f4f07093558b7cd370928f31d53b46ea91441f52dd535da96d4708c2b" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-runtime-android" version="2.8.7"> <artifact name="lifecycle-runtime-android-2.8.7.module"> <sha256 value="4d1b3881c98d42934cb8d5de7c8a9e12049549a5147718647d7be6ca6d958c46" origin="Generated by Gradle"/> @@ -1821,11 +1757,6 @@ <sha256 value="b8eb997dd434d70eb97cbd6d1395b6337c6771717c7acd59f11c0853f3860284" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-runtime-compose" version="2.8.3"> - <artifact name="lifecycle-runtime-compose-2.8.3.module"> - <sha256 value="3cec9cf28f2a1316b33d0789186eba3ea7b0ce6ea010a7c245489895d5842d56" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-runtime-compose" version="2.8.7"> <artifact name="lifecycle-runtime-compose-2.8.7.module"> <sha256 value="cc98a8849d81dab3064bc9ff871e43e91b48e0ba7d521f7c99ba26afec25657c" origin="Generated by Gradle"/> @@ -1834,14 +1765,6 @@ <sha256 value="bb5489c9bf561b7addcff4179b10f959b3d441aa0fbae5c2d24a9065913fa212" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-runtime-compose-android" version="2.8.3"> - <artifact name="lifecycle-runtime-compose-android-2.8.3.module"> - <sha256 value="e01376e5ab698aa5c58fd95e17803a3478addc8b1a33014a63ddd50e485e59fe" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-runtime-compose-release.aar"> - <sha256 value="caceffd076b9874f75eac720ae48cb2e8bfa55631395b97fb0f682d279342a15" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-runtime-compose-android" version="2.8.7"> <artifact name="lifecycle-runtime-compose-android-2.8.7.module"> <sha256 value="c024a16694c8b5c41ec8ef0ede2365eb612f8a3da25017fdf2ff343029f33902" origin="Generated by Gradle"/> @@ -1872,18 +1795,10 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.6.2"> - <artifact name="lifecycle-runtime-ktx-2.6.2.aar"> - <sha256 value="28a0b834f40edd52e2f8010bdc3057d2a0cc76aaa5ac9311adb0b9ce919ca9cc" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-runtime-ktx-2.6.2.module"> <sha256 value="3c9af03a3a543394e67ab599b727ba331e6f330a55829f6d52f63a8772f4cbdc" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.8.3"> - <artifact name="lifecycle-runtime-ktx-2.8.3.module"> - <sha256 value="69cd3410604687fec47106580987a1ec2dc71c3d5496c19ed30fd13c0d0cdbb9" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.8.7"> <artifact name="lifecycle-runtime-ktx-2.8.7.module"> <sha256 value="09c6dcf0fee2ad69c523db6c2a343168a8d9e9d27743cf84b69c757b7fcab243" origin="Generated by Gradle"/> @@ -1892,14 +1807,6 @@ <sha256 value="92e90c3bd6cc2f66a15e9597cc015cd3a2f8767a9bd29d7feadaea4d44b2fccf" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-runtime-ktx-android" version="2.8.3"> - <artifact name="lifecycle-runtime-ktx-android-2.8.3.module"> - <sha256 value="96af6feb02573fd517d5b4a7d6135cae8f0e0578a822bf88b213483985283c33" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-runtime-ktx-release.aar"> - <sha256 value="d3f5d1423bc6dc0c7343a72389425be4b6ef832ef461faf1542bbc624bdb3918" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-runtime-ktx-android" version="2.8.7"> <artifact name="lifecycle-runtime-ktx-android-2.8.7.module"> <sha256 value="adc61521e894f163beee3aedc8c4c0dfb5991663b88ea1ea7798fac95694e17d" origin="Generated by Gradle"/> @@ -1917,9 +1824,6 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.0"> - <artifact name="lifecycle-viewmodel-2.3.0.aar"> - <sha256 value="cea8f26fa232037922b69af9cd1bde2df1211acc8b75253e425b7150a5fca59d" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-viewmodel-2.3.0.module"> <sha256 value="feeb5ec453c20d8c1900b0849d2066edc8a41532ce0088d641c4a886bae57a08" origin="Generated by Gradle"/> </artifact> @@ -1945,14 +1849,6 @@ <sha256 value="74e9a9ea46842a25642c91de2190ac24dcc1ea017395aae0eb250057d32699c6" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.8.3"> - <artifact name="lifecycle-viewmodel-2.8.3.aar"> - <sha256 value="43d28a6c6da9c1cb72bfb5cc1b511a7937b2db8b79d52f37d0b7f14c79b090dd" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-viewmodel-2.8.3.module"> - <sha256 value="d1672241104db11cc5792024aaaa991555e52ad3332b46145bf01ca1bd523d42" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.8.7"> <artifact name="lifecycle-viewmodel-2.8.7.aar"> <sha256 value="43d28a6c6da9c1cb72bfb5cc1b511a7937b2db8b79d52f37d0b7f14c79b090dd" origin="Generated by Gradle"/> @@ -1964,14 +1860,6 @@ <sha256 value="539281344ce8a81d33570be300d86bb872c7b719a6dd2ce494eacba438fb53ce" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-viewmodel-android" version="2.8.3"> - <artifact name="lifecycle-viewmodel-android-2.8.3.module"> - <sha256 value="7c2dac235696b9ac575e1df0014e82a78c5ca8196bcc298a52accda4c72e351d" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-viewmodel-release.aar"> - <sha256 value="bbf54dcc300c81ea91f5667ac0b85934b2cbcaffc0806d8389df146cc2148a5c" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-android" version="2.8.7"> <artifact name="lifecycle-viewmodel-android-2.8.7.module"> <sha256 value="b04994ce67d6999438316ff41b2ddb84613a64b8f81399ef3074895ad81065dc" origin="Generated by Gradle"/> @@ -1981,18 +1869,10 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.6.2"> - <artifact name="lifecycle-viewmodel-compose-2.6.2.aar"> - <sha256 value="c2b820204c2ca58ef9cb015a3e5ffbe88d8c55b09e5cb851d62b445528a379e0" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-viewmodel-compose-2.6.2.module"> <sha256 value="55ba297e2fc68b1f9f673fbf9c2173e8deddf5aea23d9136f228eaa5fac57428" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.8.3"> - <artifact name="lifecycle-viewmodel-compose-2.8.3.module"> - <sha256 value="2ce70db02d78339139a86200acfcacc1d88204eae2ce3dde490dd9d58da81f80" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.8.7"> <artifact name="lifecycle-viewmodel-compose-2.8.7.module"> <sha256 value="051a91eedd88c18b522c4b7b540f9361085ef446f2223ca16589d98ed626ac78" origin="Generated by Gradle"/> @@ -2001,14 +1881,6 @@ <sha256 value="68457770ac6b3e12b5f688d54e8227253cbebf1b3c137fbd00833ed4c45bd4bd" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-android" version="2.8.3"> - <artifact name="lifecycle-viewmodel-compose-android-2.8.3.module"> - <sha256 value="0cbc02375a8fe595f28484b1e4de95e965c570e588e69b496a1b3d563cb657af" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-viewmodel-compose-release.aar"> - <sha256 value="d9080f44357fc1c9a107a1ffa00619af27f1c47401a998e6b4282fe19ed338e3" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-android" version="2.8.7"> <artifact name="lifecycle-viewmodel-compose-android-2.8.7.module"> <sha256 value="032b0fa892cc04ced39c4c5f0c73e5a0148da0847bf4bfb76fc275e143d48e88" origin="Generated by Gradle"/> @@ -2039,21 +1911,10 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.6.2"> - <artifact name="lifecycle-viewmodel-ktx-2.6.2.aar"> - <sha256 value="7fc0fa234a3321b1f34db5862b17da83d1c62c1bc66ec2fd4f1bb0a771acfabb" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-viewmodel-ktx-2.6.2.module"> <sha256 value="16d314c6ec774cf83216c46e6e7fa96c615e1d2611995d368389154b57741861" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.8.3"> - <artifact name="lifecycle-viewmodel-ktx-2.8.3.aar"> - <sha256 value="e17b0cd40081a86ca3adcb8b135ee82f3dd842db42072eb2901c64a2773a6d75" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-viewmodel-ktx-2.8.3.module"> - <sha256 value="e4a8a54c3e823d4a8140391411e6006555e1b62963e1e7544f989d5c249d7e4a" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.8.7"> <artifact name="lifecycle-viewmodel-ktx-2.8.7.aar"> <sha256 value="1acebb50df2f0c07f379d5e23a28f7794f70efb2b6c834acebe8c394784ee6d4" origin="Generated by Gradle"/> @@ -2063,9 +1924,6 @@ </artifact> </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.0"> - <artifact name="lifecycle-viewmodel-savedstate-2.3.0.aar"> - <sha256 value="49f9532b5104cc1ee64900ed4f696d031d807fba726e0d5d6a52459e8fba4a1d" origin="Generated by Gradle"/> - </artifact> <artifact name="lifecycle-viewmodel-savedstate-2.3.0.module"> <sha256 value="aaebeb10e23b2ca35346e767aead804254a9889623873fc5cab2041dc931ad9c" origin="Generated by Gradle"/> </artifact> @@ -2096,14 +1954,6 @@ <sha256 value="79f9d92880c2fb7827ac6739eb747264245ae456f4c21f77cf39fdb6a50a76ae" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.8.3"> - <artifact name="lifecycle-viewmodel-savedstate-2.8.3.aar"> - <sha256 value="839dd12453c4e05116732831ff49f210893cc99b7091bb9a124988911c537734" origin="Generated by Gradle"/> - </artifact> - <artifact name="lifecycle-viewmodel-savedstate-2.8.3.module"> - <sha256 value="30e94513464dbd0a613e79196fdce2d0dbdaa44fe58397b9db4d5794c5ba4d99" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.8.7"> <artifact name="lifecycle-viewmodel-savedstate-2.8.7.aar"> <sha256 value="646f2a42d2884b02308fb19837089e2669835fe21ca6a5b60666d5eb94d081dd" origin="Generated by Gradle"/> @@ -5610,9 +5460,9 @@ <sha256 value="f78c5d8c09db985912ab83a1de3c3b53ddf208d7b151f06a72358ea3e137d01b" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.20"> - <artifact name="kotlin-stdlib-1.8.20.jar"> - <sha256 value="4395647b1961d9fb730a34e8dbe56c293157bc0759004cca63d9b5ee6653e5c7" origin="Generated by Gradle"/> + <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.22"> + <artifact name="kotlin-stdlib-1.8.22.jar"> + <sha256 value="03a5c3965cc37051128e64e46748e394b6bd4c97fa81c6de6fc72bfd44e3421b" origin="Generated by Gradle"/> </artifact> </component> <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.20"> @@ -5669,9 +5519,9 @@ <sha256 value="812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.20"> - <artifact name="kotlin-stdlib-common-1.8.20.jar"> - <sha256 value="fa20188abaa8ecf1d0035e93a969b071f10e45a1c8378c314521eade73f75fd5" origin="Generated by Gradle"/> + <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.22"> + <artifact name="kotlin-stdlib-common-1.8.22.jar"> + <sha256 value="d0c2365e2437ef70f34586d50f055743f79716bcfe65e4bc7239cdd2669ef7c5" origin="Generated by Gradle"/> </artifact> </component> <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.20"> @@ -5928,14 +5778,6 @@ <sha256 value="68516559e6f84a621b9783cd892a64630ccd7875843588ddb3f0501425e33f15" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.7.1"> - <artifact name="kotlinx-coroutines-android-1.7.1.jar"> - <sha256 value="107313760c18f8da174e8d8103504a468e806e88f7b55a84bd1c0eaeea118e9a" origin="Generated by Gradle"/> - </artifact> - <artifact name="kotlinx-coroutines-android-1.7.1.module"> - <sha256 value="beb7ff0f5ebc63a0b30af2ae1214e0b622a7b7e408240e64a8ea5b213c4d5334" origin="Generated by Gradle"/> - </artifact> - </component> <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.7.3"> <artifact name="kotlinx-coroutines-android-1.7.3.jar"> <sha256 value="59fffb26bee12c32dadcfa5d420c2a7db85d3253518128b170efda726613256d" origin="Generated by Gradle"/> diff --git a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt index d8a373c2b2..2b74716950 100644 --- a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt +++ b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt @@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.lib.tv import androidx.activity.compose.BackHandler import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.background +import androidx.compose.foundation.focusGroup import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -14,7 +15,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.selection.selectableGroup import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountCircle import androidx.compose.material.icons.filled.Settings @@ -27,12 +27,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusDirection -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.FocusRequester.Companion.Cancel -import androidx.compose.ui.focus.FocusRequester.Companion.Default -import androidx.compose.ui.focus.focusProperties -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.focus.focusRestorer import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector @@ -87,7 +82,6 @@ fun NavigationDrawerTv( content: @Composable () -> Unit, ) { val drawerState = rememberDrawerState(initialDrawerValue) - val focusRequester = remember { FocusRequester() } val brush = remember { Brush.horizontalGradient(listOf(Color.Black, Color.Transparent)) } val focusManager = LocalFocusManager.current @@ -102,10 +96,6 @@ fun NavigationDrawerTv( } ModalNavigationDrawer( - modifier = - Modifier.focusRequester(focusRequester).focusProperties { - enter = { if (focusRequester.restoreFocusedChild()) Cancel else Default } - }, drawerState = drawerState, scrimBrush = brush, drawerContent = { @@ -118,7 +108,8 @@ fun NavigationDrawerTv( start = Dimens.tvDrawerHorizontalPadding, end = Dimens.tvDrawerHorizontalPadding, ) - .selectableGroup() + .focusRestorer() + .focusGroup() ) { val animatedPadding = animateDpAsState( @@ -134,19 +125,13 @@ fun NavigationDrawerTv( deviceName = deviceName, ) DrawerItemTv( - modifier = - Modifier.align(Alignment.CenterStart).onFocusChanged { - focusRequester.saveFocusedChild() - }, + modifier = Modifier.align(Alignment.CenterStart), icon = Icons.Default.AccountCircle, text = stringResource(R.string.settings_account), onClick = onAccountClick, ) DrawerItemTv( - modifier = - Modifier.align(Alignment.BottomStart).onFocusChanged { - focusRequester.saveFocusedChild() - }, + modifier = Modifier.align(Alignment.BottomStart), icon = Icons.Default.Settings, text = stringResource(R.string.settings), onClick = onSettingsClick, diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/ManageDevicesMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/ManageDevicesMockApiTest.kt index dafb6e3615..6b2248a6b0 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/ManageDevicesMockApiTest.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/ManageDevicesMockApiTest.kt @@ -46,6 +46,8 @@ class ManageDevicesMockApiTest : MockApiTest() { secondDevice.findObject(By.clickable(true)).click() app.clickActionButtonByText("Remove") + device.waitForIdle() + // Assert - the other device is no longer shown assertNull(device.findObject(By.text("Yellow Hat"))) } |