diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-12-07 09:52:23 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-12-07 09:52:23 +0100 |
| commit | cf7f6cc33b0d7770c6455f1793b961e613268a03 (patch) | |
| tree | 1f9584a3bea5e220bd29e3c33ab1bc13ab5d45cb /android/app/src | |
| parent | 74340e988fa6cfe3580012c6af7689edff4fa132 (diff) | |
| parent | 511b949b8305a38fe3f8451e15422d823178d9ed (diff) | |
| download | mullvadvpn-cf7f6cc33b0d7770c6455f1793b961e613268a03.tar.xz mullvadvpn-cf7f6cc33b0d7770c6455f1793b961e613268a03.zip | |
Merge remote-tracking branch 'maryam/fix-multiple-lines-in-login-input-field'
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt | 8 |
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 = |