From 57e4900569e5d9b1f111e97ff364ec6ba264605a Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:36:20 +0900 Subject: [PATCH 01/12] :memo: Suffix the files containing iOS and Android actual methods. --- ...AboutHeaderPainter.kt => ProvideAboutHeaderPainter.android.kt} | 0 ...videAboutHeaderPainter.kt => ProvideAboutHeaderPainter.ios.kt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/{ProvideAboutHeaderPainter.kt => ProvideAboutHeaderPainter.android.kt} (100%) rename core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/{ProvideAboutHeaderPainter.kt => ProvideAboutHeaderPainter.ios.kt} (100%) diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt b/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt rename to core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.android.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt b/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.kt rename to core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/ProvideAboutHeaderPainter.ios.kt From 14b8ad06a127a2ae04b0b2e079e9bdf9feebc6f1 Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:37:56 +0900 Subject: [PATCH 02/12] :memo: Suffix the files containing iOS and Android actual methods. --- .../confsched/ui/{RandomUUID.kt => RandomUUID.android.kt} | 0 .../droidkaigi/confsched/ui/{RandomUUID.kt => RandomUUID.ios.kt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/{RandomUUID.kt => RandomUUID.android.kt} (100%) rename core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/{RandomUUID.kt => RandomUUID.ios.kt} (100%) diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt b/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt rename to core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.android.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt b/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.kt rename to core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/RandomUUID.ios.kt From 56a0181ad31c32d3f292a27e014a25f4900065cd Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:39:52 +0900 Subject: [PATCH 03/12] :memo: Suffix the files containing iOS and Android actual methods. --- .../ui/{TestEnviroment.kt => TestEnvironment.android.kt} | 0 .../confsched/ui/{TestEnviroment.kt => TestEnvironment.kt} | 0 .../confsched/ui/{TestEnviroment.kt => TestEnvironment.ios.kt} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnviroment.kt => TestEnvironment.android.kt} (100%) rename core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnviroment.kt => TestEnvironment.kt} (100%) rename core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnviroment.kt => TestEnvironment.ios.kt} (100%) diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt b/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt rename to core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt rename to core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt b/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt rename to core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt From d06fe5dbd3c89b01a28c2fc13e57f91b63f64e21 Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:42:29 +0900 Subject: [PATCH 04/12] :memo: Suffix the files containing iOS and Android actual methods. --- .../confsched/model/{AppError.kt => AppError.android.kt} | 0 .../droidkaigi/confsched/model/{AppError.kt => AppError.ios.kt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/{AppError.kt => AppError.android.kt} (100%) rename core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/{AppError.kt => AppError.ios.kt} (100%) diff --git a/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/AppError.kt b/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/AppError.android.kt similarity index 100% rename from core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/AppError.kt rename to core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/AppError.android.kt diff --git a/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/AppError.kt b/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/AppError.ios.kt similarity index 100% rename from core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/AppError.kt rename to core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/AppError.ios.kt From 85d7a423c81df5b9d75cffb88c97912e06de4649 Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:43:25 +0900 Subject: [PATCH 05/12] :memo: Suffix the files containing iOS and Android actual methods. --- .../confsched/model/{BlurSupport.kt => BlurSupport.android.kt} | 0 .../confsched/model/{BlurSupport.kt => BlurSupport.ios.kt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/{BlurSupport.kt => BlurSupport.android.kt} (100%) rename core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/{BlurSupport.kt => BlurSupport.ios.kt} (100%) diff --git a/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.kt b/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.android.kt similarity index 100% rename from core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.kt rename to core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.android.kt diff --git a/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.kt b/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.ios.kt similarity index 100% rename from core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.kt rename to core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/BlurSupport.ios.kt From b68f078b2ab955e1d72f8bfb316c846e7279c63c Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:44:11 +0900 Subject: [PATCH 06/12] :memo: Suffix the files containing iOS and Android actual methods. --- .../model/{WhiteImageBase64.kt => WhiteImageBase64.android.kt} | 0 .../model/{WhiteImageBase64.kt => WhiteImageBase64.ios.kt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/{WhiteImageBase64.kt => WhiteImageBase64.android.kt} (100%) rename core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/{WhiteImageBase64.kt => WhiteImageBase64.ios.kt} (100%) diff --git a/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.kt b/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.android.kt similarity index 100% rename from core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.kt rename to core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.android.kt diff --git a/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.kt b/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.ios.kt similarity index 100% rename from core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.kt rename to core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/WhiteImageBase64.ios.kt From 876971bde2f2b984e7363d00c8591516f385b4da Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:45:10 +0900 Subject: [PATCH 07/12] :memo: Suffix the files containing iOS and Android actual methods. --- .../confsched/model/{Immutable.kt => Immutable.android.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/{Immutable.kt => Immutable.android.kt} (100%) diff --git a/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Immutable.kt b/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Immutable.android.kt similarity index 100% rename from core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Immutable.kt rename to core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Immutable.android.kt From 5023d26a1497203b490ac5d843ae279ba8e1ba8c Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:46:00 +0900 Subject: [PATCH 08/12] :memo: Suffix the files containing iOS and Android actual methods. --- .../droidkaigi/confsched/model/{Locale.kt => Locale.android.kt} | 0 .../droidkaigi/confsched/model/{Locale.kt => Locale.ios.kt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/{Locale.kt => Locale.android.kt} (100%) rename core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/{Locale.kt => Locale.ios.kt} (100%) diff --git a/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Locale.kt b/core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Locale.android.kt similarity index 100% rename from core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Locale.kt rename to core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/Locale.android.kt diff --git a/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/Locale.kt b/core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/Locale.ios.kt similarity index 100% rename from core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/Locale.kt rename to core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/Locale.ios.kt From 4f1d8934db37633e7363f4ca91eb21919091650b Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:41:48 +0900 Subject: [PATCH 09/12] Revert ":memo: Suffix the files containing iOS and Android actual methods." This reverts commit 56a0181ad31c32d3f292a27e014a25f4900065cd. --- .../ui/{TestEnvironment.android.kt => TestEnviroment.kt} | 0 .../confsched/ui/{TestEnvironment.kt => TestEnviroment.kt} | 0 .../confsched/ui/{TestEnvironment.ios.kt => TestEnviroment.kt} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnvironment.android.kt => TestEnviroment.kt} (100%) rename core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnvironment.kt => TestEnviroment.kt} (100%) rename core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnvironment.ios.kt => TestEnviroment.kt} (100%) diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt b/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt rename to core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt rename to core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt b/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt rename to core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt From 06aca146688b27122f051c7521b9b369c9856ecf Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:09:08 +0900 Subject: [PATCH 10/12] :wrench: Fix file name for iosMain. --- .../Sources/TimetableDetailFeature/TimetableDetailView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift b/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift index c3704045b..8d58474f7 100644 --- a/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift +++ b/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift @@ -154,7 +154,7 @@ public struct TimetableDetailView: View { icon: Image(.icLanguage), title: String(localized: "TimeTableDetailLanguage", bundle: .module), titleColor: store.timetableItem.room.roomTheme.primaryColor, - content: store.timetableItem.getSupportedLangString(isJapaneseLocale: LocaleKt.getDefaultLocale() == .japan) + content: store.timetableItem.getSupportedLangString(isJapaneseLocale: LocaleIosKt.getDefaultLocale() == .japan) ) InformationRow( icon: Image(.icCategory), From aec1dbb6cf86b6de6ac94ff2973087334def4603 Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:55:36 +0900 Subject: [PATCH 11/12] :wrench: Fix file name for iosMain. --- .../Sources/TimetableDetailFeature/TimetableDetailView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift b/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift index 8d58474f7..c4ffa3d9a 100644 --- a/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift +++ b/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift @@ -154,7 +154,7 @@ public struct TimetableDetailView: View { icon: Image(.icLanguage), title: String(localized: "TimeTableDetailLanguage", bundle: .module), titleColor: store.timetableItem.room.roomTheme.primaryColor, - content: store.timetableItem.getSupportedLangString(isJapaneseLocale: LocaleIosKt.getDefaultLocale() == .japan) + content: store.timetableItem.getSupportedLangString(isJapaneseLocale: Locale_iosKt.getDefaultLocale() == .japan) ) InformationRow( icon: Image(.icCategory), From 61f9e46905d1705cda5a4335f4caa6cf9cc323fe Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 20 Aug 2024 17:05:32 +0900 Subject: [PATCH 12/12] Revert "Revert ":memo: Suffix the files containing iOS and Android actual methods."" This reverts commit 4f1d8934db37633e7363f4ca91eb21919091650b. --- .../ui/{TestEnviroment.kt => TestEnvironment.android.kt} | 0 .../confsched/ui/{TestEnviroment.kt => TestEnvironment.kt} | 0 .../confsched/ui/{TestEnviroment.kt => TestEnvironment.ios.kt} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnviroment.kt => TestEnvironment.android.kt} (100%) rename core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnviroment.kt => TestEnvironment.kt} (100%) rename core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/{TestEnviroment.kt => TestEnvironment.ios.kt} (100%) diff --git a/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt b/core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt similarity index 100% rename from core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt rename to core/ui/src/androidMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.android.kt diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt similarity index 100% rename from core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt rename to core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.kt diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt b/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt similarity index 100% rename from core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnviroment.kt rename to core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/TestEnvironment.ios.kt