-
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 branch 'main' into dependabot/gradle/androidx.core-core-ktx-1.15.0
- Loading branch information
Showing
51 changed files
with
1,266 additions
and
141 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
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
320 changes: 320 additions & 0 deletions
320
app/src/main/java/com/fibelatti/photowidget/configure/PhotoWidgetBorderPicker.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,320 @@ | ||
| package com.fibelatti.photowidget.configure | ||
|
|
||
| import android.content.Context | ||
| import android.graphics.BitmapFactory | ||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.IntrinsicSize | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.aspectRatio | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.foundation.text.KeyboardOptions | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.FilledTonalButton | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.SegmentedButton | ||
| import androidx.compose.material3.SegmentedButtonDefaults | ||
| import androidx.compose.material3.SingleChoiceSegmentedButtonRow | ||
| import androidx.compose.material3.Slider | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextField | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableIntStateOf | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.asImageBitmap | ||
| import androidx.compose.ui.input.nestedscroll.nestedScroll | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.platform.rememberNestedScrollInteropConnection | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.input.ImeAction | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.unit.dp | ||
| import com.fibelatti.photowidget.R | ||
| import com.fibelatti.photowidget.model.PhotoWidget | ||
| import com.fibelatti.photowidget.model.PhotoWidgetAspectRatio | ||
| import com.fibelatti.photowidget.platform.ComposeBottomSheetDialog | ||
| import com.fibelatti.photowidget.platform.withRoundedCorners | ||
| import com.fibelatti.photowidget.ui.SliderSmallThumb | ||
| import com.fibelatti.ui.preview.ThemePreviews | ||
| import com.fibelatti.ui.theme.ExtendedTheme | ||
| import com.github.skydoves.colorpicker.compose.BrightnessSlider | ||
| import com.github.skydoves.colorpicker.compose.HsvColorPicker | ||
| import com.github.skydoves.colorpicker.compose.rememberColorPickerController | ||
|
|
||
| object PhotoWidgetBorderPicker { | ||
|
|
||
| fun show( | ||
| context: Context, | ||
| currentColorHex: String?, | ||
| currentWidth: Int, | ||
| onApplyClick: (String?, Int) -> Unit, | ||
| ) { | ||
| ComposeBottomSheetDialog(context) { | ||
| BorderPickerContent( | ||
| currentColorHex = currentColorHex, | ||
| currentWidth = currentWidth, | ||
| ) { newColor, newWidth -> | ||
| onApplyClick(newColor, newWidth) | ||
| dismiss() | ||
| } | ||
| }.show() | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun BorderPickerContent( | ||
| currentColorHex: String?, | ||
| currentWidth: Int, | ||
| onApplyClick: (String?, Int) -> Unit, | ||
| ) { | ||
| var color: String? by remember { mutableStateOf(currentColorHex) } | ||
| var width: Int by remember { mutableIntStateOf(currentWidth) } | ||
|
|
||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .nestedScroll(rememberNestedScrollInteropConnection()) | ||
| .verticalScroll(rememberScrollState()) | ||
| .padding(all = 16.dp), | ||
| ) { | ||
| Text( | ||
| text = stringResource(R.string.photo_widget_configure_border), | ||
| modifier = Modifier.fillMaxWidth(), | ||
| color = MaterialTheme.colorScheme.onSurface, | ||
| textAlign = TextAlign.Center, | ||
| style = MaterialTheme.typography.titleLarge, | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.size(8.dp)) | ||
|
|
||
| SingleChoiceSegmentedButtonRow( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| ) { | ||
| val buttonBorderColor = SegmentedButtonDefaults.borderStroke( | ||
| color = SegmentedButtonDefaults.colors().activeBorderColor, | ||
| ) | ||
|
|
||
| SegmentedButton( | ||
| selected = color == null, | ||
| onClick = { | ||
| color = null | ||
| width = 0 | ||
| }, | ||
| shape = RoundedCornerShape(topStart = 16.dp, bottomStart = 16.dp), | ||
| border = buttonBorderColor, | ||
| label = { | ||
| Text( | ||
| text = stringResource(R.string.photo_widget_configure_border_none), | ||
| style = MaterialTheme.typography.bodySmall, | ||
| ) | ||
| }, | ||
| ) | ||
|
|
||
| SegmentedButton( | ||
| selected = color != null, | ||
| onClick = { | ||
| if (color == null) { | ||
| color = "ffffff" | ||
| width = 20 | ||
| } | ||
| }, | ||
| shape = RoundedCornerShape(topEnd = 16.dp, bottomEnd = 16.dp), | ||
| border = buttonBorderColor, | ||
| label = { | ||
| Text( | ||
| text = stringResource(R.string.photo_widget_configure_border_color), | ||
| style = MaterialTheme.typography.bodySmall, | ||
| ) | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.size(16.dp)) | ||
|
|
||
| if (color != null) { | ||
| ColorBorderContent( | ||
| currentColorHex = requireNotNull(color), | ||
| onColorChange = { color = it }, | ||
| currentWidth = width, | ||
| onWidthChange = { width = it }, | ||
| ) | ||
| } | ||
|
|
||
| FilledTonalButton( | ||
| onClick = { onApplyClick(color, width) }, | ||
| modifier = Modifier.fillMaxWidth(), | ||
| ) { | ||
| Text( | ||
| text = stringResource(id = R.string.photo_widget_action_apply), | ||
| modifier = Modifier.weight(1f), | ||
| textAlign = TextAlign.Center, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| private fun ColorBorderContent( | ||
| currentColorHex: String, | ||
| onColorChange: (String) -> Unit, | ||
| currentWidth: Int, | ||
| onWidthChange: (Int) -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Column( | ||
| modifier = modifier.fillMaxWidth(), | ||
| verticalArrangement = Arrangement.spacedBy(8.dp), | ||
| ) { | ||
| val localContext = LocalContext.current | ||
| val baseBitmap = remember { | ||
| BitmapFactory.decodeResource(localContext.resources, R.drawable.image_sample) | ||
| } | ||
| val colorPickerController = rememberColorPickerController() | ||
| var colorHex by remember { mutableStateOf(currentColorHex) } | ||
| val hexChars = remember { | ||
| charArrayOf( | ||
| '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', | ||
| 'a', 'b', 'c', 'd', 'e', 'f', | ||
| 'A', 'B', 'C', 'D', 'E', 'F', | ||
| ) | ||
| } | ||
|
|
||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.spacedBy(16.dp), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Image( | ||
| bitmap = baseBitmap | ||
| .withRoundedCorners( | ||
| aspectRatio = PhotoWidgetAspectRatio.SQUARE, | ||
| radius = PhotoWidget.DEFAULT_CORNER_RADIUS, | ||
| borderColorHex = currentColorHex, | ||
| borderWidth = currentWidth, | ||
| ) | ||
| .asImageBitmap(), | ||
| contentDescription = null, | ||
| modifier = Modifier | ||
| .weight(1f) | ||
| .aspectRatio(1f), | ||
| ) | ||
|
|
||
| HsvColorPicker( | ||
| modifier = Modifier | ||
| .weight(1f) | ||
| .aspectRatio(1f), | ||
| controller = colorPickerController, | ||
| onColorChanged = { colorEnvelope -> | ||
| colorHex = colorEnvelope.hexCode.drop(2) | ||
| onColorChange(colorHex) | ||
| }, | ||
| initialColor = Color(android.graphics.Color.parseColor("#$currentColorHex")), | ||
| ) | ||
| } | ||
|
|
||
| Row( | ||
| modifier = Modifier | ||
| .padding(top = 8.dp) | ||
| .fillMaxWidth() | ||
| .height(IntrinsicSize.Min), | ||
| horizontalArrangement = Arrangement.spacedBy(16.dp), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| BrightnessSlider( | ||
| modifier = Modifier | ||
| .fillMaxHeight() | ||
| .weight(1f) | ||
| .border( | ||
| width = 1.dp, | ||
| color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f), | ||
| shape = RoundedCornerShape(6.dp), | ||
| ), | ||
| controller = colorPickerController, | ||
| ) | ||
|
|
||
| TextField( | ||
| value = colorHex, | ||
| onValueChange = { newValue -> | ||
| if (newValue.length <= 6 && newValue.all { it in hexChars }) { | ||
| colorHex = newValue | ||
|
|
||
| if (colorHex.length == 6) { | ||
| val androidColor = android.graphics.Color.parseColor("#$colorHex") | ||
| colorPickerController.selectByColor(color = Color(androidColor), fromUser = true) | ||
| onColorChange(colorHex) | ||
| } | ||
| } | ||
| }, | ||
| modifier = Modifier.width(100.dp), | ||
| textStyle = MaterialTheme.typography.labelMedium, | ||
| placeholder = { | ||
| Text( | ||
| text = "ffffff", | ||
| style = MaterialTheme.typography.labelMedium, | ||
| ) | ||
| }, | ||
| prefix = { | ||
| Text( | ||
| text = "#", | ||
| style = MaterialTheme.typography.labelMedium, | ||
| ) | ||
| }, | ||
| keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), | ||
| singleLine = true, | ||
| maxLines = 1, | ||
| ) | ||
| } | ||
|
|
||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.spacedBy(16.dp), | ||
| ) { | ||
| Slider( | ||
| value = currentWidth.toFloat(), | ||
| onValueChange = { onWidthChange(it.toInt()) }, | ||
| modifier = Modifier.weight(1f), | ||
| valueRange = 0f..40f, | ||
| thumb = { SliderSmallThumb() }, | ||
| ) | ||
|
|
||
| Text( | ||
| text = "$currentWidth", | ||
| modifier = Modifier.width(40.dp), | ||
| color = MaterialTheme.colorScheme.onSurface, | ||
| textAlign = TextAlign.End, | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| @ThemePreviews | ||
| private fun BorderPickerContentPreview() { | ||
| ExtendedTheme { | ||
| BorderPickerContent( | ||
| currentColorHex = "86D986", | ||
| currentWidth = 20, | ||
| onApplyClick = { _, _ -> }, | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.