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
@@ -24,6 +24,7 @@ import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.domain.GetCurrentAccountUseCase
 import dev.meloda.fast.domain.LoadUserByIdUseCase
 import dev.meloda.fast.model.BaseError
+import dev.meloda.fast.model.api.domain.VkUser
 import dev.meloda.fast.navigation.Main
 import dev.meloda.fast.settings.navigation.Settings
 import kotlinx.coroutines.Dispatchers
@@ -36,14 +37,13 @@ interface MainViewModel {

    val startDestination: StateFlow<Any?>
    val isNeedToReplaceWithAuth: StateFlow<Boolean>
+    val currentUser: StateFlow<VkUser?>

    val isNeedToShowNotificationsDeniedDialog: StateFlow<Boolean>
    val isNeedToShowNotificationsRationaleDialog: StateFlow<Boolean>
    val isNeedToCheckNotificationsPermission: StateFlow<Boolean>
    val isNeedToRequestNotifications: StateFlow<Boolean>

-    val profileImageUrl: StateFlow<String?>
-
    fun onError(error: BaseError)

    fun onNavigatedToAuth()
@@ -59,6 +59,8 @@ interface MainViewModel {
    fun onNotificationsDeniedDialogDismissed()
    fun onNotificationsRationaleDialogDismissed()
    fun onNotificationsRationaleDialogCancelClicked()
+
+    fun onUserAuthenticated()
 }

 class MainViewModelImpl(
@@ -70,14 +72,13 @@ class MainViewModelImpl(

    override val startDestination = MutableStateFlow<Any?>(null)
    override val isNeedToReplaceWithAuth = MutableStateFlow(false)
+    override val currentUser = MutableStateFlow<VkUser?>(null)

    override val isNeedToShowNotificationsDeniedDialog = MutableStateFlow(false)
    override val isNeedToShowNotificationsRationaleDialog = MutableStateFlow(false)
    override val isNeedToCheckNotificationsPermission = MutableStateFlow(false)
    override val isNeedToRequestNotifications = MutableStateFlow(false)

-    override val profileImageUrl = MutableStateFlow<String?>(null)
-
    private var openNotificationsSettings = false
    private var openAppSettings = false

@@ -170,17 +171,20 @@ class MainViewModelImpl(
        disableBackgroundLongPoll()
    }

+    override fun onUserAuthenticated() {
+        loadProfile()
+    }
+
    private fun loadProfile() {
        loadUserByIdUseCase(userId = null)
            .listenValue(viewModelScope) { state ->
                state.processState(
                    error = { error ->
-                        profileImageUrl.emit(null)
+                        currentUser.emit(null)
                    },
                    success = { response ->
                        val user = response ?: return@listenValue
-
-                        profileImageUrl.emit(user.photo100)
+                        currentUser.emit(user)
                    }
                )
            }
@@ -2,7 +2,6 @@ package dev.meloda.fast.navigation

 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import dev.meloda.fast.MainViewModel
 import dev.meloda.fast.conversations.navigation.Conversations
 import dev.meloda.fast.friends.navigation.Friends
 import dev.meloda.fast.model.BaseError
@@ -25,8 +24,7 @@ fun NavGraphBuilder.mainScreen(
    onConversationClicked: (conversationId: Int) -> Unit,
    onPhotoClicked: (url: String) -> Unit,
    onMessageClicked: (userId: Int) -> Unit,
-    onCreateChatClicked: () -> Unit,
-    viewModel: MainViewModel
+    onCreateChatClicked: () -> Unit
 ) {
    val navigationItems = ImmutableList.of(
        BottomNavigationItem(
@@ -57,8 +55,7 @@ fun NavGraphBuilder.mainScreen(
            onConversationItemClicked = onConversationClicked,
            onPhotoClicked = onPhotoClicked,
            onMessageClicked = onMessageClicked,
-            onCreateChatClicked = onCreateChatClicked,
-            viewModel = viewModel
+            onCreateChatClicked = onCreateChatClicked
        )
    }
 }
@@ -38,6 +38,7 @@ import dev.meloda.fast.common.LongPollController
 import dev.meloda.fast.common.model.LongPollState
 import dev.meloda.fast.datastore.AppSettings
 import dev.meloda.fast.datastore.UserSettings
+import dev.meloda.fast.model.api.domain.VkUser
 import dev.meloda.fast.service.OnlineService
 import dev.meloda.fast.service.longpolling.LongPollingService
 import dev.meloda.fast.ui.model.DeviceSize
@@ -46,6 +47,7 @@ import dev.meloda.fast.ui.model.ThemeConfig
 import dev.meloda.fast.ui.theme.AppTheme
 import dev.meloda.fast.ui.theme.LocalSizeConfig
 import dev.meloda.fast.ui.theme.LocalThemeConfig
+import dev.meloda.fast.ui.theme.LocalUser
 import dev.meloda.fast.ui.util.isNeedToEnableDarkMode
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.KoinContext
@@ -98,6 +100,8 @@ class MainActivity : AppCompatActivity() {

                val viewModel: MainViewModel = koinViewModel<MainViewModelImpl>()

+                val currentUser: VkUser? by viewModel.currentUser.collectAsStateWithLifecycle()
+
                LifecycleResumeEffect(true) {
                    viewModel.onAppResumed(intent)
                    onPauseOrDispose {}
@@ -202,6 +206,7 @@ class MainActivity : AppCompatActivity() {
                val enableBlur by userSettings.useBlur.collectAsStateWithLifecycle()
                val enableMultiline by userSettings.enableMultiline.collectAsStateWithLifecycle()
                val useSystemFont by userSettings.useSystemFont.collectAsStateWithLifecycle()
+                val enableAnimations by userSettings.enableAnimations.collectAsStateWithLifecycle()

                val setDarkMode = isNeedToEnableDarkMode(darkMode = darkMode)

@@ -214,7 +219,7 @@ class MainActivity : AppCompatActivity() {
                    setDarkMode,
                    useSystemFont
                ) {
-                    mutableStateOf(
+                    derivedStateOf {
                        ThemeConfig(
                            darkMode = setDarkMode,
                            dynamicColors = dynamicColors,
@@ -222,14 +227,16 @@ class MainActivity : AppCompatActivity() {
                            amoledDark = amoledDark,
                            enableBlur = enableBlur,
                            enableMultiline = enableMultiline,
-                            useSystemFont = useSystemFont
+                            useSystemFont = useSystemFont,
+                            enableAnimations = enableAnimations
                        )
-                    )
+                    }
                }

                CompositionLocalProvider(
                    LocalThemeConfig provides themeConfig,
-                    LocalSizeConfig provides sizeConfig
+                    LocalSizeConfig provides sizeConfig,
+                    LocalUser provides currentUser
                ) {
                    AppTheme(
                        useDarkTheme = themeConfig.darkMode,
@@ -16,6 +16,7 @@ import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -27,7 +28,6 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
@@ -36,7 +36,6 @@ import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.hazeEffect
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import dev.chrisbanes.haze.materials.HazeMaterials
-import dev.meloda.fast.MainViewModel
 import dev.meloda.fast.conversations.navigation.conversationsScreen
 import dev.meloda.fast.friends.navigation.friendsScreen
 import dev.meloda.fast.model.BaseError
@@ -45,6 +44,7 @@ import dev.meloda.fast.navigation.MainGraph
 import dev.meloda.fast.profile.navigation.profileScreen
 import dev.meloda.fast.ui.theme.LocalHazeState
 import dev.meloda.fast.ui.theme.LocalThemeConfig
+import dev.meloda.fast.ui.theme.LocalUser
 import dev.meloda.fast.ui.util.ImmutableList

@OptIn(ExperimentalHazeMaterialsApi::class)
@@ -56,19 +56,21 @@ fun MainScreen(
    onConversationItemClicked: (conversationId: Int) -> Unit = {},
    onPhotoClicked: (url: String) -> Unit = {},
    onMessageClicked: (userId: Int) -> Unit = {},
-    onCreateChatClicked: () -> Unit = {},
-    viewModel: MainViewModel
+    onCreateChatClicked: () -> Unit = {}
 ) {
    val currentTheme = LocalThemeConfig.current
    val hazeState = remember { HazeState() }
    val navController = rememberNavController()

-    val profileImageUrl by viewModel.profileImageUrl.collectAsStateWithLifecycle()
-
    var selectedItemIndex by rememberSaveable {
        mutableIntStateOf(1)
    }

+    val user = LocalUser.current
+    val profileImageUrl by remember(user) {
+        derivedStateOf { user?.photo100 }
+    }
+
    Scaffold(
        bottomBar = {
            NavigationBar(
@@ -122,9 +124,7 @@ fun MainScreen(
                                        .size(24.dp)
                                        .clip(CircleShape)
                                        .alpha(if (isLoading) 0f else 1f),
-                                    onSuccess = {
-                                        isLoading = false
-                                    }
+                                    onSuccess = { isLoading = false }
                                )
                            } else {
                                Icon(
@@ -118,7 +118,10 @@ fun RootScreen(
            exitTransition = { fadeOut(animationSpec = tween(200)) }
        ) {
            authNavGraph(
-                onNavigateToMain = navController::navigateToMain,
+                onNavigateToMain = {
+                    viewModel.onUserAuthenticated()
+                    navController.navigateToMain()
+                },
                navController = navController
            )
            mainScreen(
@@ -127,8 +130,7 @@ fun RootScreen(
                onConversationClicked = navController::navigateToMessagesHistory,
                onPhotoClicked = { url -> navController.navigateToPhotoView(listOf(url)) },
                onMessageClicked = navController::navigateToMessagesHistory,
-                onCreateChatClicked = navController::navigateToCreateChat,
-                viewModel = viewModel
+                onCreateChatClicked = navController::navigateToCreateChat
            )

            messagesHistoryScreen(