diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-11-04 09:50:55 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-11-04 09:50:55 +0100 |
| commit | a402eca8d2e246f32ca77794a0dcaa539c1cb325 (patch) | |
| tree | 8d3d50ec9779b4650c3adee13aec5ae1ece8dace | |
| parent | 76cce40f1c293a3f70c4a1bd8975bb53b54fa44c (diff) | |
| parent | 11b146ff5956c1daadea401fe18dfbd3908fd2d5 (diff) | |
| download | mullvadvpn-a402eca8d2e246f32ca77794a0dcaa539c1cb325.tar.xz mullvadvpn-a402eca8d2e246f32ca77794a0dcaa539c1cb325.zip | |
Merge branch 'include-account-token-fixes'
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt index 28ed5e18c6..1801b7338f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt @@ -68,6 +68,7 @@ import net.mullvad.mullvadvpn.compose.util.SecureScreenWhileInView import net.mullvad.mullvadvpn.compose.util.clickableAnnotatedString import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.color.Alpha80 import net.mullvad.mullvadvpn.lib.theme.color.warning import net.mullvad.mullvadvpn.lib.ui.component.ExpandChevron import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild @@ -281,7 +282,11 @@ private fun IncludeAccountInformationCheckBox( Column( modifier = Modifier.animateContentSize() - .border(width = Dp.Hairline, color = MaterialTheme.colorScheme.primary) + .border( + width = Dp.Hairline, + color = MaterialTheme.colorScheme.primary, + shape = MaterialTheme.shapes.medium, + ) .padding(bottom = if (includeAccountInformation) Dimens.smallPadding else 0.dp) ) { CheckboxCell( @@ -313,7 +318,10 @@ private fun AccountInformationWarning( Column( modifier = Modifier.padding(horizontal = Dimens.tinyPadding) - .background(MaterialTheme.colorScheme.surfaceDim) + .background( + color = MaterialTheme.colorScheme.surfaceContainer.copy(alpha = Alpha80), + shape = MaterialTheme.shapes.medium, + ) .animateContentSize() ) { Row( @@ -331,11 +339,8 @@ private fun AccountInformationWarning( start = Dimens.smallPadding, end = Dimens.smallPadding, bottom = - if (showIncludeAccountInformationWarningMessage) { - Dimens.tinyPadding - } else { - Dimens.smallPadding - }, + if (showIncludeAccountInformationWarningMessage) Dimens.tinyPadding + else Dimens.smallPadding, ) ) { Icon( |