Merge pull request #154 from DroidKaigi/takahirom/use-2024-package-na…

…me/2024-07-22

Use 2024 package name

app-android/build.gradle.kts

@@ -19,7 +19,7 @@ val keystoreExits = keystorePropertiesFile.exists()
 
 android {
     // For firebase we are using 2023 now
-    namespace = "io.github.droidkaigi.confsched2023"
+    namespace = "io.github.droidkaigi.confsched2024"
 
     flavorDimensions += "network"
     buildFeatures {

app-android/google-services.json

@@ -8,9 +8,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:1046519477136:android:4c7faf114baa88b8a8f915",
+        "mobilesdk_app_id": "1:1046519477136:android:08032060aa18822ba8f915",
         "android_client_info": {
-          "package_name": "io.github.droidkaigi.confsched2023"
+          "package_name": "io.github.droidkaigi.confsched2024"
         }
       },
       "oauth_client": [
@@ -21,7 +21,7 @@
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyB6krIXmsPcPdnG7eZMvx1O17TC3xrE5vk"
+          "current_key": "AIzaSyBNLnxxd_SmTj2OspJE4GmfJbViAv_k8fs"
         }
       ],
       "services": {
@@ -37,4 +37,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

app-android/src/dev/google-services.json

@@ -7,9 +7,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:1046519477136:android:4c7faf114baa88b8a8f915",
+        "mobilesdk_app_id": "1:1046519477136:android:08032060aa18822ba8f915",
         "android_client_info": {
-          "package_name": "io.github.droidkaigi.confsched2023.dev"
+          "package_name": "io.github.droidkaigi.confsched2024.dev"
         }
       },
       "oauth_client": [
@@ -20,7 +20,7 @@
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyB6krIXmsPcPdnG7eZMvx1O17TC3xrE5vk"
+          "current_key": "AIzaSyBNLnxxd_SmTj2OspJE4GmfJbViAv_k8fs"
         }
       ],
       "services": {
@@ -36,4 +36,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

app-android/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:scheme="https" />
-                <data android:host="confsched2023.page.link" />
+                <data android:host="confsched2024.page.link" />
                 <data android:host="droidkaigiapp.page.link" />
             </intent-filter>
         </activity>

app-android/src/main/java/io/github/droidkaigi/confsched/App.kt

@@ -3,7 +3,7 @@ package io.github.droidkaigi.confsched
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 import io.github.droidkaigi.confsched.data.di.ServerEnvironmentModule
-import io.github.droidkaigi.confsched2023.BuildConfig
+import io.github.droidkaigi.confsched2024.BuildConfig
 
 @HiltAndroidApp
 class App : Application(), ServerEnvironmentModule.HasServerEnvironment {

app-android/src/main/java/io/github/droidkaigi/confsched/AppModule.kt

@@ -6,7 +6,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import io.github.droidkaigi.confsched.data.di.AppAndroidBuildConfig
 import io.github.droidkaigi.confsched.model.BuildConfigProvider
-import io.github.droidkaigi.confsched2023.BuildConfig
+import io.github.droidkaigi.confsched2024.BuildConfig
 import kotlinx.datetime.Clock
 import javax.inject.Singleton
 

core/data/src/androidMain/kotlin/io/github/droidkaigi/confsched/data/user/DataStoreModule.kt

@@ -59,10 +59,10 @@ public class DataStoreModule {
     )
 
     public companion object {
-        private const val DATA_STORE_PREFERENCE_FILE_NAME = "confsched2023.preferences_pb"
+        private const val DATA_STORE_PREFERENCE_FILE_NAME = "confsched2024.preferences_pb"
         private const val DATA_STORE_CACHE_PREFERENCE_FILE_NAME =
-            "confsched2023.cache.preferences_pb"
+            "confsched2024.cache.preferences_pb"
         private const val DATA_STORE_ACHIEVEMENTS_FILE_NAME =
-            "confsched2023.achievements.preferences_pb"
+            "confsched2024.achievements.preferences_pb"
     }
 }

core/data/src/iosMain/kotlin/io/github/droidkaigi/confsched/data/DataModule.kt

@@ -93,7 +93,7 @@ public val dataModule: Module = module {
                     create = false,
                     error = null,
                 )
-                requireNotNull(documentDirectory).path + "/confsched2023.preferences_pb"
+                requireNotNull(documentDirectory).path + "/confsched2024.preferences_pb"
             },
         )
         UserDataStore(dataStore)
