diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-10-02 14:21:07 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson90@gmail.com> | 2023-10-04 09:19:41 +0200 |
| commit | ea2089847a4d3ffe10b17e01b6fe509858f76c27 (patch) | |
| tree | 20b48154408e0bf5797426445c4c3c23e2edcca3 /android/app | |
| parent | 6612e427a8090f55b2423557241c5727770fb923 (diff) | |
| download | mullvadvpn-ea2089847a4d3ffe10b17e01b6fe509858f76c27.tar.xz mullvadvpn-ea2089847a4d3ffe10b17e01b6fe509858f76c27.zip | |
Update icons for success and fail
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt | 4 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt | 1 |
2 files changed, 1 insertions, 4 deletions
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 c02982427d..388963866f 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 @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState @@ -252,14 +251,13 @@ private fun LoginIcon(loginState: LoginState, modifier: Modifier = Modifier) { } is Loading -> CircularProgressIndicator( - modifier = Modifier.size(Dimens.progressIndicatorSize), + modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.onPrimary, strokeWidth = Dimens.loadingSpinnerStrokeWidth, strokeCap = StrokeCap.Round ) Success -> Image( - modifier = Modifier.offset(-Dimens.smallPadding, -Dimens.smallPadding), painter = painterResource(id = R.drawable.icon_success), contentDescription = stringResource(id = R.string.logged_in_title), ) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt index 6ea8f198f1..67eaeca48d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt @@ -5,7 +5,6 @@ import java.io.File import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import kotlin.random.Random const val PROBLEM_REPORT_LOGS_FILE = "problem_report.txt" |