melod1n/fast-messenger
3
2
Fork 1
Code Issues Actions Packages Projects 1 Releases Wiki Activity

refactor default alerts

Browse Source
This commit is contained in:
Danil Nikolaev
2024-07-15 06:02:25 +03:00
parent 654f47bb94
commit eaf609c475
10 changed files with 366 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/designsystem/src/main/kotlin/com/meloda/app/fast/designsystem/Extensions.kt
+24
View File
@@ -3,7 +3,13 @@ package com.meloda.app.fast.designsystem
import android.content.res.Configuration
import android.view.KeyEvent
import androidx.appcompat.app.AppCompatDelegate
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.key.onKeyEvent
import androidx.compose.ui.platform.LocalContext
@@ -77,3 +83,21 @@ fun Modifier.handleEnterKey(
action.invoke()
} else false
}
@Composable
fun LazyListState.isScrollingUp(): Boolean {
var previousIndex by remember(this) { mutableIntStateOf(firstVisibleItemIndex) }
var previousScrollOffset by remember(this) { mutableIntStateOf(firstVisibleItemScrollOffset) }
return remember(this) {
derivedStateOf {
if (previousIndex != firstVisibleItemIndex) {
previousIndex > firstVisibleItemIndex
} else {
previousScrollOffset >= firstVisibleItemScrollOffset
}.also {
previousIndex = firstVisibleItemIndex
previousScrollOffset = firstVisibleItemScrollOffset
}
}
}.value
}
core/designsystem/src/main/kotlin/com/meloda/app/fast/designsystem/MaterialDialog.kt
+213 -20
View File
@@ -37,6 +37,208 @@ import com.meloda.app.fast.common.UiText
import com.meloda.app.fast.common.parseString
import com.meloda.app.fast.designsystem.ImmutableList.Companion.toImmutableList
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MaterialDialog(
onDismissRequest: () -> Unit,
modifier: Modifier = Modifier,
confirmText: String? = null,
confirmAction: (() -> Unit)? = null,
cancelText: String? = null,
cancelAction: (() -> Unit)? = null,
neutralText: String? = null,
neutralAction: (() -> Unit)? = null,
title: String? = null,
text: String? = null,
itemsSelectionType: ItemsSelectionType = ItemsSelectionType.None,
items: ImmutableList<String> = ImmutableList.empty(),
preSelectedItems: ImmutableList<Int> = ImmutableList.empty(),
onItemClick: ((index: Int) -> Unit)? = null,
properties: DialogProperties = DialogProperties(),
actionInvokeDismiss: ActionInvokeDismiss = ActionInvokeDismiss.IfNoAction,
customContent: (ColumnScope.() -> Unit)? = null
) {
var alertItems by remember {
mutableStateOf(
items.mapIndexed { index, title ->
DialogItem(
title,
preSelectedItems.contains(index)
)
}
)
}
BasicAlertDialog(
onDismissRequest = onDismissRequest,
modifier = modifier,
properties = properties
) {
val scrollState = rememberScrollState()
val canScrollBackward by remember { derivedStateOf { scrollState.value > 0 } }
val canScrollForward by remember { derivedStateOf { scrollState.value < scrollState.maxValue } }
Surface(
modifier = Modifier.fillMaxWidth(),
color = AlertDialogDefaults.containerColor,
shape = AlertDialogDefaults.shape,
tonalElevation = AlertDialogDefaults.TonalElevation
) {
Column(modifier = Modifier.padding(bottom = 10.dp)) {
if (title != null) {
Spacer(modifier = Modifier.height(20.dp))
Row {
Spacer(modifier = Modifier.width(24.dp))
Text(
modifier = Modifier.weight(1f),
text = title,
style = MaterialTheme.typography.headlineSmall
)
Spacer(modifier = Modifier.width(20.dp))
}
}
if (canScrollBackward) {
HorizontalDivider(modifier = Modifier.fillMaxWidth())
}
Column(
modifier = Modifier
.fillMaxWidth()
.weight(1f, fill = false)
.verticalScroll(scrollState)
) {
Spacer(modifier = Modifier.height(8.dp))
if (text != null && title == null) {
Spacer(modifier = Modifier.height(20.dp))
}
if (text != null) {
Row {
Spacer(modifier = Modifier.width(24.dp))
Text(
modifier = Modifier.weight(1f),
text = text,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.width(20.dp))
}
}
Spacer(modifier = Modifier.height(8.dp))
if (alertItems.isNotEmpty()) {
Spacer(modifier = Modifier.height(4.dp))
AlertItems(
selectionType = itemsSelectionType,
items = alertItems,
onItemClick = { index ->
onItemClick?.invoke(index)
if (itemsSelectionType == ItemsSelectionType.None) {
onDismissRequest.invoke()
} else {
val newItems =
alertItems.mapIndexed { itemIndex, item ->
item.copy(isSelected = itemIndex == index)
}
alertItems = newItems
}
},
onItemCheckedChanged = { index ->
val newItems = alertItems.toMutableList()
val oldItem = newItems[index]
newItems[index] =
oldItem.copy(isSelected = !oldItem.isSelected)
alertItems = newItems.toImmutableList()
}
)
Spacer(modifier = Modifier.height(10.dp))
} else {
if (customContent != null) {
Spacer(modifier = Modifier.height(4.dp))
customContent.invoke(this)
Spacer(modifier = Modifier.height(10.dp))
}
}
}
if (canScrollForward) {
HorizontalDivider(modifier = Modifier.fillMaxWidth())
}
Row {
Spacer(modifier = Modifier.width(20.dp))
if (neutralText != null) {
TextButton(
onClick = {
neutralAction?.invoke() ?: kotlin.run {
if (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction) {
onDismissRequest()
}
}
if (actionInvokeDismiss == ActionInvokeDismiss.Always) {
onDismissRequest()
}
}
) {
Text(text = neutralText)
}
}
Spacer(modifier = Modifier.weight(1f))
if (cancelText != null) {
TextButton(
onClick = {
cancelAction?.invoke() ?: kotlin.run {
if (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction) {
onDismissRequest()
}
}
if (actionInvokeDismiss == ActionInvokeDismiss.Always) {
onDismissRequest()
}
}
) {
Text(text = cancelText)
}
}
Spacer(modifier = Modifier.width(2.dp))
if (confirmText != null) {
TextButton(
onClick = {
confirmAction?.invoke() ?: kotlin.run {
if (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction) {
onDismissRequest()
}
}
if (actionInvokeDismiss == ActionInvokeDismiss.Always) {
onDismissRequest()
}
}
) {
Text(text = confirmText)
}
}
Spacer(modifier = Modifier.width(20.dp))
}
}
}
}
}
// TODO: 08.04.2023, Danil Nikolaev: refactor this
@Deprecated("need refactoring")
@OptIn(ExperimentalMaterial3Api::class)
@@ -84,7 +286,7 @@ fun MaterialDialog(
)
}
AlertAnimation(visible = isVisible) {
if (isVisible) {
BasicAlertDialog(
onDismissRequest = onDismissRequest,
properties = properties
@@ -250,21 +452,6 @@ fun MaterialDialog(
}
}
@Composable
fun AlertAnimation(
visible: Boolean,
content: @Composable () -> Unit
) {
if (visible) content()
// AnimatedVisibility(
// visible = visible,
// enter = fadeIn(animationSpec = tween(400)) +
// scaleIn(animationSpec = tween(400)),
// exit = fadeOut(animationSpec = tween(150)),
// content = content
// )
}
@Composable
private fun AlertItems(
selectionType: ItemsSelectionType,
@@ -324,8 +511,14 @@ data class DialogItem(
val isSelected: Boolean
)
sealed interface ItemsSelectionType {
data object Single : ItemsSelectionType
data object Multi : ItemsSelectionType
data object None : ItemsSelectionType
sealed class ActionInvokeDismiss {
data object Never : ActionInvokeDismiss()
data object IfNoAction : ActionInvokeDismiss()
data object Always : ActionInvokeDismiss()
}
sealed class ItemsSelectionType {
data object Single : ItemsSelectionType()
data object Multi : ItemsSelectionType()
data object None : ItemsSelectionType()
}
core/designsystem/src/main/res/values/strings.xml
+4 -1
View File
@@ -259,4 +259,7 @@
<string name="notification_channel_long_polling_service_name">Message update service</string>
<string name="notification_channel_long_polling_service_description">Message update service notifications</string>
</resources>
<string name="warning_confirmation">Confirmation</string>
<string name="captcha_exit_warning">Are you sure? Captcha process will be cancelled</string>
<string name="validation_exit_warning">Are you sure? Validation process will be cancelled</string>
</resources>