Merge pull request #164 from DroidKaigi/takahirom/migrate-2023-to-202…

…4/2024-07-27 [Android/iOS]Migrate 2023 to 2024
DroidKaigi · Jul 27, 2024 · 2014154 · 2014154
2 parents 6d5c736 + 98991a1
commit 2014154
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 189 deletions.
diff --git a/CONTRIBUTING.ja.md b/CONTRIBUTING.ja.md
@@ -6,7 +6,7 @@
 
 ### タスクの見つけ方
 
-タスク管理にGitHub Issueを使っています。こちらでコントリビュートしたいIssueをお探しください。[`welcome contribute` または `easy`のラベルがついているIssue](https://github.com/DroidKaigi/conference-app-2023/issues?q=is%3Aopen+is%3Aissue+label%3A%22welcome+contribute%22%2Ceasy+no%3Aassignee)は、初めてのコントリビュートにおすすめです。
+タスク管理にGitHub Issueを使っています。こちらでコントリビュートしたいIssueをお探しください。[`welcome contribute` または `easy`のラベルがついているIssue](https://github.com/DroidKaigi/conference-app-2024/issues?q=is%3Aopen+is%3Aissue+label%3A%22welcome+contribute%22%2Ceasy+no%3Aassignee)は、初めてのコントリビュートにおすすめです。
 
 IssueがないPull Requestでも大丈夫です。その場合はPull Requestに理由、原因、解決策などの詳細をご記入ください。
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ We welcome your contribution!
 
 ### Finding tasks
 
-We use GitHub issues to manage the tasks. Please check here for issues you would like to contribute to. [`welcome contribute` or `easy` are good labels](https://github.com/DroidKaigi/conference-app-2023/issues?q=is%3Aopen+is%3Aissue+label%3A%22welcome+contribute%22%2Ceasy+no%3Aassignee) to check for the first contribution.
+We use GitHub issues to manage the tasks. Please check here for issues you would like to contribute to. [`welcome contribute` or `easy` are good labels](https://github.com/DroidKaigi/conference-app-2024/issues?q=is%3Aopen+is%3Aissue+label%3A%22welcome+contribute%22%2Ceasy+no%3Aassignee) to check for the first contribution.
 
 Of course, we also accept Pull Requests which don't have an issue. However, in this case please make sure you explain the motivation, cause, solution, etc in the PR description.
 

diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched/ResolveDynamicLinksActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched/ResolveDynamicLinksActivity.kt
@@ -41,7 +41,7 @@ class ResolveDynamicLinksActivity : ComponentActivity() {
     }
 
     private fun handleDeepLink(deepLink: Uri?) {
-        if (deepLink == null || deepLink.host != "2023.droidkaigi.jp") {
+        if (deepLink == null || deepLink.host != "2024.droidkaigi.jp") {
             // For a security reason.
             // Activities that can handle ACTION_VIEW must check the authority of Uri.
             finishAndRemoveTask()

diff --git a/app-android/src/main/res/values/strings.xml b/app-android/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">DroidKaigi 2023</string>
-</resources>
+    <string name="app_name">DroidKaigi 2024</string>
+</resources>
diff --git a/app-android/src/test/java/io/github/droidkaigi/confsched/FakeAppModule.kt b/app-android/src/test/java/io/github/droidkaigi/confsched/FakeAppModule.kt
@@ -18,7 +18,7 @@ class FakeAppModule {
     @Singleton
     fun provideClockProvider(): ClockProvider = object : ClockProvider {
         override fun clock(): Clock = object : Clock {
-            override fun now() = Instant.parse("2023-09-14T10:00:00.00Z")
+            override fun now() = Instant.parse("2024-09-12T11:00:00.00Z")
         }
     }
 }
diff --git a/app-ios/Sources/AboutFeature/Localizable.xcstrings b/app-ios/Sources/AboutFeature/Localizable.xcstrings
@@ -93,7 +93,7 @@
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "2023.09.14(木) 〜 16(土) 3日間"
+            "value" : "2024.09.11(水) 〜 13(金) 3日間"
           }
         }
       }
@@ -187,4 +187,4 @@
     }
   },
   "version" : "1.0"
-}
+}
diff --git a/app-ios/Sources/AboutFeature/SafariView.swift b/app-ios/Sources/AboutFeature/SafariView.swift
@@ -18,7 +18,7 @@ struct SafariView: UIViewControllerRepresentable {
 
 #Preview {
     SafariView(
-        url: URL(string: "https://2023.droidkaigi.jp/")!
+        url: URL(string: "https://2024.droidkaigi.jp/")!
     )
 }
 
