update home screen

composeApp/src/androidMain/kotlin/su/reya/coop/App.kt

@@ -6,13 +6,15 @@ import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
+import androidx.compose.material3.expressiveLightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
@@ -26,6 +28,10 @@ import su.reya.coop.screens.ImportScreen
 import su.reya.coop.screens.NewIdentityScreen
 import su.reya.coop.screens.OnboardingScreen
 
+val LocalNostrViewModel = staticCompositionLocalOf<NostrViewModel> {
+    error("No NostrViewModel provided")
+}
+
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun App(dbPath: String) {
@@ -44,7 +50,7 @@ fun App(dbPath: String) {
         }
 
         darkMode -> darkColorScheme()
-        else -> lightColorScheme()
+        else -> expressiveLightColorScheme()
     }
 
     LaunchedEffect(Unit) {
@@ -55,65 +61,67 @@ fun App(dbPath: String) {
     MaterialExpressiveTheme(
         colorScheme = colorScheme,
     ) {
-        rememberCoroutineScope()
-        val navController = rememberNavController()
-        val hasSecret by viewModel.hasSecret.collectAsState(initial = null)
+        CompositionLocalProvider(LocalNostrViewModel provides viewModel) {
+            rememberCoroutineScope()
+            val navController = rememberNavController()
+            val hasSecret by viewModel.hasSecret.collectAsState(initial = null)
 
-        LaunchedEffect(hasSecret) {
-            // Navigate to the home screen if the secret is already set
-            if (hasSecret == true) {
-                // Start a background notification handler
-                viewModel.startNotificationHandler()
-                // Get chat rooms
-                viewModel.getChatRooms()
-                // Navigate to the home screen
-                navController.navigate(Screen.Home) {
-                    popUpTo(Screen.Onboarding) { inclusive = true }
+            LaunchedEffect(hasSecret) {
+                // Navigate to the home screen if the secret is already set
+                if (hasSecret == true) {
+                    // Start a background notification handler
+                    viewModel.startNotificationHandler()
+                    // Get chat rooms
+                    viewModel.getChatRooms()
+                    // Navigate to the home screen
+                    navController.navigate(Screen.Home) {
+                        popUpTo(Screen.Onboarding) { inclusive = true }
+                    }
                 }
             }
-        }
 
-        // Show loading screen while initializing
-        if (hasSecret == null) return@MaterialExpressiveTheme
+            // Show loading screen while initializing
+            if (hasSecret == null) return@CompositionLocalProvider
 
-        NavHost(
-            navController = navController,
-            startDestination = if (hasSecret == true) Screen.Home else Screen.Onboarding
-        ) {
-            composable<Screen.Onboarding> { backStackEntry ->
-                OnboardingScreen(
-                    onOpenImport = { navController.navigate(Screen.Import) },
-                    onOpenNew = { navController.navigate(Screen.NewIdentity) }
-                )
-            }
-            composable<Screen.Import> { backStackEntry ->
-                val isCreating by viewModel.isCreating.collectAsState()
+            NavHost(
+                navController = navController,
+                startDestination = if (hasSecret == true) Screen.Home else Screen.Onboarding
+            ) {
+                composable<Screen.Onboarding> { backStackEntry ->
+                    OnboardingScreen(
+                        onOpenImport = { navController.navigate(Screen.Import) },
+                        onOpenNew = { navController.navigate(Screen.NewIdentity) }
+                    )
+                }
+                composable<Screen.Import> { backStackEntry ->
+                    val isCreating by viewModel.isCreating.collectAsState()
 
-                ImportScreen(
-                    isLoading = isCreating,
-                    onSave = { secret ->
-                        viewModel.import(secret)
-                    }
-                )
-            }
-            composable<Screen.NewIdentity> { backStackEntry ->
-                val isCreating by viewModel.isCreating.collectAsState()
+                    ImportScreen(
+                        isLoading = isCreating,
+                        onSave = { secret ->
+                            viewModel.importIdentity(secret)
+                        }
+                    )
+                }
+                composable<Screen.NewIdentity> { backStackEntry ->
+                    val isCreating by viewModel.isCreating.collectAsState()
 
-                NewIdentityScreen(
-                    isLoading = isCreating,
-                    onSave = { name, bio, uri ->
-                        viewModel.createIdentity(name, bio, uri?.toString())
-                    }
-                )
-            }
-            composable<Screen.Home> { backStackEntry ->
-                HomeScreen(
-                    onOpenChat = { id -> navController.navigate(Screen.Chat(id)) }
-                )
-            }
-            composable<Screen.Chat> { backStackEntry ->
-                val chat: Screen.Chat = backStackEntry.toRoute()
-                ChatScreen(id = chat.id)
+                    NewIdentityScreen(
+                        isLoading = isCreating,
+                        onSave = { name, bio, uri ->
+                            viewModel.createIdentity(name, bio, uri?.toString())
+                        }
+                    )
+                }
+                composable<Screen.Home> { backStackEntry ->
+                    HomeScreen(
+                        onOpenChat = { id -> navController.navigate(Screen.Chat(id)) }
+                    )
+                }
+                composable<Screen.Chat> { backStackEntry ->
+                    val chat: Screen.Chat = backStackEntry.toRoute()
+                    ChatScreen(id = chat.id)
+                }
             }
         }
     }