diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-29 08:47:23 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-29 09:46:52 +0200 |
| commit | 54e47a92a8fcc8bb22eda4bb759dae6c892b1865 (patch) | |
| tree | 342efe14c6d0c8c9989cbb54aac19185cb1daa1e /android/app/src | |
| parent | d4fc333e56b50b7e634d3b57f75d9373de00aa41 (diff) | |
| download | mullvadvpn-54e47a92a8fcc8bb22eda4bb759dae6c892b1865.tar.xz mullvadvpn-54e47a92a8fcc8bb22eda4bb759dae6c892b1865.zip | |
Fix material api changes
Diffstat (limited to 'android/app/src')
4 files changed, 8 insertions, 7 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt index 893ac23825..fb210b1661 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheetTest.kt @@ -41,8 +41,8 @@ class AddTimeBottomSheetTest { sheetState: SheetState = SheetState( skipPartiallyExpanded = true, - density = Density(1f), - initialValue = SheetValue.Expanded, + positionalThreshold = { 0f }, + velocityThreshold = { 0f }, ), onPurchaseBillingProductClick: (ProductId) -> Unit = {}, onPlayPaymentInfoClick: () -> Unit = {}, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt index fed7e9f995..57a473d085 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt @@ -76,7 +76,8 @@ private fun PreviewPaymentBottomSheet( sheetState = SheetState( skipPartiallyExpanded = true, - density = Density(1f), + positionalThreshold = { 0f }, + velocityThreshold = { 0f }, initialValue = SheetValue.Expanded, ), onPurchaseBillingProductClick = {}, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt index 3c818c2591..cd3a6938ff 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt @@ -6,10 +6,10 @@ import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuAnchorType import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.Text import androidx.compose.material3.TextField import androidx.compose.material3.TextFieldColors @@ -38,7 +38,7 @@ fun MullvadExposedDropdownMenuBox( modifier = modifier.clickable { expanded = !expanded }, ) { TextField( - modifier = Modifier.fillMaxWidth().menuAnchor(MenuAnchorType.PrimaryNotEditable, true), + modifier = Modifier.fillMaxWidth().menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable, true), readOnly = true, value = title, onValueChange = { /* Do nothing */ }, 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 61ac5af013..25bc842870 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 @@ -252,7 +252,7 @@ fun MullvadMediumTopBar( navigationIcon = navigationIcon, scrollBehavior = scrollBehavior, colors = - TopAppBarDefaults.mediumTopAppBarColors( + TopAppBarDefaults.topAppBarColors( containerColor = MaterialTheme.colorScheme.surface, scrolledContainerColor = MaterialTheme.colorScheme.surface, actionIconContentColor = MaterialTheme.colorScheme.onSurface, @@ -281,7 +281,7 @@ fun MullvadLargeTopBar( navigationIcon = navigationIcon, scrollBehavior = scrollBehavior, colors = - TopAppBarDefaults.mediumTopAppBarColors( + TopAppBarDefaults.topAppBarColors( containerColor = MaterialTheme.colorScheme.surface, scrolledContainerColor = MaterialTheme.colorScheme.surface, actionIconContentColor = MaterialTheme.colorScheme.onSurface, |