@@ -109,7 +109,7 @@ public val dataModule: Module = module {
                     create = false,
                     error = null,
                 )
-                requireNotNull(documentDirectory).path + "/confsched2023.cache.preferences_pb"
+                requireNotNull(documentDirectory).path + "/confsched2024.cache.preferences_pb"
             },
         )
         SessionCacheDataStore(dataStore, get())
@@ -125,7 +125,7 @@ public val dataModule: Module = module {
                     create = false,
                     error = null,
                 )
-                requireNotNull(documentDirectory).path + "/confsched2023.achievements.preferences_pb"
+                requireNotNull(documentDirectory).path + "/confsched2024.achievements.preferences_pb"
             },
         )
         AchievementsDataStore(dataStore)

core/testing/src/main/java/io/github/droidkaigi/confsched/testing/data/TestDataStoreModule.kt

@@ -65,6 +65,6 @@ class TestDataStoreModule {
         private const val TEST_DATASTORE_NAME = "test_datastore.preferences_pb"
         private const val TEST_DATASTORE_CACHE_NAME = "test_datastore_cache.preferences_pb"
         private const val TEST_DATASTORE_ACHIEVEMENTS_NAME =
-            "confsched2023.achievements.preferences_pb"
+            "confsched2024.achievements.preferences_pb"
     }
 }

core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/AboutScreenRobot.kt

@@ -23,27 +23,27 @@ class AboutScreenRobot @Inject constructor(
         waitUntilIdle()
     }
 
