diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-06-25 15:09:37 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-06-25 15:09:37 +0200 |
| commit | a2150d26e21d20221232ed35709cc4427f7e14a9 (patch) | |
| tree | 16e2d6fc17fc30aee7aa130ccc2b599167a7f756 /android/app | |
| parent | d604ed8cc5a0eb0a5d26d28fdfba83c6cdcee672 (diff) | |
| parent | 79b06d0af9d14d6de752d28d2965b35c4a3b3bb1 (diff) | |
| download | mullvadvpn-a2150d26e21d20221232ed35709cc4427f7e14a9.tar.xz mullvadvpn-a2150d26e21d20221232ed35709cc4427f7e14a9.zip | |
Merge branch 'crash-on-first-start-droid-1090'
Diffstat (limited to 'android/app')
4 files changed, 9 insertions, 5 deletions
diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml index 0ab48b375d..9f67e68efa 100644 --- a/android/app/lint-baseline.xml +++ b/android/app/lint-baseline.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0)" variant="all" version="8.3.0"> +<issues format="6" by="lint 8.4.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0)" variant="all" version="8.4.0"> <issue id="UseCheckPermission" @@ -25,7 +25,7 @@ <issue id="QueryAllPackagesPermission" - message="A `<queries>` declaration should generally be used instead of QUERY_ALL_PACKAGES; \
see https://g.co/dev/packagevisibility for details" + message="A `<queries>` declaration should generally be used instead of QUERY_ALL_PACKAGES; see https://g.co/dev/packagevisibility for details" errorLine1=" <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> <location diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt index edd697dfec..9cbd5df5be 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt @@ -59,7 +59,7 @@ fun MullvadModalBottomSheet( sheetState = sheetState, containerColor = backgroundColor, modifier = modifier, - windowInsets = WindowInsets(0, 0, 0, 0), // No insets + contentWindowInsets = { WindowInsets(0, 0, 0, 0) }, // No insets dragHandle = { BottomSheetDefaults.DragHandle(color = onBackgroundColor) } ) { sheetContent() diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt index 95d5ca6dcf..72d984b859 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt @@ -160,7 +160,7 @@ private fun ConstraintLayoutScope.AutoConnectCarousel( ) { HorizontalPager( state = pagerState, - beyondBoundsPageCount = 2, + beyondViewportPageCount = 2, modifier = Modifier.constrainAs(pager) { top.linkTo(parent.top) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt index 69b387ee7a..3cae498891 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/TextFieldColors.kt @@ -36,7 +36,11 @@ fun mullvadWhiteTextFieldColors(): TextFieldColors = unfocusedSupportingTextColor = Color.Black, focusedIndicatorColor = MaterialTheme.colorScheme.onPrimary, unfocusedIndicatorColor = MaterialTheme.colorScheme.onPrimary, - errorIndicatorColor = MaterialTheme.colorScheme.error + errorIndicatorColor = MaterialTheme.colorScheme.error, + focusedContainerColor = MaterialTheme.colorScheme.onBackground, + unfocusedContainerColor = MaterialTheme.colorScheme.onBackground, + errorContainerColor = MaterialTheme.colorScheme.onBackground, + disabledContainerColor = MaterialTheme.colorScheme.onBackground ) @Preview |