ability to use more animations (experimental);

fix online friends loading; conversation avatar in messages history screen; test second tap on conversations item in bottom bar to scroll to top; etc
2024-12-17 20:51:02 +03:00
parent 85cda2065e
commit 6a69f28256
21 changed files with 299 additions and 85 deletions
@@ -87,6 +87,7 @@ fun NavGraphBuilder.authNavGraph(
    }
 }

+// TODO: 17.12.2024, Danil Nikolaev: check clearing backstack from main screen
 fun NavController.navigateToAuth(clearBackStack: Boolean = false) {
    val navController = this

@@ -26,7 +26,9 @@ 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.util.ImmutableList
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -34,6 +36,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import kotlin.coroutines.cancellation.CancellationException

 interface ConversationsViewModel {
@@ -43,6 +46,7 @@ interface ConversationsViewModel {
    val imagesToPreload: StateFlow<List<String>>
    val currentOffset: StateFlow<Int>
    val canPaginate: StateFlow<Boolean>
+    val scrollToTop: StateFlow<Boolean>

    fun onPaginationConditionsMet()

@@ -63,6 +67,10 @@ interface ConversationsViewModel {

    fun setScrollIndex(index: Int)
    fun setScrollOffset(offset: Int)
+
+
+    fun setScrollToTopFlow(scrollToTopFlow: Flow<Int>)
+    fun onScrolledToTop()
 }

 class ConversationsViewModelImpl(
@@ -78,6 +86,7 @@ class ConversationsViewModelImpl(
    override val imagesToPreload = MutableStateFlow<List<String>>(emptyList())
    override val currentOffset = MutableStateFlow(0)
    override val canPaginate = MutableStateFlow(false)
+    override val scrollToTop = MutableStateFlow(false)

    override fun onPaginationConditionsMet() {
        currentOffset.update { screenState.value.conversations.size }
@@ -217,6 +226,20 @@ class ConversationsViewModelImpl(
        screenState.setValue { old -> old.copy(scrollOffset = offset) }
    }

+    override fun setScrollToTopFlow(scrollToTopFlow: Flow<Int>) {
+        scrollToTopFlow.listenValue(viewModelScope) { index ->
+            if (index == 1) {
+                scrollToTop.emit(true)
+            }
+        }
+    }
+
+    override fun onScrolledToTop() {
+        viewModelScope.launch(Dispatchers.Main) {
+            scrollToTop.emit(false)
+        }
+    }
+
    private fun hideOptions(conversationId: Int) {
        screenState.setValue { old ->
            old.copy(
@@ -8,6 +8,7 @@ import dev.meloda.fast.conversations.ConversationsViewModelImpl
 import dev.meloda.fast.conversations.presentation.ConversationsRoute
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.ui.extensions.sharedViewModel
+import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.Serializable

@Serializable
@@ -17,11 +18,13 @@ fun NavGraphBuilder.conversationsScreen(
    onError: (BaseError) -> Unit,
    onConversationItemClicked: (id: Int) -> Unit,
    onPhotoClicked: (url: String) -> Unit,
+    scrollToTopFlow: Flow<Int>,
    navController: NavController,
 ) {
    composable<Conversations> {
        val viewModel: ConversationsViewModel =
            it.sharedViewModel<ConversationsViewModelImpl>(navController = navController)
+        viewModel.setScrollToTopFlow(scrollToTopFlow)

        ConversationsRoute(
            onError = onError,
@@ -101,6 +101,7 @@ fun ConversationsRoute(
    val screenState by viewModel.screenState.collectAsStateWithLifecycle()
    val baseError by viewModel.baseError.collectAsStateWithLifecycle()
    val canPaginate by viewModel.canPaginate.collectAsStateWithLifecycle()
+    val isNeedToScrollToTop by viewModel.scrollToTop.collectAsStateWithLifecycle()

    val imagesToPreload by viewModel.imagesToPreload.collectAsStateWithLifecycle()
    LaunchedEffect(imagesToPreload) {
@@ -129,7 +130,9 @@ fun ConversationsRoute(
        onRefresh = viewModel::onRefresh,
        onConversationPhotoClicked = onConversationPhotoClicked,
        setScrollIndex = viewModel::setScrollIndex,
-        setScrollOffset = viewModel::setScrollOffset
+        setScrollOffset = viewModel::setScrollOffset,
+        isNeedToScrollToTop = isNeedToScrollToTop,
+        onScrolledToTop = viewModel::onScrolledToTop
    )

    HandleDialogs(
@@ -156,7 +159,9 @@ fun ConversationsScreen(
    onRefresh: () -> Unit = {},
    onConversationPhotoClicked: (url: String) -> Unit = {},
    setScrollIndex: (Int) -> Unit = {},
-    setScrollOffset: (Int) -> Unit = {}
+    setScrollOffset: (Int) -> Unit = {},
+    isNeedToScrollToTop: Boolean = false,
+    onScrolledToTop: () -> Unit = {}
 ) {
    val view = LocalView.current
    val currentTheme = LocalThemeConfig.current
@@ -170,6 +175,14 @@ fun ConversationsScreen(
        initialFirstVisibleItemScrollOffset = screenState.scrollOffset
    )

+    LaunchedEffect(isNeedToScrollToTop) {
+        if (isNeedToScrollToTop) {
+            listState.scrollToItem(0)
+            onScrolledToTop()
+
+        }
+    }
+
    LaunchedEffect(listState) {
        snapshotFlow { listState.firstVisibleItemIndex }
            .debounce(500L)
@@ -8,6 +8,7 @@ import dev.meloda.fast.data.State
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.domain.FriendsUseCase
+import dev.meloda.fast.domain.LoadUsersByIdsUseCase
 import dev.meloda.fast.friends.model.FriendsScreenState
 import dev.meloda.fast.friends.util.asPresentation
 import dev.meloda.fast.model.BaseError
@@ -42,7 +43,8 @@ interface FriendsViewModel {

 class FriendsViewModelImpl(
    private val friendsUseCase: FriendsUseCase,
-    private val userSettings: UserSettings
+    private val userSettings: UserSettings,
+    private val loadUsersByIdsUseCase: LoadUsersByIdsUseCase
 ) : ViewModel(), FriendsViewModel {

    override val screenState = MutableStateFlow(FriendsScreenState.EMPTY)
@@ -94,6 +96,49 @@ class FriendsViewModelImpl(
    }

    private fun loadFriends(offset: Int = currentOffset.value) {
+        friendsUseCase.getOnlineFriends(null, null)
+            .listenValue(viewModelScope) { state ->
+                state.processState(
+                    error = { error ->
+                        if (error is State.Error.ApiError) {
+                            when (error.errorCode) {
+                                VkErrorCode.USER_AUTHORIZATION_FAILED -> {
+                                    baseError.setValue { BaseError.SessionExpired }
+                                }
+
+                                else -> Unit
+                            }
+                        }
+                    },
+                    success = { userIds ->
+                        loadUsersByIdsUseCase(userIds = userIds)
+                            .listenValue(viewModelScope) { state ->
+                                state.processState(
+                                    error = { error ->
+                                        if (error is State.Error.ApiError) {
+                                            when (error.errorCode) {
+                                                VkErrorCode.USER_AUTHORIZATION_FAILED -> {
+                                                    baseError.setValue { BaseError.SessionExpired }
+                                                }
+
+                                                else -> Unit
+                                            }
+                                        }
+                                    },
+                                    success = { onlineFriends ->
+                                        screenState.setValue { old ->
+                                            old.copy(
+                                                onlineFriends = onlineFriends.map {
+                                                    it.asPresentation(userSettings.useContactNames.value)
+                                                }
+                                            )
+                                        }
+                                    }
+                                )
+                            }
+                    }
+                )
+            }
        friendsUseCase.getFriends(count = LOAD_COUNT, offset = offset)
            .listenValue(viewModelScope) { state ->
                state.processState(
@@ -125,10 +170,6 @@ class FriendsViewModelImpl(
                            it.asPresentation(userSettings.useContactNames.value)
                        }

-                        val loadedOnlineFriends = loadedFriends.filter {
-                            it.onlineStatus.isOnline()
-                        }
-
                        val newState = screenState.value.copy(
                            isPaginationExhausted = paginationExhausted
                        )
@@ -136,18 +177,12 @@ class FriendsViewModelImpl(
                        if (offset == 0) {
                            friends.emit(response)
                            screenState.setValue {
-                                newState.copy(
-                                    friends = loadedFriends,
-                                    onlineFriends = loadedOnlineFriends
-                                )
+                                newState.copy(friends = loadedFriends)
                            }
                        } else {
                            friends.emit(friends.value.plus(response))
                            screenState.setValue {
-                                newState.copy(
-                                    friends = newState.friends.plus(loadedFriends),
-                                    onlineFriends = newState.onlineFriends.plus(loadedOnlineFriends)
-                                )
+                                newState.copy(friends = newState.friends.plus(loadedFriends))
                            }
                        }
                    }
@@ -1,10 +1,8 @@
 package dev.meloda.fast.messageshistory

-import android.content.SharedPreferences
 import android.util.Log
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
-import androidx.core.content.edit
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -19,9 +17,9 @@ import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.VkMemoryCache
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.AppSettings
-import dev.meloda.fast.datastore.SettingsKeys
 import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.domain.ConversationsUseCase
+import dev.meloda.fast.domain.LoadConversationsByIdUseCase
 import dev.meloda.fast.domain.LongPollUpdatesParser
 import dev.meloda.fast.domain.MessagesUseCase
 import dev.meloda.fast.messageshistory.model.ActionMode
@@ -60,15 +58,14 @@ interface MessagesHistoryViewModel {
    fun onActionButtonClicked()

    fun onPaginationConditionsMet()
-    fun onToggleAnimationsDropdownItemClicked(enableAnimations: Boolean)
 }

 class MessagesHistoryViewModelImpl(
    private val messagesUseCase: MessagesUseCase,
    private val conversationsUseCase: ConversationsUseCase,
-    private val preferences: SharedPreferences,
    private val resourceProvider: ResourceProvider,
    private val userSettings: UserSettings,
+    private val loadConversationsByIdUseCase: LoadConversationsByIdUseCase,
    updatesParser: LongPollUpdatesParser,
    savedStateHandle: SavedStateHandle
 ) : MessagesHistoryViewModel, ViewModel() {
@@ -159,15 +156,6 @@ class MessagesHistoryViewModelImpl(
        loadMessagesHistory()
    }

-    override fun onToggleAnimationsDropdownItemClicked(enableAnimations: Boolean) {
-        preferences.edit {
-            putBoolean(
-                SettingsKeys.KEY_ENABLE_ANIMATIONS_IN_MESSAGES,
-                enableAnimations
-            )
-        }
-    }
-
    private fun handleNewMessage(event: LongPollEvent.VkMessageNewEvent) {
        val message = event.message

@@ -18,6 +18,7 @@ data class MessagesHistoryScreenState(
    val isPaginating: Boolean,
    val isPaginationExhausted: Boolean,
    val actionMode: ActionMode,
+    val chatImageUrl: String?
 ) {

    companion object {
@@ -33,6 +34,7 @@ data class MessagesHistoryScreenState(
            isPaginating = false,
            isPaginationExhausted = false,
            actionMode = ActionMode.Record,
+            chatImageUrl = null
        )
    }
 }
@@ -1,10 +1,12 @@
 package dev.meloda.fast.messageshistory.presentation

 import android.content.SharedPreferences
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -23,9 +25,11 @@ import androidx.compose.foundation.layout.imeNestedScroll
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
@@ -59,6 +63,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalView
@@ -71,12 +76,12 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.core.view.HapticFeedbackConstantsCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import coil.compose.AsyncImage
 import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.hazeChild
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import dev.chrisbanes.haze.materials.HazeMaterials
 import dev.meloda.fast.datastore.AppSettings
-import dev.meloda.fast.datastore.SettingsKeys
 import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.messageshistory.MessagesHistoryViewModel
 import dev.meloda.fast.messageshistory.MessagesHistoryViewModelImpl
@@ -88,6 +93,7 @@ import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.ui.components.IconButton
 import dev.meloda.fast.ui.theme.LocalThemeConfig
 import dev.meloda.fast.ui.util.ImmutableList
+import dev.meloda.fast.ui.util.getImage
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
@@ -115,7 +121,6 @@ fun MessagesHistoryRoute(
        onBack = onBack,
        onChatMaterialsDropdownItemClicked = onChatMaterialsDropdownItemClicked,
        onRefreshDropdownItemClicked = viewModel::onRefresh,
-        onToggleAnimationsDropdownItemClicked = viewModel::onToggleAnimationsDropdownItemClicked,
        onPaginationConditionsMet = viewModel::onPaginationConditionsMet,
        onMessageInputChanged = viewModel::onMessageInputChanged,
        onAttachmentButtonClicked = viewModel::onAttachmentButtonClicked,
@@ -174,15 +179,6 @@ fun MessagesHistoryScreen(

    val hazeState = remember { HazeState() }

-    var animationsEnabled by remember {
-        mutableStateOf(
-            preferences.getBoolean(
-                SettingsKeys.KEY_ENABLE_ANIMATIONS_IN_MESSAGES,
-                false
-            )
-        )
-    }
-
    val toolbarColorAlpha by animateFloatAsState(
        targetValue = if (!listState.canScrollForward) 1f else 0f,
        label = "toolbarColorAlpha",
@@ -212,14 +208,42 @@ fun MessagesHistoryScreen(
                        )
                        .fillMaxWidth(),
                    title = {
-                        Text(
-                            text =
-                            if (screenState.isLoading) stringResource(id = UiR.string.title_loading)
-                            else screenState.title,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                            style = MaterialTheme.typography.headlineSmall
-                        )
+                        Row(
+                            modifier = Modifier
+                                .weight(1f),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            val avatar = screenState.avatar.getImage()
+                            if (avatar is Painter) {
+                                Image(
+                                    painter = avatar,
+                                    contentDescription = null,
+                                    modifier = Modifier
+                                        .size(36.dp)
+                                        .clip(CircleShape)
+                                )
+                            } else {
+                                AsyncImage(
+                                    model = screenState.avatar.getImage(),
+                                    contentDescription = "Profile Image",
+                                    modifier = Modifier
+                                        .size(36.dp)
+                                        .clip(CircleShape),
+                                    placeholder = painterResource(id = UiR.drawable.ic_account_circle_cut),
+                                )
+                            }
+
+                            Spacer(modifier = Modifier.width(12.dp))
+
+                            Text(
+                                text =
+                                if (screenState.isLoading) stringResource(id = UiR.string.title_loading)
+                                else screenState.title,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                style = MaterialTheme.typography.headlineSmall
+                            )
+                        }
                    },
                    navigationIcon = {
                        IconButton(onClick = onBack) {
@@ -282,31 +306,19 @@ fun MessagesHistoryScreen(
                                    )
                                }
                            )
-
-                            if (preferences.getBoolean(
-                                    SettingsKeys.KEY_SHOW_DEBUG_CATEGORY,
-                                    false
-                                )
-                            ) {
-                                HorizontalDivider()
-
-                                DropdownMenuItem(
-                                    text = {
-                                        Text(text = if (animationsEnabled) "Disable animations" else "Enable animations")
-                                    },
-                                    onClick = {
-                                        dropDownMenuExpanded = false
-                                        animationsEnabled = !animationsEnabled
-                                        onToggleAnimationsDropdownItemClicked(animationsEnabled)
-                                    }
-                                )
-                            }
                        }
                    }
                )
-                if (screenState.isLoading && screenState.messages.isNotEmpty()) {
+
+                val showHorizontalProgressBar by remember(screenState) {
+                    derivedStateOf { screenState.isLoading && screenState.messages.isNotEmpty() }
+                }
+                if (showHorizontalProgressBar) {
                    LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
                }
+                AnimatedVisibility(!showHorizontalProgressBar) {
+                    HorizontalDivider()
+                }
            }
        }
    ) { padding ->
@@ -322,7 +334,6 @@ fun MessagesHistoryScreen(
                listState = listState,
                immutableMessages = ImmutableList.copyOf(screenState.messages),
                isPaginating = screenState.isPaginating,
-                enableAnimations = animationsEnabled,
                messageBarHeight = messageBarHeight,
                onRequestScrollToCmId = { cmId ->
                    coroutineScope.launch {
@@ -13,12 +13,14 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.haze
+import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.messageshistory.model.UiItem
 import dev.meloda.fast.ui.theme.LocalThemeConfig
 import dev.meloda.fast.ui.util.ImmutableList
@@ -30,11 +32,15 @@ fun MessagesList(
    listState: LazyListState,
    immutableMessages: ImmutableList<UiItem>,
    isPaginating: Boolean,
-    enableAnimations: Boolean,
    messageBarHeight: Dp,
    onRequestScrollToCmId: (cmId: Int) -> Unit = {}
 ) {
-    val messages = immutableMessages.toList()
+    val enableAnimations = remember {
+        AppSettings.Experimental.moreAnimations
+    }
+    val messages = remember(immutableMessages) {
+        immutableMessages.toList()
+    }
    val currentTheme = LocalThemeConfig.current

    LazyColumn(
@@ -387,16 +387,22 @@ class SettingsViewModelImpl(
            title = UiText.Resource(UiR.string.settings_features_long_poll_in_background_title),
            text = UiText.Resource(UiR.string.settings_features_long_poll_in_background_summary)
        )
+        val experimentalShowTimeInActionMessages = SettingsItem.Switch(
+            key = SettingsKeys.KEY_SHOW_TIME_IN_ACTION_MESSAGES,
+            defaultValue = SettingsKeys.DEFAULT_SHOW_TIME_IN_ACTION_MESSAGES,
+            title = UiText.Simple("Show time in action messages")
+        )
        val experimentalUseBlur = SettingsItem.Switch(
            key = SettingsKeys.KEY_USE_BLUR,
            defaultValue = SettingsKeys.DEFAULT_USE_BLUR,
            title = UiText.Simple("Use blur"),
            text = UiText.Simple("Adds blur wherever possible\nWorks on android 12 and newer"),
        )
-        val experimentalShowTimeInActionMessages = SettingsItem.Switch(
-            key = SettingsKeys.KEY_SHOW_TIME_IN_ACTION_MESSAGES,
-            defaultValue = SettingsKeys.DEFAULT_SHOW_TIME_IN_ACTION_MESSAGES,
-            title = UiText.Simple("Show time in action messages")
+        val enableAnimations = SettingsItem.Switch(
+            key = SettingsKeys.KEY_MORE_ANIMATIONS,
+            defaultValue = SettingsKeys.DEFAULT_MORE_ANIMATIONS,
+            title = UiText.Simple("More animations"),
+            text = UiText.Simple("Use animations wherever possible")
        )

        val debugTitle = SettingsItem.Title(
@@ -473,7 +479,8 @@ class SettingsViewModelImpl(
            experimentalTitle,
            experimentalLongPollBackground,
            experimentalShowTimeInActionMessages,
-            experimentalUseBlur
+            experimentalUseBlur,
+            enableAnimations
        )
        val debugList = mutableListOf<SettingsItem<*>>()
        listOf(