From ab6a682ae0dde22b4dea1a3631f9ee40bcdd447f Mon Sep 17 00:00:00 2001 From: sohichiro nagao Date: Mon, 11 Sep 2023 22:39:03 +0900 Subject: [PATCH 1/4] fix time order and duplicate contents --- .../Modules/Sources/Timetable/TimetableViewModel.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app-ios/Modules/Sources/Timetable/TimetableViewModel.swift b/app-ios/Modules/Sources/Timetable/TimetableViewModel.swift index 28b0fb9df..4f206ae45 100644 --- a/app-ios/Modules/Sources/Timetable/TimetableViewModel.swift +++ b/app-ios/Modules/Sources/Timetable/TimetableViewModel.swift @@ -68,14 +68,16 @@ final class TimetableViewModel: ObservableObject { $0.timetableItem.room.name.currentLangTitle < $1.timetableItem.room.name.currentLangTitle } return TimetableTimeGroupItems( - startsTimeString: item.startsTimeString, - endsTimeString: item.endsTimeString, + startsTimeString: items.first?.timetableItem.startsTimeString ?? "", + endsTimeString: items.first?.timetableItem.endsTimeString ?? "", items: items ) } + var seen: [TimetableTimeGroupItems: Bool] = [:] + let distinctedTimetableTimeGroupItems = timetableTimeGroupItems.filter { seen.updateValue(true, forKey: $0) == nil } state.loadedState = .loaded( .init( - timeGroupTimetableItems: timetableTimeGroupItems, + timeGroupTimetableItems: distinctedTimetableTimeGroupItems, bookmarks: cachedTimetable.bookmarks ) ) From a11ba43d80fcd951ccb9984502a5aca1d35bbfce Mon Sep 17 00:00:00 2001 From: woxtu Date: Mon, 11 Sep 2023 23:07:45 +0900 Subject: [PATCH 2/4] Localize Sponsors --- .../Strings/en.lproj/Localizable.strings | 5 +++++ .../Strings/ja.lproj/Localizable.strings | 5 +++++ .../Modules/Sources/Sponsor/SponsorView.swift | 18 ++++++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app-ios/Modules/Sources/Assets/Resources/Strings/en.lproj/Localizable.strings b/app-ios/Modules/Sources/Assets/Resources/Strings/en.lproj/Localizable.strings index 9341cbbad..9e53d9ab3 100644 --- a/app-ios/Modules/Sources/Assets/Resources/Strings/en.lproj/Localizable.strings +++ b/app-ios/Modules/Sources/Assets/Resources/Strings/en.lproj/Localizable.strings @@ -32,3 +32,8 @@ "session.target_audience" = "Target Audience"; "session.add_to_calendar" = "Add to your calendar"; "session.cancel" = "Cancel"; + +"sponsor.title" = "Sponsors"; +"sponsor.platinum_sponsors" = "PLATINUM SPONSORS"; +"sponsor.gold_sponsors" = "GOLD SPONSORS"; +"sponsor.supporters" = "SUPPORTERS"; diff --git a/app-ios/Modules/Sources/Assets/Resources/Strings/ja.lproj/Localizable.strings b/app-ios/Modules/Sources/Assets/Resources/Strings/ja.lproj/Localizable.strings index 8617af707..7de1ad346 100644 --- a/app-ios/Modules/Sources/Assets/Resources/Strings/ja.lproj/Localizable.strings +++ b/app-ios/Modules/Sources/Assets/Resources/Strings/ja.lproj/Localizable.strings @@ -32,3 +32,8 @@ "session.target_audience" = "対象者"; "session.add_to_calendar" = "カレンダーに追加する"; "session.cancel" = "キャンセル"; + +"sponsor.title" = "Sponsors"; +"sponsor.platinum_sponsors" = "プラチナスポンサー"; +"sponsor.gold_sponsors" = "ゴールドスポンサー"; +"sponsor.supporters" = "サポーター"; diff --git a/app-ios/Modules/Sources/Sponsor/SponsorView.swift b/app-ios/Modules/Sources/Sponsor/SponsorView.swift index 9b24f468b..39bf85239 100644 --- a/app-ios/Modules/Sources/Sponsor/SponsorView.swift +++ b/app-ios/Modules/Sources/Sponsor/SponsorView.swift @@ -1,3 +1,4 @@ +import Assets import shared import SwiftUI import Theme @@ -22,7 +23,7 @@ public struct SponsorView: View { $0.ordinal < $1.ordinal }), id: \.self) { plan in SponsorGridView( - title: plan.name, + title: plan.title, sponsors: planGroupedSponsors[plan] ?? [], columns: plan.column ) { _ in } @@ -34,7 +35,7 @@ public struct SponsorView: View { EmptyView() } } - .navigationTitle("Sponsors") + .navigationTitle(L10n.Sponsor.title) .background(AssetColors.Surface.surface.swiftUIColor) } } @@ -56,4 +57,17 @@ private extension Plan { return 3 } } + + var title: String { + switch self { + case .platinum: + return L10n.Sponsor.platinumSponsors + case .gold: + return L10n.Sponsor.goldSponsors + case .supporter: + return L10n.Sponsor.supporters + default: + return "" + } + } } From c34e961e1eed528d5c7574f473f9928f28ff8924 Mon Sep 17 00:00:00 2001 From: woxtu Date: Mon, 11 Sep 2023 23:21:31 +0900 Subject: [PATCH 3/4] Fix the tab title for Floor Map --- app-ios/Modules/Sources/Navigation/RootView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-ios/Modules/Sources/Navigation/RootView.swift b/app-ios/Modules/Sources/Navigation/RootView.swift index 5d399a101..d0cacf99d 100644 --- a/app-ios/Modules/Sources/Navigation/RootView.swift +++ b/app-ios/Modules/Sources/Navigation/RootView.swift @@ -57,7 +57,7 @@ public struct RootView: View { .tag(Tab.floorMap) .tabItem { Label { - Text("FloorMap") + Text("Floor Map") } icon: { if selection == .floorMap { Assets.Icons.floorMap.swiftUIImage From fa6131e9e1ebaaa136af140b02c7608e450e3f72 Mon Sep 17 00:00:00 2001 From: Takahiro Menju Date: Tue, 12 Sep 2023 09:41:26 +0900 Subject: [PATCH 4/4] Revert ":sparkles: Animation was applied to the splash screen." --- app-android/build.gradle.kts | 1 - app-android/src/main/AndroidManifest.xml | 3 +- .../droidkaigi/confsched2023/MainActivity.kt | 2 - .../splash_branding_image.xml | 48 -------- .../res/drawable-night-v31/splash_icon.xml | 114 ------------------ .../main/res/drawable-night/splash_icon.xml | 12 -- .../drawable-v31/splash_branding_image.xml | 48 -------- .../src/main/res/drawable-v31/splash_icon.xml | 114 ------------------ .../src/main/res/drawable/splash_icon.xml | 12 -- .../main/res/values-night/splash_theme.xml | 11 -- .../src/main/res/values/splash_theme.xml | 11 -- gradle/libs.versions.toml | 2 - 12 files changed, 1 insertion(+), 377 deletions(-) delete mode 100644 app-android/src/main/res/drawable-night-v31/splash_branding_image.xml delete mode 100644 app-android/src/main/res/drawable-night-v31/splash_icon.xml delete mode 100644 app-android/src/main/res/drawable-night/splash_icon.xml delete mode 100644 app-android/src/main/res/drawable-v31/splash_branding_image.xml delete mode 100644 app-android/src/main/res/drawable-v31/splash_icon.xml delete mode 100644 app-android/src/main/res/drawable/splash_icon.xml delete mode 100644 app-android/src/main/res/values-night/splash_theme.xml delete mode 100644 app-android/src/main/res/values/splash_theme.xml diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts index ce0402042..49da488e3 100644 --- a/app-android/build.gradle.kts +++ b/app-android/build.gradle.kts @@ -113,7 +113,6 @@ dependencies { implementation(libs.androidxBrowser) implementation(libs.androidxWindow) implementation(libs.kermit) - implementation(libs.androidxSplashScreen) implementation(libs.firebaseDynamicLinks) testImplementation(projects.core.testing) } diff --git a/app-android/src/main/AndroidManifest.xml b/app-android/src/main/AndroidManifest.xml index 5ea4d7c40..f32f01225 100644 --- a/app-android/src/main/AndroidManifest.xml +++ b/app-android/src/main/AndroidManifest.xml @@ -23,8 +23,7 @@ + android:exported="true"> diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt index 83aff3ba3..6432485a2 100644 --- a/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt +++ b/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt @@ -15,7 +15,6 @@ import androidx.compose.runtime.produceState import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.window.layout.DisplayFeature import androidx.window.layout.WindowInfoTracker import dagger.hilt.android.AndroidEntryPoint @@ -27,7 +26,6 @@ import kotlinx.collections.immutable.toPersistentList class MainActivity : ComponentActivity() { @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) override fun onCreate(savedInstanceState: Bundle?) { - installSplashScreen() super.onCreate(savedInstanceState) // Navigation icon color can be changed since API 26(O) diff --git a/app-android/src/main/res/drawable-night-v31/splash_branding_image.xml b/app-android/src/main/res/drawable-night-v31/splash_branding_image.xml deleted file mode 100644 index 73e6cffb9..000000000 --- a/app-android/src/main/res/drawable-night-v31/splash_branding_image.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable-night-v31/splash_icon.xml b/app-android/src/main/res/drawable-night-v31/splash_icon.xml deleted file mode 100644 index f6f5ea673..000000000 --- a/app-android/src/main/res/drawable-night-v31/splash_icon.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable-night/splash_icon.xml b/app-android/src/main/res/drawable-night/splash_icon.xml deleted file mode 100644 index d08fd4383..000000000 --- a/app-android/src/main/res/drawable-night/splash_icon.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app-android/src/main/res/drawable-v31/splash_branding_image.xml b/app-android/src/main/res/drawable-v31/splash_branding_image.xml deleted file mode 100644 index 331bdf90a..000000000 --- a/app-android/src/main/res/drawable-v31/splash_branding_image.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable-v31/splash_icon.xml b/app-android/src/main/res/drawable-v31/splash_icon.xml deleted file mode 100644 index f6f5ea673..000000000 --- a/app-android/src/main/res/drawable-v31/splash_icon.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable/splash_icon.xml b/app-android/src/main/res/drawable/splash_icon.xml deleted file mode 100644 index d08fd4383..000000000 --- a/app-android/src/main/res/drawable/splash_icon.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app-android/src/main/res/values-night/splash_theme.xml b/app-android/src/main/res/values-night/splash_theme.xml deleted file mode 100644 index 503d3f9e3..000000000 --- a/app-android/src/main/res/values-night/splash_theme.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app-android/src/main/res/values/splash_theme.xml b/app-android/src/main/res/values/splash_theme.xml deleted file mode 100644 index 280cf5162..000000000 --- a/app-android/src/main/res/values/splash_theme.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index acfebcc5e..95b5d9aab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,6 @@ composeHiltNavigatiaon = "1.0.0" androidxLifecycle = "2.6.2" androidxActivity = "1.8.0-beta01" androidxFragment = "1.6.1" -androidxSplashScreen = "1.0.1" kotlinxCoroutines = "1.7.3" accompanist = "0.30.1" junit = "4.13.2" @@ -106,7 +105,6 @@ androidxActivityActivityCompose = { module = "androidx.activity:activity-compose androidxDatastoreDatastorePreferences = { module = "androidx.datastore:datastore-preferences-core", version = "1.1.0-alpha04" } androidxBrowser = { module = "androidx.browser:browser", version = "1.6.0" } androidxWindow = { module = "androidx.window:window", version = "1.1.0" } -androidxSplashScreen = { module = "androidx.core:core-splashscreen", version.ref = "androidxSplashScreen" } javaPoet = { module = "com.squareup:javapoet", version = "1.13.0" } # Data