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

app/src/main/kotlin/dev/meloda/fast/presentation/MainActivity.kt

@@ -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,

app/src/main/kotlin/dev/meloda/fast/presentation/MainScreen.kt

@@ -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(

app/src/main/kotlin/dev/meloda/fast/presentation/RootScreen.kt

@@ -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(