diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-09-17 15:26:06 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-09-18 14:35:20 +0200 |
| commit | 26f1784c1eeb0bf909987e07145e77397775f1e1 (patch) | |
| tree | 8806bd3fc3b02902c4d832209694cc1035b2345e /android/app/src | |
| parent | 63c1abe65257b3357bbca696ad832968e6ecab44 (diff) | |
| download | mullvadvpn-26f1784c1eeb0bf909987e07145e77397775f1e1.tar.xz mullvadvpn-26f1784c1eeb0bf909987e07145e77397775f1e1.zip | |
Update chevron icon
Diffstat (limited to 'android/app/src')
2 files changed, 15 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Chevron.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Chevron.kt index 15758be10e..ff20dd0a67 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Chevron.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Chevron.kt @@ -3,20 +3,32 @@ package net.mullvad.mullvadvpn.compose.component import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.TweenSpec import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.layout.Column import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.draw.rotate import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource +import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R @Composable +@Preview +private fun PreviewChevron() { + Column { + Chevron(color = MaterialTheme.colorScheme.onPrimary, isExpanded = false) + Chevron(color = MaterialTheme.colorScheme.onPrimary, isExpanded = true) + } +} + +@Composable fun Chevron(modifier: Modifier = Modifier, color: Color, isExpanded: Boolean) { - val degree = remember(isExpanded) { if (isExpanded) 270f else 90f } + val degree = remember(isExpanded) { if (isExpanded) 180f else 0f } val animatedRotation = animateFloatAsState( targetValue = degree, 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 b6c98b5ed8..f95c4681f9 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 @@ -115,7 +115,7 @@ fun AutoConnectAndLockdownModeScreen(onBackClick: () -> Unit = {}) { } }, isEnabled = { pagerState.currentPage != 0 }, - rotation = 180f, + rotation = 90f, ) // Go to next page @@ -132,7 +132,7 @@ fun AutoConnectAndLockdownModeScreen(onBackClick: () -> Unit = {}) { } }, isEnabled = { pagerState.currentPage != pagerState.pageCount - 1 }, - rotation = 0f, + rotation = -90f, ) PageIndicator( |