diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-06 14:32:32 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-06 14:32:32 +0100 |
| commit | 48c023ea883be51aedd0cc3eccac2d4fec77ab2c (patch) | |
| tree | c06dd0e68406d1ec30e13c3ed5bd5d797ad09090 /android/app/src/main | |
| parent | f42dcb304d1571c22570bc5a7f2e59199e7b744d (diff) | |
| parent | 16e3bfbb2d380c42efff94902f79b9eff6ecacc8 (diff) | |
| download | mullvadvpn-48c023ea883be51aedd0cc3eccac2d4fec77ab2c.tar.xz mullvadvpn-48c023ea883be51aedd0cc3eccac2d4fec77ab2c.zip | |
Merge branch 'compose-1-6-0'
Diffstat (limited to 'android/app/src/main')
4 files changed, 10 insertions, 6 deletions
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7107705496..b4043fdee5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -39,7 +39,8 @@ android:launchMode="singleInstance" android:configChanges="orientation|screenSize|screenLayout" android:screenOrientation="fullUser" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + tools:ignore="DiscouragedApi"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> 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( |