Merge pull request #1044 from Corvus400/feature/refactor_url_switch

🔧 Fixed URL switching between EN and JP.
DroidKaigi · Sep 2, 2023 · 21cabc2 · 21cabc2
2 parents fc5cdbb + cb18999
commit 21cabc2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
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
@@ -150,27 +150,18 @@ private fun NavGraphBuilder.mainScreen(
             )
             nestedAboutScreen(
                 onAboutItemClick = { aboutItem ->
+                    val portalBaseUrl = if (defaultLang() == JAPANESE) {
+                        "https://portal.droidkaigi.jp"
+                    } else {
+                        "https://portal.droidkaigi.jp/en"
+                    }
                     when (aboutItem) {
                         Sponsors -> navController.navigateSponsorsScreen()
-                        CodeOfConduct -> {
-                            val url = if (defaultLang() == JAPANESE) {
-                                "https://portal.droidkaigi.jp/about/code-of-conduct"
-                            } else {
-                                "https://portal.droidkaigi.jp/en/about/code-of-conduct"
-                            }
-                            externalNavController.navigate(url = url)
-                        }
+                        CodeOfConduct -> { externalNavController.navigate(url = "$portalBaseUrl/about/code-of-conduct") }
                         Contributors -> mainNestedNavController.navigate(contributorsScreenRoute)
                         License -> externalNavController.navigateToLicenseScreen()
                         Medium -> externalNavController.navigate(url = "https://medium.com/droidkaigi")
-                        PrivacyPolicy -> {
-                            val url = if (defaultLang() == JAPANESE) {
-                                "https://portal.droidkaigi.jp/about/privacy"
-                            } else {
-                                "https://portal.droidkaigi.jp/en/about/privacy"
-                            }
-                            externalNavController.navigate(url = url)
-                        }
+                        PrivacyPolicy -> { externalNavController.navigate(url = "$portalBaseUrl/about/privacy") }
                         Staff -> navController.navigateStaffScreen()
                         X -> externalNavController.navigate(url = "https://twitter.com/DroidKaigi")
                         YouTube -> externalNavController.navigate(url = "https://www.youtube.com/c/DroidKaigi")
@@ -304,7 +295,7 @@ private class ExternalNavController(
         shareNavigator.share(
             "[${timeTableItem.room.name.currentLangTitle}] ${timeTableItem.startsTimeString} - ${timeTableItem.endsTimeString}\n" +
                 "${timeTableItem.title.currentLangTitle}\n" +
-                "https://2023.droidkaigi.jp/timetable/${timeTableItem.id.value}",
+                timeTableItem.url,
         )
     }
 

diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/TimetableItem.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/model/TimetableItem.kt
@@ -92,7 +92,11 @@ public sealed class TimetableItem {
         "$startsDateString / $formattedTimeString ($minutesString)"
     }
 
-    public val url: String get() = "https://2023.droidkaigi.jp/timetable/${id.value}"
+    public val url: String get() = if (defaultLang() == Lang.JAPANESE) {
+        "https://2023.droidkaigi.jp/timetable/${id.value}"
+    } else {
+        "https://2023.droidkaigi.jp/en/timetable/${id.value}"
+    }
 
     fun getSupportedLangString(isJapaneseLocale: Boolean): String {
         val japanese = if (isJapaneseLocale) "日本語" else "Japanese"