Merge branch 'main' into bottom-navigation-behavior

DroidKaigi · Sep 15, 2023 · d116fc3 · d116fc3
2 parents f3de5cd + a487693
commit d116fc3
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 16 deletions.
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         buildConfig = true
     }
     defaultConfig {
-        versionCode = 10
-        versionName = "1.5.0"
+        versionCode = 11
+        versionName = "1.6.0"
     }
     signingConfigs {
         create("dev") {

diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/Contents.json b/app-ios/App/DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "logo.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...App/DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/logo.png b/...App/DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/logo.png
diff --git a/.../DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/[email protected] b/.../DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/[email protected]
diff --git a/.../DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/[email protected] b/.../DroidKaigi2023/DroidKaigi2023/Assets.xcassets/LaunchImage.imageset/[email protected]
diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/Info.plist b/app-ios/App/DroidKaigi2023/DroidKaigi2023/Info.plist
@@ -24,5 +24,10 @@
 			</array>
 		</dict>
 	</array>
+	<key>UILaunchScreen</key>
+	<dict>
+		<key>UIImageName</key>
+		<string>LaunchImage</string>
+	</dict>
 </dict>
 </plist>
diff --git a/app-ios/Modules/Sources/About/AboutView.swift b/app-ios/Modules/Sources/About/AboutView.swift
@@ -65,7 +65,7 @@ public struct AboutView<ContributorView: View, StaffView: View, SponsorView: Vie
                     .padding(.vertical, 20)
                     .padding(.horizontal, 16)
                     .background(AssetColors.Surface.surfaceContainerLow.swiftUIColor)
-                    .clipShape(RoundedRectangle(cornerRadius: 12))
+                    .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
                     Spacer().frame(height: 32)
                     SectionTitle(title: L10n.About.creditsTitle)
                     NavigationLink(value: AboutRouting.staffs) {

diff --git a/app-ios/Modules/Sources/Component/PersonLabel.swift b/app-ios/Modules/Sources/Component/PersonLabel.swift
@@ -22,9 +22,9 @@ public struct PersonLabel: View {
                 }
                 .frame(width: 60, height: 60)
                 .scaledToFill()
-                .clipShape(RoundedRectangle(cornerRadius: 12))
+                .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
                 .overlay(
-                    RoundedRectangle(cornerRadius: 12)
+                    RoundedRectangle(cornerRadius: RadiusTokens.s)
                         .stroke(AssetColors.Outline.outline.swiftUIColor, lineWidth: 1)
                 )
             }

diff --git a/app-ios/Modules/Sources/Session/SessionView.swift b/app-ios/Modules/Sources/Session/SessionView.swift
@@ -54,7 +54,7 @@ public struct SessionView: View {
                 .background(
                     AssetColors.Surface.surfaceContainerLow.swiftUIColor
                 )
-                .clipShape(RoundedRectangle(cornerRadius: 12))
+                .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
                 .padding(.vertical, 20)
                 .padding(.horizontal, 16)
 
@@ -82,7 +82,6 @@ public struct SessionView: View {
                         Text(L10n.Session.speakers)
                             .textStyle(TypographyTokens.titleLarge)
                             .foregroundStyle(AssetColors.Surface.onSurfaceVariant.swiftUIColor)
-
                         VStack(alignment: .leading, spacing: SpacingTokens.xs) {
                             ForEach(viewModel.timetableItem.speakers, id: \.id) { speaker in
                                 HStack(spacing: SpacingTokens.xl) {
@@ -93,9 +92,9 @@ public struct SessionView: View {
                                     }
                                     .frame(width: 40, height: 40)
                                     .scaledToFill()
-                                    .clipShape(RoundedRectangle(cornerRadius: 12))
+                                    .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
                                     .overlay(
-                                        RoundedRectangle(cornerRadius: 12)
+                                        RoundedRectangle(cornerRadius: RadiusTokens.s)
                                             .stroke(AssetColors.Outline.outline.swiftUIColor, lineWidth: 1)
                                     )
                                     VStack(alignment: .leading, spacing: 0) {

diff --git a/app-ios/Modules/Sources/Sponsor/SponsorGridView.swift b/app-ios/Modules/Sources/Sponsor/SponsorGridView.swift
@@ -50,7 +50,7 @@ struct SponsorItemView: View {
             }
         }
         .frame(height: sponsor.plan.itemHeight)
-        .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
+        .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xs, style: .continuous))
     }
 }
 

diff --git a/app-ios/Modules/Sources/Timetable/Bookmark/BookmarkView.swift b/app-ios/Modules/Sources/Timetable/Bookmark/BookmarkView.swift
@@ -81,7 +81,7 @@ private struct BookmarkEmptyView: View {
                 .frame(width: 36, height: 36)
                 .padding(24)
                 .background(AssetColors.Secondary.secondaryContainer.swiftUIColor)
-                .clipShape(RoundedRectangle(cornerRadius: 24))
+                .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xl))
             Spacer().frame(height: 24)
             Text(L10n.Bookmark.bookmarksNotFound)
                 .textStyle(TypographyTokens.titleLarge)

diff --git a/app-ios/Modules/Sources/Timetable/FilterLabel.swift b/app-ios/Modules/Sources/Timetable/FilterLabel.swift
@@ -41,10 +41,10 @@ struct FilterLabel: View {
                 ? AssetColors.Secondary.onSecondaryContainer.swiftUIColor
                 : AssetColors.Surface.onSurface.swiftUIColor
             )
-            .clipShape(RoundedRectangle(cornerRadius: 4))
+            .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xxs))
             .overlay {
                 if !isSelected {
-                    RoundedRectangle(cornerRadius: 4)
+                    RoundedRectangle(cornerRadius: RadiusTokens.xxs)
                         .inset(by: 0.5)
                         .stroke(
                             AssetColors.Outline.outline.swiftUIColor,

diff --git a/app-ios/Modules/Sources/Timetable/PersonLabel.swift b/app-ios/Modules/Sources/Timetable/PersonLabel.swift
@@ -15,9 +15,9 @@ struct PersonLabel: View {
             }
             .frame(width: 40, height: 40)
             .scaledToFill()
-            .clipShape(RoundedRectangle(cornerRadius: 12))
+            .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.s))
             .overlay(
-                RoundedRectangle(cornerRadius: 12)
+                RoundedRectangle(cornerRadius: RadiusTokens.s)
                     .stroke(AssetColors.Outline.outline.swiftUIColor, lineWidth: 1)
             )
 

diff --git a/app-ios/Modules/Sources/Timetable/Search/SearchView.swift b/app-ios/Modules/Sources/Timetable/Search/SearchView.swift
@@ -203,7 +203,7 @@ private struct SearchEmptyView: View {
                 .frame(width: 36, height: 36)
                 .padding(24)
                 .background(AssetColors.Secondary.secondaryContainer.swiftUIColor)
-                .clipShape(RoundedRectangle(cornerRadius: 24))
+                .clipShape(RoundedRectangle(cornerRadius: RadiusTokens.xl))
             Text(L10n.Search.searchResultNotFound(inputText))
                 .textStyle(TypographyTokens.titleMedium)
                 .multilineTextAlignment(.center)