summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorMaryamShaghaghi <122574719+MaryamShaghaghi@users.noreply.github.com>2023-12-01 13:33:24 +0100
committerMaryamShaghaghi <122574719+MaryamShaghaghi@users.noreply.github.com>2023-12-07 09:27:26 +0100
commit511b949b8305a38fe3f8451e15422d823178d9ed (patch)
tree1f9584a3bea5e220bd29e3c33ab1bc13ab5d45cb /android
parent74340e988fa6cfe3580012c6af7689edff4fa132 (diff)
downloadmullvadvpn-511b949b8305a38fe3f8451e15422d823178d9ed.tar.xz
mullvadvpn-511b949b8305a38fe3f8451e15422d823178d9ed.zip
Allow one line in login input field
Co-Authored-By: Boban Sijuk <49131853+boki91@users.noreply.github.com>
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt8
1 files changed, 6 insertions, 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
index e7d6e40a60..b4287aaeef 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
@@ -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 =