-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #64 from Automattic/hamorillo/4-image-picker
SDK - Component to pick, edit and upload avatar image
- Loading branch information
Showing
11 changed files
with
341 additions
and
28 deletions.
There are no files selected for viewing
This file contains 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
110 changes: 110 additions & 0 deletions
110
app/src/main/java/com/gravatar/demoapp/ui/AvatarUpdateTab.kt
This file contains 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,110 @@ | ||
| package com.gravatar.demoapp.ui | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.rounded.AccountCircle | ||
| import androidx.compose.material3.CircularProgressIndicator | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.saveable.rememberSaveable | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.gravatar.GravatarApi | ||
| import com.gravatar.R | ||
| import com.gravatar.demoapp.ui.components.GravatarEmailInput | ||
| import com.gravatar.demoapp.ui.components.GravatarPasswordInput | ||
| import com.gravatar.ui.GravatarImagePickerWrapper | ||
| import com.gravatar.ui.GravatarImagePickerWrapperListener | ||
|
|
||
| @Composable | ||
| fun AvatarUpdateTab(showSnackBar: (String?, Throwable?) -> Unit, modifier: Modifier = Modifier) { | ||
| var email by remember { mutableStateOf("gravatar@automattic.com") } | ||
| var accessToken by remember { mutableStateOf("") } | ||
| var accessTokenVisible by rememberSaveable { mutableStateOf(false) } | ||
| var isUploading by remember { mutableStateOf(false) } | ||
|
|
||
| Column( | ||
| modifier = modifier | ||
| .fillMaxSize() | ||
| .background(MaterialTheme.colorScheme.background) | ||
| .padding(16.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| val context = LocalContext.current | ||
| GravatarEmailInput(email = email, onValueChange = { email = it }, Modifier.fillMaxWidth()) | ||
| GravatarPasswordInput( | ||
| password = accessToken, | ||
| passwordIsVisible = accessTokenVisible, | ||
| onValueChange = { accessToken = it }, | ||
| onVisibilityChange = { accessTokenVisible = it }, | ||
| label = { Text(stringResource(R.string.access_token_label)) }, | ||
| modifier = Modifier | ||
| .padding(top = 16.dp) | ||
| .fillMaxWidth(), | ||
| ) | ||
| GravatarImagePickerWrapper( | ||
| { UpdateAvatarComposable(isUploading) }, | ||
| email, | ||
| accessToken, | ||
| object : GravatarImagePickerWrapperListener { | ||
| override fun onAvatarUploadStarted() { | ||
| isUploading = true | ||
| } | ||
|
|
||
| override fun onSuccess(response: Unit) { | ||
| isUploading = false | ||
| showSnackBar(context.getString(R.string.avatar_update_upload_success_toast), null) | ||
| } | ||
|
|
||
| override fun onError(errorType: GravatarApi.ErrorType) { | ||
| isUploading = false | ||
| showSnackBar(context.getString(R.string.avatar_update_upload_failed_toast, errorType), null) | ||
| } | ||
| }, | ||
| modifier = Modifier.padding(top = 16.dp), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun UpdateAvatarComposable(isUploading: Boolean) { | ||
| Column(horizontalAlignment = Alignment.CenterHorizontally) { | ||
| if (isUploading) { | ||
| CircularProgressIndicator() | ||
| } else { | ||
| Icon( | ||
| Icons.Rounded.AccountCircle, | ||
| contentDescription = "", | ||
| modifier = Modifier.size(128.dp), | ||
| ) | ||
| Text(text = stringResource(R.string.update_avatar_button_label)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun UpdateAvatarComposablePreview() = UpdateAvatarComposable(false) | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun UpdateAvatarLoadingComposablePreview() = UpdateAvatarComposable(true) | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun AvatarUpdateTabPreview() = AvatarUpdateTab(showSnackBar = { _, _ -> }) |
This file contains 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 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
19 changes: 19 additions & 0 deletions
19
app/src/main/java/com/gravatar/demoapp/ui/components/GravatarEmailInput.kt
This file contains 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,19 @@ | ||
| package com.gravatar.demoapp.ui.components | ||
|
|
||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextField | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import com.gravatar.R | ||
|
|
||
| @Composable | ||
| fun GravatarEmailInput(email: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier) { | ||
| TextField( | ||
| value = email, | ||
| onValueChange = onValueChange, | ||
| label = { Text(stringResource(R.string.gravatar_email_input_label)) }, | ||
| maxLines = 1, | ||
| modifier = modifier, | ||
| ) | ||
| } |
45 changes: 45 additions & 0 deletions
45
app/src/main/java/com/gravatar/demoapp/ui/components/GravatarPasswordInput.kt
This file contains 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,45 @@ | ||
| package com.gravatar.demoapp.ui.components | ||
|
|
||
| import androidx.compose.foundation.text.KeyboardOptions | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Visibility | ||
| import androidx.compose.material.icons.filled.VisibilityOff | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| import androidx.compose.material3.TextField | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.text.input.KeyboardType | ||
| import androidx.compose.ui.text.input.PasswordVisualTransformation | ||
| import androidx.compose.ui.text.input.VisualTransformation | ||
|
|
||
| @Composable | ||
| fun GravatarPasswordInput( | ||
| password: String, | ||
| passwordIsVisible: Boolean, | ||
| onValueChange: (String) -> Unit, | ||
| onVisibilityChange: (Boolean) -> Unit, | ||
| label: @Composable (() -> Unit), | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| TextField( | ||
| value = password, | ||
| onValueChange = onValueChange, | ||
| label = label, | ||
| maxLines = 1, | ||
| modifier = modifier, | ||
| visualTransformation = if (passwordIsVisible) VisualTransformation.None else PasswordVisualTransformation(), | ||
| keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), | ||
| trailingIcon = { | ||
| val image = if (passwordIsVisible) { | ||
| Icons.Filled.Visibility | ||
| } else { | ||
| Icons.Filled.VisibilityOff | ||
| } | ||
|
|
||
| IconButton(onClick = { onVisibilityChange(!passwordIsVisible) }) { | ||
| Icon(imageVector = image, "") | ||
| } | ||
| }, | ||
| ) | ||
| } |
This file contains 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 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 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,4 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
|
||
| <application> | ||
| <!-- Lib activities--> | ||
| <activity | ||
| android:name="com.yalantis.ucrop.UCropActivity" | ||
| android:theme="@style/Theme.AppCompat.NoActionBar" /> | ||
| </application> | ||
| </manifest> |
Oops, something went wrong.