Add theme option to disable animations and fix account avatar loading in bottom bar

2025-03-28 19:59:38 +03:00
parent 9aa85d40c6
commit da9644cde1
14 changed files with 104 additions and 84 deletions
@@ -26,7 +26,7 @@ import dev.meloda.fast.conversations.model.ConversationsScreenState
 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 dev.meloda.fast.ui.theme.LocalThemeConfig
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

@@ -41,6 +41,7 @@ fun ConversationsList(
    onOptionClicked: (UiConversation, ConversationOption) -> Unit,
    padding: PaddingValues
 ) {
+    val theme = LocalThemeConfig.current
    val coroutineScope = rememberCoroutineScope()

    LazyColumn(
@@ -68,7 +69,12 @@ fun ConversationsList(
                maxLines = maxLines,
                isUserAccount = isUserAccount,
                conversation = conversation,
-                modifier = Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null)
+                modifier =
+                    if (theme.enableAnimations) Modifier.animateItem(
+                        fadeInSpec = null,
+                        fadeOutSpec = null
+                    )
+                    else Modifier
            )

            Spacer(modifier = Modifier.height(8.dp))
@@ -78,7 +84,14 @@ fun ConversationsList(
            Column(
                modifier = Modifier
                    .fillMaxWidth()
-                    .animateItem(fadeInSpec = null, fadeOutSpec = null),
+                    .then(
+                        if (theme.enableAnimations)
+                            Modifier.animateItem(
+                                fadeInSpec = null,
+                                fadeOutSpec = null
+                            )
+                        else Modifier
+                    ),
                horizontalAlignment = Alignment.CenterHorizontally
            ) {
                if (screenState.isPaginating) {
@@ -5,10 +5,6 @@ import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.animateIntAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideIn
-import androidx.compose.animation.slideOut
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -283,23 +279,17 @@ fun ConversationsScreen(
            )

            Column {
-//                AnimatedVisibility(
-//                    visible = listState.isScrollingUp(),
-//                    enter = slideIn { IntOffset(0, 600) } + fadeIn(tween(200)),
-//                    exit = slideOut { IntOffset(0, 600) } + fadeOut(tween(200))
-//                ) {
-                    FloatingActionButton(
-                        onClick = onCreateChatButtonClicked,
-                        modifier = Modifier.offset {
-                            IntOffset(0, offsetY)
-                        }
-                    ) {
-                        Icon(
-                            painter = painterResource(id = UiR.drawable.ic_baseline_create_24),
-                            contentDescription = "Add chat button"
-                        )
+                FloatingActionButton(
+                    onClick = onCreateChatButtonClicked,
+                    modifier = Modifier.offset {
+                        IntOffset(0, offsetY)
                    }
-//                }
+                ) {
+                    Icon(
+                        painter = painterResource(id = UiR.drawable.ic_baseline_create_24),
+                        contentDescription = "Add chat button"
+                    )
+                }

                Spacer(modifier = Modifier.height(LocalBottomPadding.current))
            }
@@ -27,14 +27,21 @@ import androidx.compose.ui.unit.dp
 import coil.compose.rememberAsyncImagePainter
 import coil.imageLoader
 import dev.meloda.fast.messageshistory.model.UiItem
+import dev.meloda.fast.ui.theme.LocalThemeConfig

@Composable
 fun IncomingMessageBubble(
    modifier: Modifier = Modifier,
    message: UiItem.Message,
-    animate: Boolean,
 ) {
-    Row(modifier = modifier.fillMaxWidth().then(if (animate) Modifier.animateContentSize() else Modifier),) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .then(
+                if (LocalThemeConfig.current.enableAnimations) Modifier.animateContentSize()
+                else Modifier
+            ),
+    ) {
        Row(
            modifier = Modifier
                .fillMaxWidth(0.85f)
@@ -81,13 +88,12 @@ fun IncomingMessageBubble(
                    isOut = false,
                    date = message.date,
                    edited = message.isEdited,
-                    animate = animate,
                    isRead = message.isRead,
                    sendingStatus = message.sendingStatus,
                    pinned = message.isPinned
                )
            }
        }
-        Spacer(modifier=Modifier.fillMaxWidth(0.25f))
+        Spacer(modifier = Modifier.fillMaxWidth(0.25f))
    }
 }
@@ -30,6 +30,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import dev.meloda.fast.messageshistory.model.SendingStatus
+import dev.meloda.fast.ui.theme.LocalThemeConfig
 import dev.meloda.fast.ui.R as UiR

@Composable
@@ -39,11 +40,11 @@ fun MessageBubble(
    isOut: Boolean,
    date: String?,
    edited: Boolean,
-    animate: Boolean,
    isRead: Boolean,
    sendingStatus: SendingStatus,
    pinned: Boolean
 ) {
+    val theme = LocalThemeConfig.current
    val backgroundColor = if (!isOut) {
        MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
    } else {
@@ -65,7 +66,7 @@ fun MessageBubble(
                horizontal = 8.dp,
                vertical = 6.dp
            )
-            .then(if (animate) Modifier.animateContentSize() else Modifier),
+            .then(if (theme.enableAnimations) Modifier.animateContentSize() else Modifier),
    ) {
        val minDateContainerWidth = remember(edited, isOut) {
            val mainPart = if (edited) 50.dp else 30.dp
@@ -89,7 +90,7 @@ fun MessageBubble(
                    .padding(end = 4.dp)
                    .padding(end = dateContainerWidth)
                    .padding(end = 4.dp)
-                    .then(if (animate) Modifier.animateContentSize() else Modifier),
+                    .then(if (theme.enableAnimations) Modifier.animateContentSize() else Modifier),
                color = textColor
            )
        }
@@ -98,7 +99,7 @@ fun MessageBubble(
            modifier = Modifier
                .align(Alignment.BottomEnd)
                .defaultMinSize(minWidth = dateContainerWidth)
-                .then(if (animate) Modifier.animateContentSize() else Modifier),
+                .then(if (theme.enableAnimations) Modifier.animateContentSize() else Modifier),
        ) {
            if (pinned) {
                Icon(
@@ -49,20 +49,17 @@ fun MessagesList(
    onMessageClicked: (Int) -> Unit = {},
    onMessageLongClicked: (Int) -> Unit = {}
 ) {
-    val enableAnimations = remember {
-        AppSettings.Experimental.moreAnimations
-    }
    val messages = remember(immutableMessages) {
        immutableMessages.toList()
    }
-    val currentTheme = LocalThemeConfig.current
+    val theme = LocalThemeConfig.current
    val view = LocalView.current

    LazyColumn(
        modifier = modifier
            .fillMaxWidth()
            .then(
-                if (currentTheme.enableBlur) {
+                if (theme.enableBlur) {
                    Modifier.hazeSource(state = hazeState)
                } else Modifier
            ),
@@ -93,7 +90,7 @@ fun MessagesList(
                is UiItem.ActionMessage -> {
                    ActionMessageItem(
                        modifier = Modifier.then(
-                            if (enableAnimations) Modifier.animateItem(
+                            if (theme.enableAnimations) Modifier.animateItem(
                                fadeInSpec = null,
                                fadeOutSpec = null
                            ) else Modifier
@@ -119,7 +116,7 @@ fun MessagesList(
                    Surface(
                        modifier = Modifier
                            .then(
-                                if (enableAnimations) Modifier.animateItem(
+                                if (theme.enableAnimations) Modifier.animateItem(
                                    fadeInSpec = null,
                                    fadeOutSpec = null
                                ) else Modifier
@@ -141,14 +138,13 @@ fun MessagesList(
                                    Modifier
                                        .padding(vertical = 4.dp)
                                        .then(
-                                            if (enableAnimations) Modifier.animateItem(
+                                            if (theme.enableAnimations) Modifier.animateItem(
                                                fadeInSpec = null,
                                                fadeOutSpec = null
                                            )
                                            else Modifier
                                        ),
-                                message = item,
-                                animate = enableAnimations
+                                message = item
                            )
                        } else {
                            IncomingMessageBubble(
@@ -156,14 +152,13 @@ fun MessagesList(
                                    Modifier
                                        .padding(vertical = 4.dp)
                                        .then(
-                                            if (enableAnimations) Modifier.animateItem(
+                                            if (theme.enableAnimations) Modifier.animateItem(
                                                fadeInSpec = null,
                                                fadeOutSpec = null
                                            )
                                            else Modifier
                                        ),
-                                message = item,
-                                animate = enableAnimations
+                                message = item
                            )
                        }
                    }
@@ -12,15 +12,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import dev.meloda.fast.common.extensions.orDots
 import dev.meloda.fast.messageshistory.model.UiItem
+import dev.meloda.fast.ui.theme.LocalThemeConfig

@Composable
 fun OutgoingMessageBubble(
    modifier: Modifier = Modifier,
    message: UiItem.Message,
-    animate: Boolean
 ) {
    Row(
-        modifier = modifier.fillMaxWidth().then(if (animate) Modifier.animateContentSize() else Modifier),
+        modifier = modifier
+            .fillMaxWidth()
+            .then(
+                if (LocalThemeConfig.current.enableAnimations) Modifier.animateContentSize()
+                else Modifier
+            ),
        verticalAlignment = Alignment.CenterVertically,
        horizontalArrangement = Arrangement.End
    ) {
@@ -37,7 +42,6 @@ fun OutgoingMessageBubble(
                isOut = true,
                date = message.date,
                edited = message.isEdited,
-                animate = animate,
                isRead = message.isRead,
                sendingStatus = message.sendingStatus,
                pinned = message.isPinned