summaryrefslogtreecommitdiffhomepage
path: root/android/app/src
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson90@gmail.com>2023-10-27 09:48:20 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-10-30 13:21:25 +0100
commit443abbe584dc7e62ff31197a6d36f232a52f7e56 (patch)
tree7cdbafbdd7293dff0faffddbcbca881bd84414ea /android/app/src
parentbef0b156b6ec8c8f7ccad3eee81c20606039dae0 (diff)
downloadmullvadvpn-443abbe584dc7e62ff31197a6d36f232a52f7e56.tar.xz
mullvadvpn-443abbe584dc7e62ff31197a6d36f232a52f7e56.zip
Align big icon size
Diffstat (limited to 'android/app/src')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt4
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt6
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt5
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt2
4 files changed, 8 insertions, 9 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
index 4aee08fed9..19a06e453d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.rememberScrollState
@@ -130,8 +131,7 @@ fun DeviceListScreen(
end.linkTo(parent.end)
}
.padding(top = Dimens.iconFailSuccessTopMargin)
- .width(Dimens.iconFailSuccessSize)
- .height(Dimens.iconFailSuccessSize)
+ .size(Dimens.bigIconSize)
)
Column(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
index 102911ae36..5ec6b9a64b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
@@ -5,8 +5,8 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -26,6 +26,7 @@ import net.mullvad.mullvadvpn.compose.button.DeviceRevokedLoginButton
import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
import net.mullvad.mullvadvpn.compose.state.DeviceRevokedUiState
import net.mullvad.mullvadvpn.lib.theme.AppTheme
+import net.mullvad.mullvadvpn.lib.theme.Dimens
@Preview
@Composable
@@ -72,8 +73,7 @@ fun DeviceRevokedScreen(
end.linkTo(parent.end)
}
.padding(horizontal = 12.dp)
- .width(80.dp)
- .height(80.dp)
+ .size(Dimens.bigIconSize)
)
Column(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
index fe951fe878..f6f1aa3626 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
@@ -245,10 +245,7 @@ private fun LoginContent(
@Composable
private fun LoginIcon(loginState: LoginState, modifier: Modifier = Modifier) {
- Box(
- contentAlignment = Alignment.Center,
- modifier = modifier.size(Dimens.loginIconContainerSize)
- ) {
+ Box(contentAlignment = Alignment.Center, modifier = modifier.size(Dimens.bigIconSize)) {
when (loginState) {
is Idle ->
if (loginState.loginError != null) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
index a772a45750..7192f5475a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.MaterialTheme
@@ -150,6 +151,7 @@ fun OutOfTimeScreen(
modifier =
Modifier.align(Alignment.CenterHorizontally)
.padding(vertical = Dimens.screenVerticalMargin)
+ .size(Dimens.bigIconSize)
)
Text(
text = stringResource(id = R.string.out_of_time),