diff --git a/app-ios/Sources/CommonComponents/SafariView.swift b/app-ios/Sources/CommonComponents/SafariView.swift
@@ -22,7 +22,7 @@ public struct SafariView: UIViewControllerRepresentable {
 
 #Preview {
     SafariView(
-        url: URL(string: "https://2023.droidkaigi.jp/")!
+        url: URL(string: "https://2024.droidkaigi.jp/")!
     )
 }
 
diff --git a/app-ios/Tests/TimetableDetailFeatureTests/TimetableDetailTests.swift b/app-ios/Tests/TimetableDetailFeatureTests/TimetableDetailTests.swift
@@ -42,7 +42,7 @@ final class TimetableDetail_iosTests: XCTestCase {
         let store = TestStore(initialState: TimetableDetailReducer.State(timetableItem: TimetableItem.Session.companion.fake(), isBookmarked: false)) {
             TimetableDetailReducer()
         }
-        let url = URL(string: "https://github.com/DroidKaigi/conference-app-2023")!
+        let url = URL(string: "https://github.com/DroidKaigi/conference-app-2024")!
         await store.send(.view(.urlTapped(url))) {
             $0.url = IdentifiableURL(url)
         }

diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/SideEvent.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/SideEvent.kt
diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/TimetableItem.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/TimetableItem.kt
@@ -94,9 +94,9 @@ public sealed class TimetableItem {
     }
 
     public val url: String get() = if (defaultLang() == Lang.JAPANESE) {
-        "https://2023.droidkaigi.jp/timetable/${id.value}"
+        "https://2024.droidkaigi.jp/timetable/${id.value}"
     } else {
-        "https://2023.droidkaigi.jp/en/timetable/${id.value}"
+        "https://2024.droidkaigi.jp/en/timetable/${id.value}"
     }
 
     fun getSupportedLangString(isJapaneseLocale: Boolean): String {
@@ -119,9 +119,9 @@ public fun Session.Companion.fake(): Session {
     return Session(
         id = TimetableItemId("2"),
         title = MultiLangText("DroidKaigiのアプリのアーキテクチャ", "DroidKaigi App Architecture"),
-        startsAt = LocalDateTime.parse("2023-09-15T10:30:00")
+        startsAt = LocalDateTime.parse("2024-09-12T10:30:00")
             .toInstant(TimeZone.of("UTC+9")),
-        endsAt = LocalDateTime.parse("2023-09-15T10:50:00")
+        endsAt = LocalDateTime.parse("2024-09-12T10:50:00")
             .toInstant(TimeZone.of("UTC+9")),
         category = TimetableCategory(
             id = 28654,
@@ -163,8 +163,8 @@ public fun Session.Companion.fake(): Session {
             ),
         ).toPersistentList(),
         description = MultiLangText(
-            jaTitle = "これはディスクリプションです。\nこれはディスクリプションです。\nhttps://github.com/DroidKaigi/conference-app-2023 これはURLです。\nこれはディスクリプションです。",
-            enTitle = "This is a description.\nThis is a description.\nhttps://github.com/DroidKaigi/conference-app-2023 This is a URL.\nThis is a description.",
+            jaTitle = "これはディスクリプションです。\nこれはディスクリプションです。\nhttps://github.com/DroidKaigi/conference-app-2024 これはURLです。\nこれはディスクリプションです。",
+            enTitle = "This is a description.\nThis is a description.\nhttps://github.com/DroidKaigi/conference-app-2024 This is a URL.\nThis is a description.",
         ),
         message = MultiLangText(
             jaTitle = "このセッションは事情により中止となりました",