diff options
Diffstat (limited to 'android/app/src')
4 files changed, 10 insertions, 10 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..6c1ab3cebd 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 @@ -2,12 +2,10 @@ package net.mullvad.mullvadvpn.compose.component import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.SheetState -import androidx.compose.material3.SheetValue import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick -import androidx.compose.ui.unit.Density import de.mannodermaus.junit5.compose.ComposeContext import io.mockk.every import io.mockk.mockk @@ -41,8 +39,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..2c522b7c7e 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 @@ -34,7 +34,6 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter -import androidx.compose.ui.unit.Density import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R @@ -76,7 +75,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..a100776f78 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,9 @@ 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, |