diff options
Diffstat (limited to 'android/app/src')
2 files changed, 20 insertions, 21 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt index 6deb2070dc..1fe1815e92 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt @@ -1,6 +1,5 @@ package net.mullvad.mullvadvpn.compose.cell -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -83,7 +82,12 @@ private fun ExpandableComposeCellBody( verticalAlignment = Alignment.CenterVertically ) { if (onInfoClicked != null) { - IconButton(modifier = Modifier.padding(horizontal = Dimens.miniPadding).align(Alignment.CenterVertically), onClick = onInfoClicked) { + IconButton( + modifier = + Modifier.padding(horizontal = Dimens.miniPadding) + .align(Alignment.CenterVertically), + onClick = onInfoClicked + ) { Icon( painter = painterResource(id = R.drawable.icon_info), contentDescription = null, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt index 55936b392a..f62db784f6 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt @@ -1,7 +1,6 @@ package net.mullvad.mullvadvpn.compose.screen import androidx.compose.animation.animateContentSize -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -15,6 +14,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -27,6 +28,7 @@ import androidx.compose.ui.draw.rotate import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -101,26 +103,19 @@ fun SelectLocationScreen( Column(modifier = Modifier.background(backgroundColor).fillMaxWidth().fillMaxHeight()) { Row( modifier = - Modifier.padding( - horizontal = Dimens.selectLocationTitlePadding, - vertical = Dimens.selectLocationTitlePadding - ) + Modifier.padding(vertical = Dimens.selectLocationTitlePadding) + .padding(end = Dimens.selectLocationTitlePadding) .fillMaxWidth() ) { - Image( - painter = painterResource(id = R.drawable.icon_back), - contentDescription = null, - modifier = - Modifier.focusRequester(backFocus) - .focusProperties { next = listFocus } - .focusProperties { - down = listFocus - right = searchBarFocus - } - .size(Dimens.titleIconSize) - .rotate(270f) - .clickable { onBackClick() } - ) + IconButton(onClick = onBackClick) { + Icon( + painter = painterResource(id = R.drawable.icon_back), + contentDescription = null, + tint = Color.Unspecified, + modifier = + Modifier.size(Dimens.titleIconSize).rotate(270f).clickable { onBackClick() } + ) + } Text( text = stringResource(id = R.string.select_location), modifier = |