Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Login: try to fix some stuff around login/logout..

Browse source
This commit is contained in:
ganfra 2022-11-22 12:04:01 +01:00
parent 8f03957c23
commit 0cbf4bf328
5 changed files with 66 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
features/login/src/main/java/io/element/android/x/features/login/LoginScreen.kt
View file

@ -4,17 +4,18 @@ package io.element.android.x.features.login
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
@ -24,6 +25,7 @@ import com.airbnb.mvrx.Loading
import com.airbnb.mvrx.Success
import com.airbnb.mvrx.compose.collectAsState
import com.airbnb.mvrx.compose.mavericksViewModel
import io.element.android.x.core.compose.textFieldState
import io.element.android.x.designsystem.ElementXTheme
import timber.log.Timber
@ -59,6 +61,8 @@ fun LoginContent(
onSubmitClicked: () -> Unit = {},
onLoginWithSuccess: () -> Unit = {},
) {
var login by textFieldState(state.login)
var password by textFieldState(state.password)
Surface(color = MaterialTheme.colorScheme.background) {
Box(
modifier = Modifier
@ -113,31 +117,42 @@ fun LoginContent(
)
}
OutlinedTextField(
value = state.login,
value = login,
modifier = Modifier
.fillMaxWidth()
.padding(top = 60.dp),
label = {
Text(text = "Email or username")
},
onValueChange = onLoginChanged,
onValueChange = {
login = it
onLoginChanged(it)
},
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Text,
keyboardType = KeyboardType.Email,
imeAction = ImeAction.Next
),
)
OutlinedTextField(
value = state.password,
value = password,
modifier = Modifier
.fillMaxWidth()
.padding(top = 24.dp),
onValueChange = onPasswordChanged,
onValueChange = {
password = it
onPasswordChanged(it)
},
label = {
Text(text = "Password")
},
isError = isError,
keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Password,
imeAction = ImeAction.Send,
imeAction = ImeAction.Done,
),
visualTransformation = PasswordVisualTransformation(),
keyboardActions = KeyboardActions(
onDone = { onSubmitClicked() }
),
)
if (isError) {

12
features/login/src/main/java/io/element/android/x/features/login/LoginViewModel.kt
View file

@ -1,6 +1,7 @@
package io.element.android.x.features.login
import com.airbnb.mvrx.Loading
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import com.airbnb.mvrx.MavericksViewModel
import com.airbnb.mvrx.Uninitialized
import io.element.android.x.matrix.MatrixInstance
@ -20,18 +21,15 @@ class LoginViewModel(initialState: LoginViewState) :
}
}
fun onSubmit() = withState { state ->
setState {
copy(isLoggedIn = Loading())
}
fun onSubmit() {
viewModelScope.launch {
suspend {
val state = awaitState()
// Ensure the server is provided to the Rust SDK
if (matrix.getHomeserver() == null) {
matrix.setHomeserver(state.homeserver)
}
matrix.login(state.login, state.password)
matrix.login(state.login.trim(), state.password.trim())
matrix.activeClient().startSync()
}.execute {
copy(isLoggedIn = it)