diff options
Diffstat (limited to 'android')
3 files changed, 12 insertions, 15 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt index 69bc87ce9f..c1c7af8869 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt @@ -27,13 +27,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.LinkAnnotation import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withLink import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph @@ -50,7 +47,6 @@ import net.mullvad.mullvadvpn.compose.component.MullvadCircularProgressIndicator import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle -import net.mullvad.mullvadvpn.compose.util.toDp import net.mullvad.mullvadvpn.constant.DAEMON_READY_TIMEOUT_MS import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens @@ -138,33 +134,33 @@ private fun Content(isPlayBuild: Boolean) { Column { Text( text = stringResource(id = R.string.privacy_disclaimer_title), - style = MaterialTheme.typography.headlineSmall, + style = MaterialTheme.typography.headlineLarge, color = MaterialTheme.colorScheme.onSurface, - fontWeight = FontWeight.Bold, ) - val fontSize = 14.sp + Spacer(modifier = Modifier.height(Dimens.smallPadding)) + Text( text = stringResource(id = R.string.privacy_disclaimer_body_first_paragraph), - fontSize = fontSize, color = MaterialTheme.colorScheme.onSurface, - modifier = Modifier.padding(top = 10.dp), + style = MaterialTheme.typography.bodySmall, ) - Spacer(modifier = Modifier.height(fontSize.toDp() + Dimens.smallPadding)) + Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing)) Text( text = stringResource(id = R.string.privacy_disclaimer_body_second_paragraph), - fontSize = fontSize, color = MaterialTheme.colorScheme.onSurface, + style = MaterialTheme.typography.bodySmall, ) - Spacer(modifier = Modifier.height(fontSize.toDp() + Dimens.smallPadding)) + Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing)) Row(verticalAlignment = Alignment.CenterVertically) { Text( text = buildPrivacyPolicyAnnotatedString(isPlayBuild), modifier = Modifier.padding(end = Dimens.miniPadding), + style = MaterialTheme.typography.bodySmall, ) Icon( diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt index 9eb0aae4b2..3625c8ed0a 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt @@ -36,7 +36,8 @@ private val MullvadTypography = lineHeight = TypeScale.HeadlineMediumLineHeight, ), headlineSmall = TextStyle(fontSize = TypeScale.TextBig, fontWeight = FontWeight.Bold), - bodySmall = TextStyle(fontSize = TypeScale.TextSmall), + bodySmall = + TextStyle(fontSize = TypeScale.TextSmall, lineHeight = TypeScale.TextMediumPlus), titleSmall = TextStyle(fontSize = TypeScale.TextMedium, fontWeight = FontWeight.SemiBold), titleMedium = TextStyle(fontSize = TypeScale.TextMediumPlus, fontWeight = FontWeight.SemiBold), diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt index 51b4f5efb8..dde3d9c7cb 100644 --- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt +++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt @@ -53,7 +53,7 @@ data class Dimensions( val problemReportIconToTitlePadding: Dp = 60.dp, val reconnectButtonMinInteractiveComponentSize: Dp = 40.dp, val relayCircleSize: Dp = 16.dp, - val screenVerticalMargin: Dp = 22.dp, + val screenVerticalMargin: Dp = 24.dp, val searchFieldHeight: Dp = 42.dp, // Search view full screen header container height (material design guidelines) val searchFieldHeightExpanded: Dp = 72.dp, @@ -62,7 +62,7 @@ data class Dimensions( val selectLocationTitlePadding: Dp = 12.dp, val selectableCellTextMargin: Dp = 12.dp, val settingsDetailsImageMaxWidth: Dp = 480.dp, - val sideMargin: Dp = 22.dp, + val sideMargin: Dp = 24.dp, val smallIconSize: Dp = 16.dp, val smallPadding: Dp = 8.dp, val smallSpacer: Dp = 8.dp, |