Merge pull request #152 from joreilly/dependency_updates

dependency updates

Author: joreilly

.junie/guidelines.md

@@ -0,0 +1,12 @@
+# Project Guidelines
+
+## Project Structure
+This is a Kotlin Multiplatform project with Compose Multiplatform that includes:
+* `composeApp` - Shared Kotlin code with Compose UI
+* `iosApp` - iOS application
+
+## Building the Project
+When building this project, Junie should use the following Gradle task:
+```
+:shared:compileDebugSources
+```

README.md

@@ -41,3 +41,4 @@ A small SwiftUI iOS app that uses same shared Kotlin Multiplatform code is in th
 *  StarWars (https://github.com/joreilly/StarWars)
 *  WordMasterKMP (https://github.com/joreilly/WordMasterKMP)
 *  Chip-8 (https://github.com/joreilly/chip-8)
+*  FirebaseAILogicKMPSample (https://github.com/joreilly/FirebaseAILogicKMPSample)

androidApp/build.gradle.kts

@@ -51,6 +51,8 @@ dependencies {
     implementation(libs.androidx.compose.foundation.layout)
     implementation(libs.androidx.compose.material)
     implementation(libs.androidx.compose.material.iconsExtended)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.compose.runtime)
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling)

androidApp/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
             android:name="dev.johnoreilly.mortycomposekmm.MortyComposeKMMApplication"
             android:allowBackup="false"
             android:supportsRtl="true"
-            android:theme="@style/AppTheme">
+            android:theme="@android:style/Theme.Material.Light.NoActionBar">
         <activity android:name="dev.johnoreilly.mortycomposekmm.ui.MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

androidApp/src/main/java/dev/johnoreilly/mortycomposekmm/ui/MainActivity.kt

@@ -3,24 +3,29 @@ package dev.johnoreilly.mortycomposekmm.ui
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material.icons.filled.Person
 import androidx.compose.material.icons.filled.Tv
+import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.*
 import dev.johnoreilly.mortycomposekmm.ui.characters.CharacterDetailView
 import dev.johnoreilly.mortycomposekmm.ui.characters.CharactersListView
+import dev.johnoreilly.mortycomposekmm.ui.components.MortyTopAppBar
+import dev.johnoreilly.mortycomposekmm.ui.components.MortyDetailTopAppBar
 import dev.johnoreilly.mortycomposekmm.ui.episodes.EpisodeDetailView
 import dev.johnoreilly.mortycomposekmm.ui.episodes.EpisodesListView
 import dev.johnoreilly.mortycomposekmm.ui.locations.LocationDetailView
 import dev.johnoreilly.mortycomposekmm.ui.locations.LocationsListView
+import dev.johnoreilly.mortycomposekmm.ui.theme.MortyComposeTheme
 
 
 sealed class Screens(val route: String, val label: String, val icon: ImageVector? = null) {
@@ -37,35 +42,89 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        enableEdgeToEdge()
         setContent {
-            MaterialTheme {
+            MortyComposeTheme {
                 MainLayout()
             }
         }
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MainLayout() {
     val navController = rememberNavController()
+    val currentRoute = currentRoute(navController)
+    
+    // State to hold the detail screen title
+    var detailTitle by remember { mutableStateOf("") }
+    
+    // Function to update the detail title (will be passed to detail screens)
+    val updateDetailTitle: (String) -> Unit = { title ->
+        detailTitle = title
+    }
+    
+    // Determine if we're on a detail screen
+    val isDetailScreen = remember(currentRoute) {
+        currentRoute?.startsWith(Screens.CharacterDetailsScreen.route) == true ||
+        currentRoute?.startsWith(Screens.EpisodeDetailsScreen.route) == true ||
+        currentRoute?.startsWith(Screens.LocationDetailsScreen.route) == true
+    }
+    
+    // Get current main screen based on route
+    val currentMainScreen = remember(currentRoute) {
+        when (currentRoute) {
+            Screens.CharactersScreen.route -> Screens.CharactersScreen
+            Screens.EpisodesScreen.route -> Screens.EpisodesScreen
+            Screens.LocationsScreen.route -> Screens.LocationsScreen
+            else -> Screens.CharactersScreen
+        }
+    }
 
     val bottomNavigationItems = listOf(Screens.CharactersScreen, Screens.EpisodesScreen, Screens.LocationsScreen)
 
     Scaffold(
-        topBar = { TopAppBar(title = { Text( "Characters") }) },
-        bottomBar = { MortyBottomNavigation(navController, bottomNavigationItems) })
-    {
+        // Use our shared MortyTopAppBar component with dynamic content
+        topBar = {
+            if (isDetailScreen) {
+                // Use detail app bar for detail screens
+                MortyDetailTopAppBar(
+                    title = detailTitle,
+                    onBackClick = { navController.popBackStack() }
+                )
+            } else {
+                // Use regular app bar for main screens
+                MortyTopAppBar(
+                    title = currentMainScreen.label
+                )
+            }
+        },
+        // Apply navigation bar padding to the bottom navigation
+        bottomBar = { 
+            Surface(
+                tonalElevation = 8.dp,
+                color = MaterialTheme.colorScheme.surface,
+            ) {
+                MortyBottomNavigation(navController, bottomNavigationItems)
+            }
+        },
+        containerColor = MaterialTheme.colorScheme.background
+    ) { paddingValues ->
 
-        NavHost(navController, startDestination = Screens.CharactersScreen.route, modifier = Modifier.padding(it).fillMaxSize()) {
+        NavHost(navController, startDestination = Screens.CharactersScreen.route, 
+                modifier = Modifier.padding(paddingValues).fillMaxSize()) {
             composable(Screens.CharactersScreen.route) {
                 CharactersListView() {
                     navController.navigate(Screens.CharacterDetailsScreen.route + "/${it.id}")
                 }
             }
             composable(Screens.CharacterDetailsScreen.route + "/{id}") { backStackEntry ->
                 CharacterDetailView(
-                    backStackEntry.arguments?.getString("id") as String,
-                    popBack = { navController.popBackStack() })
+                    characterId = backStackEntry.arguments?.getString("id") as String,
+                    popBack = { navController.popBackStack() },
+                    updateTitle = updateDetailTitle
+                )
             }
             composable(Screens.EpisodesScreen.route) {
                 EpisodesListView() {
@@ -74,8 +133,10 @@ fun MainLayout() {
             }
             composable(Screens.EpisodeDetailsScreen.route + "/{id}") { backStackEntry ->
                 EpisodeDetailView(
-                    backStackEntry.arguments?.getString("id") as String,
-                    popBack = { navController.popBackStack() })
+                    episodeId = backStackEntry.arguments?.getString("id") as String,
+                    popBack = { navController.popBackStack() },
+                    updateTitle = updateDetailTitle
+                )
             }
             composable(Screens.LocationsScreen.route) {
                 LocationsListView() {
@@ -84,8 +145,10 @@ fun MainLayout() {
             }
             composable(Screens.LocationDetailsScreen.route + "/{id}") { backStackEntry ->
                 LocationDetailView(
-                    backStackEntry.arguments?.getString("id") as String,
-                    popBack = { navController.popBackStack() })
+                    locationId = backStackEntry.arguments?.getString("id") as String,
+                    popBack = { navController.popBackStack() },
+                    updateTitle = updateDetailTitle
+                )
             }
         }
     }
@@ -97,10 +160,10 @@ private fun MortyBottomNavigation(
     navController: NavHostController,
     items: List<Screens>
 ) {
-    BottomNavigation {
+    NavigationBar {
         val currentRoute = currentRoute(navController)
         items.forEach { screen ->
-            BottomNavigationItem(
+            NavigationBarItem(
                 icon = { screen.icon?.let { Icon(screen.icon, contentDescription = screen.label) } },
                 label = { Text(screen.label) },
                 selected = currentRoute == screen.route,
@@ -115,12 +178,10 @@ private fun MortyBottomNavigation(
             )
         }
     }
-
 }
 
 @Composable
 private fun currentRoute(navController: NavHostController): String? {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     return navBackStackEntry?.destination?.route
-}
-
+}