feat: add navigate to profilecard

DroidKaigi · Jul 3, 2024 · b8ffba6 · b8ffba6
1 parent a06de1c
commit b8ffba6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -100,6 +100,7 @@ dependencies {
     implementation(projects.feature.contributors)
     implementation(projects.feature.sessions)
     implementation(projects.feature.eventmap)
+    implementation(projects.feature.profilecard)
     implementation(projects.core.model)
     implementation(projects.core.data)
     implementation(projects.core.designsystem)

diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt b/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt
@@ -47,6 +47,9 @@ import io.github.droidkaigi.confsched.sessions.sessionScreens
 import io.github.droidkaigi.confsched.sessions.timetableScreenRoute
 import io.github.droidkaigi.confsched.share.ShareNavigator
 import io.github.droidkaigi.confsched.ui.NavHostWithSharedAxisX
+import io.github.droidkaigi.confshed.profilecard.navigateProfileCardScreen
+import io.github.droidkaigi.confshed.profilecard.profileCardScreen
+import io.github.droidkaigi.confshed.profilecard.profileCardScreenRoute
 import kotlinx.collections.immutable.PersistentList
 
 @Composable
@@ -115,6 +118,7 @@ private fun NavGraphBuilder.mainScreen(
                 onNavigationIconClick = navController::popBackStack,
                 onEventMapItemClick = externalNavController::navigate,
             )
+            profileCardScreen(contentPadding)
         },
     )
 }
@@ -125,6 +129,7 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
     override fun routeToTab(route: String): MainScreenTab? {
         return when (route) {
             timetableScreenRoute -> Timetable
+            profileCardScreenRoute -> ProfileCard
             else -> null
         }
     }
@@ -137,7 +142,7 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
             Timetable -> mainNestedNavController.navigateTimetableScreen()
             EventMap -> mainNestedNavController.navigateEventMapScreen()
             About -> TODO()
-            ProfileCard -> TODO()
+            ProfileCard -> mainNestedNavController.navigateProfileCardScreen()
         }
     }
 }

diff --git a/app-ios-shared/build.gradle.kts b/app-ios-shared/build.gradle.kts
@@ -55,6 +55,7 @@ kotlin {
                 api(projects.feature.sessions)
                 api(projects.feature.eventmap)
                 api(projects.feature.contributors)
+                api(projects.feature.profilecard)
                 implementation(libs.kotlinxCoroutinesCore)
                 implementation(libs.skieAnnotation)
             }

diff --git a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/MainScreen.kt b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/MainScreen.kt
@@ -137,19 +137,20 @@ enum class MainScreenTab(
         contentDescription = MainStrings.EventMap.asString(),
     ),
 
-    @OptIn(ExperimentalResourceApi::class)
-    ProfileCard(
-        icon = IconRepresentation.Drawable(drawableId = Res.drawable.icon_achievement_outline),
-        selectedIcon = IconRepresentation.Drawable(drawableId = Res.drawable.icon_achievement_fill),
-        label = MainStrings.Achievements.asString(),
-        contentDescription = MainStrings.Achievements.asString(),
-    ),
     About(
         icon = IconRepresentation.Vector(Icons.Outlined.Info),
         selectedIcon = IconRepresentation.Vector(Icons.Filled.Info),
         label = MainStrings.About.asString(),
         contentDescription = MainStrings.About.asString(),
     ),
+
+    @OptIn(ExperimentalResourceApi::class)
+    ProfileCard(
+        icon = IconRepresentation.Drawable(drawableId = Res.drawable.icon_achievement_outline),
+        selectedIcon = IconRepresentation.Drawable(drawableId = Res.drawable.icon_achievement_fill),
+        label = MainStrings.ProfileCard.asString(),
+        contentDescription = MainStrings.ProfileCard.asString(),
+    ),
 }
 
 data class MainScreenUiState(

diff --git a/...ure/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/strings/MainStrings.kt b/...ure/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/strings/MainStrings.kt
@@ -7,7 +7,7 @@ import io.github.droidkaigi.confsched.designsystem.strings.StringsBindings
 sealed class MainStrings : Strings<MainStrings>(Bindings) {
     data object Timetable : MainStrings()
     data object EventMap : MainStrings()
-    data object Achievements : MainStrings()
+    data object ProfileCard : MainStrings()
     data object About : MainStrings()
     data object Contributors : MainStrings()
     class Time(val hours: Int, val minutes: Int) : MainStrings()
@@ -17,7 +17,7 @@ sealed class MainStrings : Strings<MainStrings>(Bindings) {
             when (item) {
                 Timetable -> "Timetable"
                 EventMap -> "Event Map"
-                Achievements -> "Achievements"
+                ProfileCard -> "Profile Card"
                 About -> "About"
                 Contributors -> "Contributors"
                 is Time -> "${item.hours}時${item.minutes}分"
@@ -27,7 +27,7 @@ sealed class MainStrings : Strings<MainStrings>(Bindings) {
             when (item) {
                 Timetable -> "Timetable"
                 EventMap -> "Event Map"
-                Achievements -> "Achievements"
+                ProfileCard -> "Profile Card"
                 About -> "About"
                 Contributors -> "Contributors"
                 is Time -> "${item.hours}:${item.minutes}"