forked from melod1n/fast-messenger
improve login screen UI and logic & fixes for blur
This commit is contained in:
+1
-6
@@ -71,7 +71,6 @@ interface MessagesHistoryViewModel {
|
||||
val canPaginate: StateFlow<Boolean>
|
||||
|
||||
fun onDialogConfirmed(dialog: MessageDialog, bundle: Bundle)
|
||||
fun onDialogCancelled(dialog: MessageDialog)
|
||||
fun onDialogDismissed(dialog: MessageDialog)
|
||||
fun onDialogItemPicked(dialog: MessageDialog, bundle: Bundle)
|
||||
|
||||
@@ -151,7 +150,7 @@ class MessagesHistoryViewModelImpl(
|
||||
}
|
||||
|
||||
override fun onDialogConfirmed(dialog: MessageDialog, bundle: Bundle) {
|
||||
messageDialog.setValue { null }
|
||||
onDialogDismissed(dialog)
|
||||
|
||||
when (dialog) {
|
||||
is MessageDialog.MessageOptions -> Unit
|
||||
@@ -223,10 +222,6 @@ class MessagesHistoryViewModelImpl(
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDialogCancelled(dialog: MessageDialog) {
|
||||
messageDialog.setValue { null }
|
||||
}
|
||||
|
||||
override fun onDialogDismissed(dialog: MessageDialog) {
|
||||
messageDialog.setValue { null }
|
||||
}
|
||||
|
||||
+2
@@ -1,7 +1,9 @@
|
||||
package dev.meloda.fast.messageshistory.model
|
||||
|
||||
import androidx.compose.runtime.Immutable
|
||||
import dev.meloda.fast.model.api.domain.VkMessage
|
||||
|
||||
@Immutable
|
||||
sealed class MessageDialog {
|
||||
data class MessageOptions(val message: VkMessage) : MessageDialog()
|
||||
data class MessagePin(val messageId: Int) : MessageDialog()
|
||||
|
||||
-2
@@ -170,7 +170,6 @@ fun MessagesHistoryRoute(
|
||||
screenState = screenState,
|
||||
messageDialog = messageDialog,
|
||||
onConfirmed = viewModel::onDialogConfirmed,
|
||||
onCancelled = viewModel::onDialogCancelled,
|
||||
onDismissed = viewModel::onDialogDismissed,
|
||||
onItemPicked = viewModel::onDialogItemPicked
|
||||
)
|
||||
@@ -181,7 +180,6 @@ fun HandleDialogs(
|
||||
screenState: MessagesHistoryScreenState,
|
||||
messageDialog: MessageDialog?,
|
||||
onConfirmed: (MessageDialog, Bundle) -> Unit = { _, _ -> },
|
||||
onCancelled: (MessageDialog) -> Unit = {},
|
||||
onDismissed: (MessageDialog) -> Unit = {},
|
||||
onItemPicked: (MessageDialog, Bundle) -> Unit = { _, _ -> }
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user