Chat creation feature (#138)

2025-03-23 07:33:58 +03:00
parent 36a119ffa9
commit 4cc6ec6b5d
51 changed files with 1120 additions and 120 deletions
@@ -11,10 +11,7 @@ import dev.meloda.fast.common.extensions.createTimerFlow
 import dev.meloda.fast.common.extensions.findWithIndex
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.extensions.setValue
-import dev.meloda.fast.conversations.model.ConversationOption
 import dev.meloda.fast.conversations.model.ConversationsScreenState
-import dev.meloda.fast.conversations.model.ConversationsShowOptions
-import dev.meloda.fast.conversations.model.UiConversation
 import dev.meloda.fast.conversations.util.asPresentation
 import dev.meloda.fast.conversations.util.extractAvatar
 import dev.meloda.fast.data.State
@@ -29,6 +26,9 @@ import dev.meloda.fast.model.InteractionType
 import dev.meloda.fast.model.LongPollEvent
 import dev.meloda.fast.model.api.domain.VkConversation
 import dev.meloda.fast.network.VkErrorCode
+import dev.meloda.fast.ui.model.api.ConversationOption
+import dev.meloda.fast.ui.model.api.ConversationsShowOptions
+import dev.meloda.fast.ui.model.api.UiConversation
 import dev.meloda.fast.ui.util.ImmutableList
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -84,10 +84,7 @@ class ConversationsViewModelImpl(
    override val currentOffset = MutableStateFlow(0)
    override val canPaginate = MutableStateFlow(false)

-    // TODO: 22-Dec-24, Danil Nikolaev: rewrite
-    private val useContactNames = {
-        userSettings.useContactNames.value
-    }
+    private val useContactNames: Boolean get() = userSettings.useContactNames.value

    override fun onPaginationConditionsMet() {
        currentOffset.update { screenState.value.conversations.size }
@@ -168,11 +165,11 @@ class ConversationsViewModelImpl(
                conversations = old.conversations.map { item ->
                    item.copy(
                        isExpanded =
-                        if (item.id == conversation.id) {
-                            !item.isExpanded
-                        } else {
-                            false
-                        },
+                            if (item.id == conversation.id) {
+                                !item.isExpanded
+                            } else {
+                                false
+                            },
                        options = ImmutableList.copyOf(options)
                    )
                }
@@ -191,7 +188,10 @@ class ConversationsViewModelImpl(
        onPinDialogDismissed()
    }

-    override fun onOptionClicked(conversation: UiConversation, option: ConversationOption) {
+    override fun onOptionClicked(
+        conversation: UiConversation,
+        option: ConversationOption
+    ) {
        when (option) {
            ConversationOption.Delete -> {
                emitShowOptions { old ->
@@ -322,21 +322,25 @@ class ConversationsViewModelImpl(
                    }
                }
            }
+
            State.Error.ConnectionError -> {
                baseError.setValue {
                    BaseError.SimpleError(message = "Connection error")
                }
            }
+
            State.Error.InternalError -> {
                baseError.setValue {
                    BaseError.SimpleError(message = "Internal error")
                }
            }
+
            State.Error.UnknownError -> {
                baseError.setValue {
                    BaseError.SimpleError(message = "Unknown error")
                }
            }
+
            else -> Unit
        }
    }
@@ -360,7 +364,7 @@ class ConversationsViewModelImpl(
                            conversations = newConversations.map {
                                it.asPresentation(
                                    resources = resources,
-                                    useContactName = useContactNames()
+                                    useContactName = useContactNames
                                )
                            }
                        )
@@ -424,7 +428,7 @@ class ConversationsViewModelImpl(
                                    conversations = newConversations.map {
                                        it.asPresentation(
                                            resources = resources,
-                                            useContactName = useContactNames()
+                                            useContactName = useContactNames
                                        )
                                    }
                                )
@@ -475,7 +479,7 @@ class ConversationsViewModelImpl(
                    conversations = newConversations.map {
                        it.asPresentation(
                            resources = resources,
-                            useContactName = useContactNames()
+                            useContactName = useContactNames
                        )
                    }
                )
@@ -504,7 +508,7 @@ class ConversationsViewModelImpl(
                    conversations = newConversations.map {
                        it.asPresentation(
                            resources = resources,
-                            useContactName = useContactNames()
+                            useContactName = useContactNames
                        )
                    }
                )
@@ -534,7 +538,7 @@ class ConversationsViewModelImpl(
                    conversations = newConversations.map {
                        it.asPresentation(
                            resources = resources,
-                            useContactName = useContactNames()
+                            useContactName = useContactNames
                        )
                    }
                )
@@ -563,7 +567,7 @@ class ConversationsViewModelImpl(
                    conversations = newConversations.map {
                        it.asPresentation(
                            resources = resources,
-                            useContactName = useContactNames()
+                            useContactName = useContactNames
                        )
                    }
                )
@@ -609,7 +613,7 @@ class ConversationsViewModelImpl(
                old.copy(conversations = newConversations.map {
                    it.asPresentation(
                        resources = resources,
-                        useContactName = useContactNames()
+                        useContactName = useContactNames
                    )
                })
            }
@@ -650,7 +654,7 @@ class ConversationsViewModelImpl(
                    conversations = newConversations.map {
                        it.asPresentation(
                            resources = resources,
-                            useContactName = useContactNames()
+                            useContactName = useContactNames
                        )
                    }
                )
@@ -701,7 +705,7 @@ class ConversationsViewModelImpl(
                conversations = newConversations.map {
                    it.asPresentation(
                        resources = resources,
-                        useContactName = useContactNames()
+                        useContactName = useContactNames
                    )
                }
            )
@@ -735,7 +739,7 @@ class ConversationsViewModelImpl(
                            conversations = newConversations.map {
                                it.asPresentation(
                                    resources = resources,
-                                    useContactName = useContactNames()
+                                    useContactName = useContactNames
                                )
                            }
                        )
@@ -1,20 +0,0 @@
-package dev.meloda.fast.conversations.model
-
-enum class ActionState {
-    PHANTOM, CALL_IN_PROGRESS, NONE;
-
-    // TODO: 11/04/2024, Danil Nikolaev: implement
-    fun getResourceId(): Int {
-        return -1
-    }
-
-    companion object {
-        fun parse(isPhantom: Boolean, isCallInProgress: Boolean): ActionState {
-            return when {
-                isPhantom -> PHANTOM
-                isCallInProgress -> CALL_IN_PROGRESS
-                else -> NONE
-            }
-        }
-    }
-}
@@ -1,31 +0,0 @@
-package dev.meloda.fast.conversations.model
-
-import dev.meloda.fast.common.model.UiImage
-import dev.meloda.fast.common.model.UiText
-import dev.meloda.fast.ui.R as UiR
-
-sealed class ConversationOption(
-    val title: UiText,
-    val icon: UiImage
-) {
-
-    data object MarkAsRead : ConversationOption(
-        title = UiText.Resource(UiR.string.action_mark_as_read),
-        icon = UiImage.Resource(UiR.drawable.round_done_all_24)
-    )
-
-    data object Pin : ConversationOption(
-        title = UiText.Resource(UiR.string.action_pin),
-        icon = UiImage.Resource(UiR.drawable.pin_outline_24)
-    )
-
-    data object Unpin : ConversationOption(
-        title = UiText.Resource(UiR.string.action_unpin),
-        icon = UiImage.Resource(UiR.drawable.pin_off_outline_24)
-    )
-
-    data object Delete : ConversationOption(
-        title = UiText.Resource(UiR.string.action_delete),
-        icon = UiImage.Resource(UiR.drawable.round_delete_outline_24)
-    )
-}
@@ -1,6 +1,8 @@
 package dev.meloda.fast.conversations.model

 import androidx.compose.runtime.Immutable
+import dev.meloda.fast.ui.model.api.ConversationsShowOptions
+import dev.meloda.fast.ui.model.api.UiConversation

@Immutable
 data class ConversationsScreenState(
@@ -1,14 +0,0 @@
-package dev.meloda.fast.conversations.model
-
-data class ConversationsShowOptions(
-    val showDeleteDialog: Int?,
-    val showPinDialog: UiConversation?
-) {
-
-    companion object {
-        val EMPTY: ConversationsShowOptions = ConversationsShowOptions(
-            showDeleteDialog = null,
-            showPinDialog = null
-        )
-    }
-}
@@ -1,31 +0,0 @@
-package dev.meloda.fast.conversations.model
-
-import androidx.compose.runtime.Immutable
-import androidx.compose.ui.text.AnnotatedString
-import dev.meloda.fast.common.model.UiImage
-import dev.meloda.fast.model.api.PeerType
-import dev.meloda.fast.model.api.domain.VkMessage
-import dev.meloda.fast.ui.util.ImmutableList
-
-@Immutable
-data class UiConversation(
-    val id: Int,
-    val lastMessageId: Int?,
-    val avatar: UiImage?,
-    val title: String,
-    val unreadCount: String?,
-    val date: String,
-    val message: AnnotatedString,
-    val attachmentImage: UiImage?,
-    val isPinned: Boolean,
-    val actionImageId: Int,
-    val isBirthday: Boolean,
-    val isUnread: Boolean,
-    val isAccount: Boolean,
-    val isOnline: Boolean,
-    val lastMessage: VkMessage?,
-    val peerType: PeerType,
-    val interactionText: String?,
-    val isExpanded: Boolean,
-    val options: ImmutableList<ConversationOption>,
-)
@@ -17,6 +17,7 @@ fun NavGraphBuilder.conversationsScreen(
    onError: (BaseError) -> Unit,
    onConversationItemClicked: (id: Int) -> Unit,
    onPhotoClicked: (url: String) -> Unit,
+    onCreateChatClicked: () -> Unit,
    navController: NavController,
 ) {
    composable<Conversations> {
@@ -27,6 +28,7 @@ fun NavGraphBuilder.conversationsScreen(
            onError = onError,
            onConversationItemClicked = onConversationItemClicked,
            onConversationPhotoClicked = onPhotoClicked,
+            onCreateChatButtonClicked = onCreateChatClicked,
            viewModel = viewModel
        )
    }
@@ -48,11 +48,11 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
-import dev.meloda.fast.conversations.model.ConversationOption
-import dev.meloda.fast.conversations.model.UiConversation
 import dev.meloda.fast.ui.basic.ContentAlpha
 import dev.meloda.fast.ui.basic.LocalContentAlpha
 import dev.meloda.fast.ui.components.DotsFlashing
+import dev.meloda.fast.ui.model.api.ConversationOption
+import dev.meloda.fast.ui.model.api.UiConversation
 import dev.meloda.fast.ui.util.getImage
 import dev.meloda.fast.ui.util.getResourcePainter
 import dev.meloda.fast.ui.util.getString
@@ -256,7 +256,7 @@ fun ConversationItem(
                    Row {
                        if (conversation.interactionText != null) {
                            Text(
-                                text = conversation.interactionText,
+                                text = conversation.interactionText.orEmpty(),
                                color = MaterialTheme.colorScheme.primary
                            )
                            Spacer(modifier = Modifier.width(4.dp))
@@ -22,10 +22,10 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import dev.meloda.fast.conversations.model.ConversationOption
 import dev.meloda.fast.conversations.model.ConversationsScreenState
-import dev.meloda.fast.conversations.model.UiConversation
 import dev.meloda.fast.data.UserConfig
+import dev.meloda.fast.ui.model.api.ConversationOption
+import dev.meloda.fast.ui.model.api.UiConversation
 import dev.meloda.fast.ui.theme.LocalBottomPadding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -2,7 +2,6 @@ package dev.meloda.fast.conversations.presentation

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -48,12 +47,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -62,29 +59,26 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import androidx.core.view.HapticFeedbackConstantsCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dev.chrisbanes.haze.hazeEffect
 import dev.chrisbanes.haze.hazeSource
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import dev.chrisbanes.haze.materials.HazeMaterials
 import dev.meloda.fast.conversations.ConversationsViewModel
-import dev.meloda.fast.conversations.model.ConversationOption
 import dev.meloda.fast.conversations.model.ConversationsScreenState
-import dev.meloda.fast.conversations.model.UiConversation
-import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.ui.components.ErrorView
 import dev.meloda.fast.ui.components.FullScreenLoader
 import dev.meloda.fast.ui.components.MaterialDialog
 import dev.meloda.fast.ui.components.NoItemsView
+import dev.meloda.fast.ui.model.api.ConversationOption
+import dev.meloda.fast.ui.model.api.UiConversation
 import dev.meloda.fast.ui.theme.LocalBottomPadding
 import dev.meloda.fast.ui.theme.LocalHazeState
 import dev.meloda.fast.ui.theme.LocalThemeConfig
 import dev.meloda.fast.ui.util.isScrollingUp
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.launch
 import dev.meloda.fast.ui.R as UiR

@Composable
@@ -92,6 +86,7 @@ fun ConversationsRoute(
    onError: (BaseError) -> Unit,
    onConversationItemClicked: (conversationId: Int) -> Unit,
    onConversationPhotoClicked: (url: String) -> Unit,
+    onCreateChatButtonClicked: () -> Unit,
    viewModel: ConversationsViewModel
 ) {
    val screenState by viewModel.screenState.collectAsStateWithLifecycle()
@@ -113,6 +108,7 @@ fun ConversationsRoute(
        onRefreshDropdownItemClicked = viewModel::onRefresh,
        onRefresh = viewModel::onRefresh,
        onConversationPhotoClicked = onConversationPhotoClicked,
+        onCreateChatButtonClicked = onCreateChatButtonClicked,
        setScrollIndex = viewModel::setScrollIndex,
        setScrollOffset = viewModel::setScrollOffset
    )
@@ -132,7 +128,7 @@ fun ConversationsScreen(
    screenState: ConversationsScreenState = ConversationsScreenState.EMPTY,
    baseError: BaseError? = null,
    canPaginate: Boolean = false,
-    onSessionExpiredLogOutButtonClicked: () -> Unit,
+    onSessionExpiredLogOutButtonClicked: () -> Unit = {},
    onConversationItemClicked: (conversationId: Int) -> Unit = {},
    onConversationItemLongClicked: (conversation: UiConversation) -> Unit = {},
    onOptionClicked: (UiConversation, ConversationOption) -> Unit = { _, _ -> },
@@ -140,6 +136,7 @@ fun ConversationsScreen(
    onRefreshDropdownItemClicked: () -> Unit = {},
    onRefresh: () -> Unit = {},
    onConversationPhotoClicked: (url: String) -> Unit = {},
+    onCreateChatButtonClicked: () -> Unit = {},
    setScrollIndex: (Int) -> Unit = {},
    setScrollOffset: (Int) -> Unit = {}
 ) {
@@ -284,37 +281,13 @@ fun ConversationsScreen(
            }
        },
        floatingActionButton = {
-            val scope = rememberCoroutineScope()
-            val rotation = remember { Animatable(0f) }
-
            Column {
                AnimatedVisibility(
                    visible = listState.isScrollingUp(),
                    enter = slideIn { IntOffset(0, 600) } + fadeIn(tween(200)),
                    exit = slideOut { IntOffset(0, 600) } + fadeOut(tween(200))
                ) {
-                    FloatingActionButton(
-                        onClick = {
-                            if (AppSettings.General.enableHaptic) {
-                                view.performHapticFeedback(HapticFeedbackConstantsCompat.REJECT)
-                            }
-                            scope.launch {
-                                for (i in 20 downTo 0 step 4) {
-                                    rotation.animateTo(
-                                        targetValue = i.toFloat(),
-                                        animationSpec = tween(50)
-                                    )
-                                    if (i > 0) {
-                                        rotation.animateTo(
-                                            targetValue = -i.toFloat(),
-                                            animationSpec = tween(50)
-                                        )
-                                    }
-                                }
-                            }
-                        },
-                        modifier = Modifier.rotate(rotation.value)
-                    ) {
+                    FloatingActionButton(onClick = onCreateChatButtonClicked) {
                        Icon(
                            painter = painterResource(id = UiR.drawable.ic_baseline_create_24),
                            contentDescription = "Add chat button"
@@ -417,9 +390,7 @@ fun HandleDialogs(
        )
    }

-    if (showOptions.showPinDialog != null) {
-        val conversation = showOptions.showPinDialog
-
+    showOptions.showPinDialog?.let { conversation ->
        MaterialDialog(
            onDismissRequest = viewModel::onPinDialogDismissed,
            title = stringResource(
@@ -14,8 +14,6 @@ import dev.meloda.fast.common.model.UiImage
 import dev.meloda.fast.common.model.UiText
 import dev.meloda.fast.common.model.parseString
 import dev.meloda.fast.common.util.TimeUtils
-import dev.meloda.fast.conversations.model.ActionState
-import dev.meloda.fast.conversations.model.UiConversation
 import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.VkMemoryCache
 import dev.meloda.fast.model.InteractionType
@@ -24,6 +22,8 @@ import dev.meloda.fast.model.api.data.AttachmentType
 import dev.meloda.fast.model.api.domain.VkAttachment
 import dev.meloda.fast.model.api.domain.VkConversation
 import dev.meloda.fast.model.api.domain.VkMessage
+import dev.meloda.fast.ui.model.api.ActionState
+import dev.meloda.fast.ui.model.api.UiConversation
 import dev.meloda.fast.ui.util.ImmutableList
 import java.util.Calendar
 import java.util.Locale