Fix some ui issues

mullvad · Jun 11, 2024 · 47db813 · 47db813
1 parent a4c0b3d
commit 47db813
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/...src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt b/...src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadExposedDropdownMenuBox.kt
@@ -42,15 +42,15 @@ fun MullvadExposedDropdownMenuBox(
             modifier = Modifier.fillMaxWidth().menuAnchor(),
             readOnly = true,
             value = title,
-            onValueChange = { /* Do nothing */},
+            onValueChange = { /* Do nothing */ },
             label = { Text(text = label) },
             trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
             colors = colors,
         )
         ExposedDropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
-            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainer)
+            modifier = Modifier.background(MaterialTheme.colorScheme.primary)
         ) {
             content { expanded = false }
         }

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
@@ -4,7 +4,9 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyListState
@@ -274,7 +276,7 @@ fun ScaffoldWithSmallTopBar(
     content: @Composable (modifier: Modifier) -> Unit
 ) {
     Scaffold(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier.fillMaxSize().imePadding(),
         topBar = {
             MullvadSmallTopBar(
                 title = appBarTitle,

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessListScreen.kt
@@ -90,7 +90,6 @@ fun ApiAccessListScreen(
                 currentApiAccessMethodName = state.currentApiAccessMethod?.name,
                 onInfoClicked = onApiAccessInfoClick
             )
-            // Spacer(modifier = Modifier.height(Dimens.verticalSpace))
             apiAccessMethodItems(
                 state.apiAccessMethods,
                 onApiAccessMethodClick = onApiAccessMethodClick
@@ -132,7 +131,7 @@ private fun LazyListScope.currentAccessMethod(
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(
-                style = MaterialTheme.typography.titleLarge,
+                style = MaterialTheme.typography.titleMedium,
                 color = MaterialTheme.colorScheme.onBackground,
                 text =
                     stringResource(

diff --git a/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreen.kt b/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreen.kt
@@ -1,5 +1,6 @@
 package net.mullvad.mullvadvpn.compose.screen
 
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
@@ -10,6 +11,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -218,9 +220,13 @@ fun EditApiAccessMethodScreen(
                                 onPasswordChanged = onPasswordChanged
                             )
                     }
-                    Spacer(modifier = Modifier.height(Dimens.largePadding))
+                    Spacer(modifier = Modifier.weight(1f))
                     TestMethodButton(
-                        modifier = Modifier.padding(bottom = Dimens.verticalSpace),
+                        modifier =
+                            Modifier.padding(
+                                bottom = Dimens.verticalSpace,
+                                top = Dimens.largePadding
+                            ),
                         testMethodState = state.testMethodState,
                         onTestMethod = onTestMethod
                     )
@@ -251,7 +257,8 @@ private fun NameInputField(
         isDigitsOnlyAllowed = false,
         maxCharLength = ApiAccessMethodName.MAX_LENGTH,
         errorText = nameError?.let { textResource(id = R.string.this_field_is_required) },
-        capitalization = KeyboardCapitalization.Words
+        capitalization = KeyboardCapitalization.Words,
+        modifier = Modifier.animateContentSize()
     )
 }
 
@@ -368,7 +375,8 @@ private fun ServerIpInput(
                                 R.string.this_field_is_required
                         }
                 )
-            }
+            },
+        modifier = Modifier.animateContentSize()
     )
 }
 
@@ -396,6 +404,7 @@ private fun PortInput(
                         }
                 )
             },
+        modifier = Modifier.animateContentSize()
     )
 }
 
@@ -428,6 +437,7 @@ private fun PasswordInput(
                 ImeAction.Done
             },
         errorText = passwordError?.let { textResource(id = R.string.this_field_is_required) },
+        modifier = Modifier.animateContentSize()
     )
 }
 
@@ -529,6 +539,7 @@ private fun UsernameInput(
         isValidValue = usernameError == null,
         isDigitsOnlyAllowed = false,
         errorText = usernameError?.let { textResource(id = R.string.this_field_is_required) },
+        modifier = Modifier.animateContentSize()
     )
 }
 

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/EditApiAccessMethodViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/EditApiAccessMethodViewModel.kt
@@ -165,9 +165,9 @@ class EditApiAccessMethodViewModel(
     > =
         zipOrAccumulate(
             if (skipNameValidation) {
-                parseName(name)
-            } else {
                 ApiAccessMethodName.fromString(name).right()
+            } else {
+                parseName(name)
             },
             when (apiAccessMethodTypes) {
                 ApiAccessMethodTypes.SHADOWSOCKS -> {

diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt
@@ -44,3 +44,6 @@ val menuItemColors: MenuItemColors
                 leadingIconColor = MaterialTheme.colorScheme.onSurface,
                 textColor = MaterialTheme.colorScheme.onSurface,
             )
+
+
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,6 @@ val menuItemColors: MenuItemColors
		leadingIconColor = MaterialTheme.colorScheme.onSurface,
		textColor = MaterialTheme.colorScheme.onSurface,
		)