Merge branch 'main' into tomoya0x00/add_stage_pr_workflow

DroidKaigi · Aug 12, 2023 · 0c2ae34 · 0c2ae34
2 parents 72b8e2e + bb4c241
commit 0c2ae34
Show file tree

Hide file tree

Showing 54 changed files with 1,054 additions and 238 deletions.
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -83,6 +83,8 @@ dependencies {
     implementation(projects.feature.contributors)
     implementation(projects.feature.sessions)
     implementation(projects.feature.about)
+    implementation(projects.feature.sponsors)
+    implementation(projects.feature.floorMap)
     implementation(projects.core.model)
     implementation(projects.core.data)
     implementation(projects.core.designsystem)

diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/KaigiApp.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/KaigiApp.kt
@@ -24,13 +24,18 @@ import io.github.droidkaigi.confsched2023.contributors.ContributorsScreen
 import io.github.droidkaigi.confsched2023.contributors.ContributorsViewModel
 import io.github.droidkaigi.confsched2023.contributors.contributorsScreenRoute
 import io.github.droidkaigi.confsched2023.designsystem.theme.KaigiTheme
+import io.github.droidkaigi.confsched2023.floormap.floorMapScreenRoute
+import io.github.droidkaigi.confsched2023.floormap.navigateFloorMapScreen
+import io.github.droidkaigi.confsched2023.floormap.nestedFloorMapScreen
 import io.github.droidkaigi.confsched2023.main.MainNestedGraphStateHolder
 import io.github.droidkaigi.confsched2023.main.MainScreenTab
 import io.github.droidkaigi.confsched2023.main.MainScreenTab.About
 import io.github.droidkaigi.confsched2023.main.MainScreenTab.Contributor
+import io.github.droidkaigi.confsched2023.main.MainScreenTab.FloorMap
 import io.github.droidkaigi.confsched2023.main.MainScreenTab.Timetable
 import io.github.droidkaigi.confsched2023.main.mainScreen
 import io.github.droidkaigi.confsched2023.main.mainScreenRoute
+import io.github.droidkaigi.confsched2023.model.AboutItem.Sponsors
 import io.github.droidkaigi.confsched2023.sessions.navigateSearchScreen
 import io.github.droidkaigi.confsched2023.sessions.navigateTimetableScreen
 import io.github.droidkaigi.confsched2023.sessions.navigateToBookmarkScreen
@@ -39,6 +44,8 @@ import io.github.droidkaigi.confsched2023.sessions.nestedSessionScreens
 import io.github.droidkaigi.confsched2023.sessions.searchScreen
 import io.github.droidkaigi.confsched2023.sessions.sessionScreens
 import io.github.droidkaigi.confsched2023.sessions.timetableScreenRoute
+import io.github.droidkaigi.confsched2023.sponsors.navigateSponsorsScreen
+import io.github.droidkaigi.confsched2023.sponsors.sponsorsScreen
 
 @Composable
 fun KaigiApp(modifier: Modifier = Modifier) {
@@ -81,6 +88,11 @@ private fun KaigiNavHost(
                 navController.popBackStack()
             },
         )
+        sponsorsScreen(
+            onSponsorClick = { sponsor ->
+                TODO()
+            },
+        )
     }
 }
 
@@ -104,6 +116,13 @@ private fun NavGraphBuilder.mainScreen(navController: NavHostController) {
             )
             nestedAboutScreen(
                 onAboutItemClick = { aboutItem ->
+                    when (aboutItem) {
+                        Sponsors -> navController.navigateSponsorsScreen()
+                    }
+                },
+            )
+            nestedFloorMapScreen(
+                onSideEventClick = {
                     TODO()
                 },
             )
@@ -128,6 +147,7 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
             timetableScreenRoute -> Timetable
             contributorsScreenRoute -> Contributor
             aboutScreenRoute -> About
+            floorMapScreenRoute -> FloorMap
             else -> null
         }
     }
@@ -139,6 +159,7 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
         when (tab) {
             Timetable -> mainNestedNavController.navigateTimetableScreen()
             About -> mainNestedNavController.navigateAboutScreen()
+            FloorMap -> mainNestedNavController.navigateFloorMapScreen()
             Contributor -> mainNestedNavController.navigate(contributorsScreenRoute)
             else -> null
         }

diff --git a/app-android/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app-android/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app-android/src/main/res/drawable/ic_launcher_background.xml b/app-android/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-android/src/test/java/io/github/droidkaigi/confsched2023/ExampleUnitTest.kt b/app-android/src/test/java/io/github/droidkaigi/confsched2023/ExampleUnitTest.kt
diff --git a/app-android/src/test/java/io/github/droidkaigi/confsched2023/KaigiAppTest.kt b/app-android/src/test/java/io/github/droidkaigi/confsched2023/KaigiAppTest.kt
@@ -55,6 +55,25 @@ class KaigiAppTest {
         }
     }
 
+    @Test
+    fun checkNavigateToFloorMapShot() {
+        kaigiAppRobot {
+            goToFloorMap()
+            capture()
+        }
+    }
+
+    @Test
+    fun checkNavigateToSponsorsShot() {
+        kaigiAppRobot {
+            goToAbout()
+            aboutScreenRobot {
+                clickSponsors()
+            }
+            capture()
+        }
+    }
+
     @Test
     fun checkNavigateToContributorShot() {
         kaigiAppRobot {

diff --git a/app-ios/Modules/Sources/Timetable/TimetableDayHeader.swift b/app-ios/Modules/Sources/Timetable/TimetableDayHeader.swift
@@ -14,14 +14,13 @@ struct TimetableDayHeader: View {
                 [DroidKaigi2023Day].fromKotlinArray(DroidKaigi2023Day.values()),
                 id: \.ordinal
             ) { (day: DroidKaigi2023Day) in
-                let startDay = Calendar.current.component(.day, from: day.start.toDate())
                 Button {
                     onSelect(day)
                 } label: {
                     VStack(spacing: 0) {
                         Text(day.name)
                             .font(Font.system(size: 12, weight: .semibold))
-                        Text("\(startDay)")
+                        Text("\(day.dayOfMonth)")
                             .font(Font.system(size: 24, weight: .semibold))
                             .frame(height: 32)
                     }

diff --git a/.../androidMain/kotlin/io/github/droidkaigi/confsched2023/data/sponsors/SponsorsApiModule.kt b/.../androidMain/kotlin/io/github/droidkaigi/confsched2023/data/sponsors/SponsorsApiModule.kt
@@ -0,0 +1,23 @@
+package io.github.droidkaigi.confsched2023.data.sponsors
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import de.jensklingenberg.ktorfit.Ktorfit
+import io.github.droidkaigi.confsched2023.data.NetworkService
+
+@Module
+@InstallIn(SingletonComponent::class)
+class SponsorsApiModule {
+    @Provides
+    fun provideSponsorsApi(
+        networkService: NetworkService,
+        ktorfit: Ktorfit,
+    ): SponsorsApiClient {
+        return DefaultSponsorsApiClient(
+            networkService = networkService,
+            ktorfit = ktorfit,
+        )
+    }
+}