Update starter sample to Jetpack Compose, StateFlow, Material3 #38
Next
Next commit
Convert to Jetpack Compose and StateFlow.
- Loading branch information
commit 72e6df93cb4d017bee73168b9365c938ab1d0f2d
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,130 +1,49 @@ | ||
| package com.jetbrains.simplelogin.androidapp.ui.login | ||
|
|
||
| import android.app.Activity | ||
| import android.os.Bundle | ||
| import android.widget.Toast | ||
| import androidx.activity.compose.setContent | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Surface | ||
| import androidx.lifecycle.ViewModelProvider | ||
| import com.jetbrains.simplelogin.androidapp.R | ||
|
|
||
| class LoginActivity : AppCompatActivity() { | ||
|
|
||
| private lateinit var loginViewModel: LoginViewModel | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| loginViewModel = ViewModelProvider(this, LoginViewModelFactory()) | ||
| .get(LoginViewModel::class.java) | ||
|
|
||
| setContent { | ||
| MaterialTheme { | ||
| Surface(color = MaterialTheme.colorScheme.background) { | ||
| LoginScreen( | ||
| viewModel = loginViewModel, | ||
pahill marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| onLoginSuccess = { | ||
| // Show welcome message | ||
| val user = loginViewModel.loginResult.value?.success | ||
| user?.let { | ||
| val welcome = getString(R.string.welcome) | ||
| Toast.makeText( | ||
| applicationContext, | ||
| "$welcome ${it.displayName}", | ||
| Toast.LENGTH_LONG | ||
| ).show() | ||
| } | ||
|
|
||
| // Complete the login process | ||
| setResult(Activity.RESULT_OK) | ||
| finish() | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| package com.jetbrains.simplelogin.androidapp.ui.login | ||
|
|
||
| import androidx.compose.foundation.layout.* | ||
| import androidx.compose.foundation.text.KeyboardActions | ||
| import androidx.compose.foundation.text.KeyboardOptions | ||
| import androidx.compose.material3.* | ||
| import androidx.compose.runtime.* | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.focus.FocusRequester | ||
| import androidx.compose.ui.focus.focusRequester | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.input.ImeAction | ||
| import androidx.compose.ui.text.input.KeyboardType | ||
| import androidx.compose.ui.text.input.PasswordVisualTransformation | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.lifecycle.compose.collectAsStateWithLifecycle | ||
| import com.jetbrains.simplelogin.androidapp.R | ||
|
|
||
| @Composable | ||
| fun LoginScreen( | ||
| viewModel: LoginViewModel, | ||
| onLoginSuccess: () -> Unit | ||
| ) { | ||
| val loginFormState by viewModel.loginFormState.collectAsStateWithLifecycle() | ||
| val loginResult by viewModel.loginResult.collectAsStateWithLifecycle() | ||
| val context = LocalContext.current | ||
|
|
||
| var username by remember { mutableStateOf("") } | ||
| var password by remember { mutableStateOf("") } | ||
| val passwordFocusRequester = remember { FocusRequester() } | ||
|
|
||
| // Handle login result | ||
| LaunchedEffect(loginResult) { | ||
| loginResult?.let { result -> | ||
| if (result.success != null) { | ||
| // Show welcome message | ||
| onLoginSuccess() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(16.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.Center | ||
| ) { | ||
| // Username field | ||
| OutlinedTextField( | ||
| value = username, | ||
| onValueChange = { | ||
| username = it | ||
| viewModel.loginDataChanged(username, password) | ||
| }, | ||
| label = { Text(stringResource(R.string.prompt_email)) }, | ||
| isError = loginFormState.usernameError != null, | ||
| supportingText = { | ||
| loginFormState.usernameError?.let { | ||
| Text(it) | ||
| } | ||
| }, | ||
| keyboardOptions = KeyboardOptions( | ||
| keyboardType = KeyboardType.Email, | ||
| imeAction = ImeAction.Next | ||
| ), | ||
| keyboardActions = KeyboardActions( | ||
| onNext = { passwordFocusRequester.requestFocus() } | ||
| ), | ||
| singleLine = true, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(bottom = 8.dp) | ||
| ) | ||
|
|
||
| // Password field | ||
| OutlinedTextField( | ||
| value = password, | ||
| onValueChange = { | ||
| password = it | ||
| viewModel.loginDataChanged(username, password) | ||
| }, | ||
| label = { Text(stringResource(R.string.prompt_password)) }, | ||
| isError = loginFormState.passwordError != null, | ||
| supportingText = { | ||
| loginFormState.passwordError?.let { | ||
| Text(it) | ||
| } | ||
| }, | ||
| visualTransformation = PasswordVisualTransformation(), | ||
| keyboardOptions = KeyboardOptions( | ||
| keyboardType = KeyboardType.Password, | ||
| imeAction = ImeAction.Done | ||
| ), | ||
| keyboardActions = KeyboardActions( | ||
| onDone = { | ||
| if (loginFormState.isDataValid) { | ||
| viewModel.login(username, password) | ||
| } | ||
| } | ||
| ), | ||
| singleLine = true, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(bottom = 16.dp) | ||
| .focusRequester(passwordFocusRequester) | ||
| ) | ||
|
|
||
| // Login button | ||
| Button( | ||
| onClick = { viewModel.login(username, password) }, | ||
| enabled = loginFormState.isDataValid, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(50.dp) | ||
| ) { | ||
| Text(stringResource(R.string.action_sign_in)) | ||
| } | ||
|
|
||
| // Loading indicator | ||
| if (loginResult != null && loginResult?.success == null && loginResult?.error == null) { | ||
| CircularProgressIndicator( | ||
| modifier = Modifier.padding(16.dp) | ||
| ) | ||
| } | ||
|
|
||
| // Error message | ||
| loginResult?.error?.let { errorId -> | ||
| Text( | ||
| text = stringResource(errorId), | ||
| color = MaterialTheme.colorScheme.error, | ||
| modifier = Modifier.padding(top = 16.dp) | ||
| ) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.