diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-02 12:48:54 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-06 13:35:42 +0100 |
| commit | 3a8a23d1e83a51bbe2719c96f71b06f5b0517961 (patch) | |
| tree | 80714af7f4958735c59ab14ace540e1f131dd34c /android | |
| parent | 59e1ae7baaa4fc37031c2806a415d659d4d9b236 (diff) | |
| download | mullvadvpn-3a8a23d1e83a51bbe2719c96f71b06f5b0517961.tar.xz mullvadvpn-3a8a23d1e83a51bbe2719c96f71b06f5b0517961.zip | |
Update compose material 3 to 1.2.0-rc01
Diffstat (limited to 'android')
4 files changed, 9 insertions, 6 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt index c38eafa24e..3bb092b0de 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.MaterialTheme @@ -33,7 +32,6 @@ private fun PreviewMullvadFilterChip() { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun MullvadFilterChip(text: String, onRemoveClick: () -> Unit) { FilterChip( @@ -44,7 +42,9 @@ fun MullvadFilterChip(text: String, onRemoveClick: () -> Unit) { border = FilterChipDefaults.filterChipBorder( borderColor = Color.Transparent, - disabledBorderColor = Color.Transparent + disabledBorderColor = Color.Transparent, + enabled = true, + selected = false ), selected = false, onClick = {}, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt index 319cd9e954..d7b4541116 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt @@ -230,6 +230,7 @@ fun MullvadMediumTopBar( colors = TopAppBarDefaults.mediumTopAppBarColors( containerColor = MaterialTheme.colorScheme.background, + scrolledContainerColor = MaterialTheme.colorScheme.background, actionIconContentColor = MaterialTheme.colorScheme.onPrimary.copy(AlphaTopBar), ), actions = actions diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt index 33414dcbaa..cf5d4f02c7 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt @@ -181,8 +181,10 @@ fun SelectLocationScreen( uiState.relayListState.selectedRelay.location.location.country } - lazyListState.scrollToItem(index) - lazyListState.animateScrollAndCentralizeItem(index) + if (index >= 0) { + lazyListState.scrollToItem(index) + lazyListState.animateScrollAndCentralizeItem(index) + } } } LazyColumn( diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 2d93cfb87e..bbf99515d0 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -39,7 +39,7 @@ object Versions { const val base = "1.6.0" const val constrainLayout = "1.0.1" const val foundation = base - const val material3 = "1.1.1" + const val material3 = "1.2.0-rc01" } object Plugin { |