-    fun checkDetailScreenDisplayed() {
+    fun checkDetailSectionDisplayed() {
         composeTestRule
-            .onNode(hasTestTag(AboutTestTag.DetailScreen.SCREEN))
+            .onNode(hasTestTag(AboutTestTag.DetailSection.Section))
             .assertIsDisplayed()
     }
 
-    fun checkCreditsScreenDisplayed() {
+    fun checkCreditsSectionDisplayed() {
         composeTestRule
-            .onNode(hasTestTag(AboutTestTag.CreditsScreen.SCREEN))
+            .onNode(hasTestTag(AboutTestTag.CreditsSection.Section))
             .assertIsDisplayed()
     }
 
-    fun checkOthersScreenDisplayed() {
+    fun checkOthersSectionDisplayed() {
         composeTestRule
-            .onNode(hasTestTag(AboutTestTag.OthersScreen.SCREEN))
+            .onNode(hasTestTag(AboutTestTag.OthersSection.Section))
             .assertIsDisplayed()
     }
 
-    fun checkFooterLinksScreenDisplayed() {
+    fun checkFooterLinksSectionDisplayed() {
         composeTestRule
-            .onNode(hasTestTag(AboutTestTag.FooterLinksScreen.SCREEN))
+            .onNode(hasTestTag(AboutTestTag.FooterLinksSection.Section))
             .assertIsDisplayed()
     }
 }

feature/about/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/about/AboutScreenTest.kt

@@ -45,9 +45,9 @@ class AboutScreenTest(
                             setupScreenContent()
                         }
                     }
-                    itShould("show detail screen") {
+                    itShould("show scr") {
                         captureScreenWithChecks {
-                            checkDetailScreenDisplayed()
+                            checkDetailSectionDisplayed()
                         }
                     }
                 }

feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt

@@ -18,36 +18,39 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import io.github.droidkaigi.confsched.about.component.AboutDroidKaigiDetail
-import io.github.droidkaigi.confsched.about.component.AboutFooterLinks
-import io.github.droidkaigi.confsched.about.component.aboutCredits
-import io.github.droidkaigi.confsched.about.component.aboutOthers
+import io.github.droidkaigi.confsched.about.section.AboutDroidKaigiDetail
+import io.github.droidkaigi.confsched.about.section.AboutFooterLinks
+import io.github.droidkaigi.confsched.about.section.aboutCredits
+import io.github.droidkaigi.confsched.about.section.aboutOthers
 import io.github.droidkaigi.confsched.model.AboutItem
+import io.github.droidkaigi.confsched.model.AboutItem.Medium
+import io.github.droidkaigi.confsched.model.AboutItem.X
+import io.github.droidkaigi.confsched.model.AboutItem.YouTube
 
 const val aboutScreenRoute = "about"
 
 object AboutTestTag {
     private const val suffix = "TestTag"
     private const val prefix = "ProfileCard"
 
-    object DetailScreen {
-        private const val detailScreenPrefix = "${prefix}_DetailScreen"
-        const val SCREEN = "${detailScreenPrefix}_$suffix"
+    object DetailSection {
+        private const val detailSectionPrefix = "${prefix}_DetailSection"
+        const val Section = "${detailSectionPrefix}_$suffix"
     }
 
-    object CreditsScreen {
-        private const val creditsScreenPrefix = "${prefix}_CreditsScreen"
-        const val SCREEN = "${creditsScreenPrefix}_$suffix"
+    object CreditsSection {
+        private const val creditsSectionPrefix = "${prefix}_CreditsSection"
+        const val Section = "${creditsSectionPrefix}_$suffix"
     }
 
-    object OthersScreen {
-        private const val othersScreenPrefix = "${prefix}_OthersScreen"
-        const val SCREEN = "${othersScreenPrefix}_$suffix"
+    object OthersSection {
+        private const val othersSectionPrefix = "${prefix}_OthersSection"
+        const val Section = "${othersSectionPrefix}_$suffix"
     }
 
-    object FooterLinksScreen {
-        private const val footerLinksScreenPrefix = "${prefix}_FooterLinksScreen"
-        const val SCREEN = "${footerLinksScreenPrefix}_$suffix"
+    object FooterLinksSection {
+        private const val footerLinksSectionPrefix = "${prefix}_FooterLinksSection"
+        const val Section = "${footerLinksSectionPrefix}_$suffix"
     }
 }
 
@@ -111,7 +114,7 @@ fun AboutScreen(
                 onStaffItemClick = {
                     onAboutItemClick(AboutItem.Staff)
                 },
-                modifier = Modifier.testTag(AboutTestTag.CreditsScreen.SCREEN),
+                modifier = Modifier.testTag(AboutTestTag.CreditsSection.Section),
             )
             aboutOthers(
                 onCodeOfConductItemClick = {
@@ -123,22 +126,22 @@ fun AboutScreen(
                 onPrivacyPolicyItemClick = {
                     onAboutItemClick(AboutItem.PrivacyPolicy)
                 },
-                modifier = Modifier.testTag(AboutTestTag.OthersScreen.SCREEN),
+                modifier = Modifier.testTag(AboutTestTag.OthersSection.Section),
             )
             item {
                 AboutFooterLinks(
                     // TODO: Inject the right version name
                     versionName = "1.6.0",
                     onYouTubeClick = {
-                        onAboutItemClick(AboutItem.YouTube)
+                        onAboutItemClick(YouTube)
                     },
                     onXClick = {
-                        onAboutItemClick(AboutItem.X)
+                        onAboutItemClick(X)
                     },
                     onMediumClick = {
-                        onAboutItemClick(AboutItem.Medium)
+                        onAboutItemClick(Medium)
                     },
-                    modifier = Modifier.testTag(AboutTestTag.FooterLinksScreen.SCREEN),
+                    modifier = Modifier.testTag(AboutTestTag.FooterLinksSection.Section),
                 )
             }
         }

feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/component/AboutCredits.kt → feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutCredits.kt

@@ -1,16 +1,20 @@
-package io.github.droidkaigi.confsched.about.component
+package io.github.droidkaigi.confsched.about.section
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.Icons.Outlined
 import androidx.compose.material.icons.outlined.Apartment
 import androidx.compose.material.icons.outlined.Diversity1
 import androidx.compose.material.icons.outlined.SentimentVerySatisfied
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import io.github.droidkaigi.confsched.about.component.AboutContentColumn
 import io.github.droidkaigi.confsched.about.strings.AboutStrings
+import io.github.droidkaigi.confsched.about.strings.AboutStrings.Contributor
+import io.github.droidkaigi.confsched.about.strings.AboutStrings.Sponsor
+import io.github.droidkaigi.confsched.about.strings.AboutStrings.Staff
 
 const val AboutCreditsStaffItemTestTag = "AboutCreditsStaffItem"
 const val AboutCreditsContributorsItemTestTag = "AboutCreditsContributorsItem"
@@ -36,8 +40,8 @@ fun LazyListScope.aboutCredits(
     }
     item {
         AboutContentColumn(
-            leadingIcon = Icons.Outlined.Diversity1,
-            label = AboutStrings.Contributor.asString(),
+            leadingIcon = Outlined.Diversity1,
+            label = Contributor.asString(),
             testTag = AboutCreditsContributorsItemTestTag,
             onClickAction = onContributorsItemClick,
             modifier = modifier
@@ -48,8 +52,8 @@ fun LazyListScope.aboutCredits(
     }
     item {
         AboutContentColumn(
-            leadingIcon = Icons.Outlined.SentimentVerySatisfied,
-            label = AboutStrings.Staff.asString(),
+            leadingIcon = Outlined.SentimentVerySatisfied,
+            label = Staff.asString(),
             testTag = AboutCreditsStaffItemTestTag,
             onClickAction = onStaffItemClick,
             modifier = modifier
@@ -60,8 +64,8 @@ fun LazyListScope.aboutCredits(
     }
     item {
         AboutContentColumn(
-            leadingIcon = Icons.Outlined.Apartment,
-            label = AboutStrings.Sponsor.asString(),
+            leadingIcon = Outlined.Apartment,
+            label = Sponsor.asString(),
             testTag = AboutCreditsSponsorsItemTestTag,
             onClickAction = onSponsorsItemClick,
             modifier = modifier

feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/component/AboutDroidKaigiDetail.kt → feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutDroidKaigiDetail.kt

@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched.about.component
+package io.github.droidkaigi.confsched.about.section
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
@@ -16,6 +16,7 @@ import androidx.compose.ui.unit.dp
 import conference_app_2024.feature.about.generated.resources.Res
 import conference_app_2024.feature.about.generated.resources.about_header
 import io.github.droidkaigi.confsched.about.AboutTestTag
+import io.github.droidkaigi.confsched.about.component.AboutDroidKaigiDetailSummaryCard
 import io.github.droidkaigi.confsched.about.strings.AboutStrings
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import org.jetbrains.compose.resources.painterResource
@@ -26,7 +27,7 @@ fun AboutDroidKaigiDetail(
     modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier.testTag(AboutTestTag.DetailScreen.SCREEN),
+        modifier = modifier.testTag(AboutTestTag.DetailSection.Section),
     ) {
         Image(
             painter = painterResource(Res.drawable.about_header),

feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/component/AboutFooterLinks.kt → feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/section/AboutFooterLinks.kt

@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched.about.component
+package io.github.droidkaigi.confsched.about.section
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
@@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import io.github.droidkaigi.confsched.about.component.AboutFooterLinksIcon
 import io.github.droidkaigi.confsched.about.strings.AboutStrings
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import org.jetbrains.compose.ui.tooling.preview.Preview