Merge remote-tracking branch 'maryam/fix-multiple-lines-in-login-inpu…

…t-field'
mullvad · Dec 7, 2023 · cf7f6cc · cf7f6cc
2 parents 74340e9 + 511b949
commit cf7f6cc
Showing 1 changed file with 6 additions and 2 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
@@ -57,7 +57,9 @@ import net.mullvad.mullvadvpn.compose.component.MullvadCircularProgressIndicator
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
 import net.mullvad.mullvadvpn.compose.state.LoginError
 import net.mullvad.mullvadvpn.compose.state.LoginState
-import net.mullvad.mullvadvpn.compose.state.LoginState.*
+import net.mullvad.mullvadvpn.compose.state.LoginState.Idle
+import net.mullvad.mullvadvpn.compose.state.LoginState.Loading
+import net.mullvad.mullvadvpn.compose.state.LoginState.Success
 import net.mullvad.mullvadvpn.compose.state.LoginUiState
 import net.mullvad.mullvadvpn.compose.test.LOGIN_INPUT_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.LOGIN_TITLE_TEST_TAG
@@ -196,7 +198,9 @@ private fun LoginContent(
             label = {
                 Text(
                     text = stringResource(id = R.string.login_description),
-                    color = Color.Unspecified
+                    color = Color.Unspecified,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
             },
             keyboardActions =