Merge branch 'main' into faeture/apply_custom_font_for_ios

DroidKaigi · Sep 3, 2023 · ce479c1 · ce479c1
2 parents a74e33b + 8aba1b7
commit ce479c1
Show file tree

Hide file tree

Showing 38 changed files with 486 additions and 283 deletions.
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("droidkaigi.primitive.android.compose")
     id("droidkaigi.primitive.android.hilt")
     id("droidkaigi.primitive.android.firebase")
+    id("droidkaigi.primitive.android.crashlytics")
     id("droidkaigi.primitive.detekt")
     id("droidkaigi.primitive.android.roborazzi")
     id("droidkaigi.primitive.kover")

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
@@ -43,7 +43,6 @@ import io.github.droidkaigi.confsched2023.main.MainNestedGraphStateHolder
 import io.github.droidkaigi.confsched2023.main.MainScreenTab
 import io.github.droidkaigi.confsched2023.main.MainScreenTab.About
 import io.github.droidkaigi.confsched2023.main.MainScreenTab.Badges
-import io.github.droidkaigi.confsched2023.main.MainScreenTab.Contributor
 import io.github.droidkaigi.confsched2023.main.MainScreenTab.FloorMap
 import io.github.droidkaigi.confsched2023.main.MainScreenTab.Timetable
 import io.github.droidkaigi.confsched2023.main.mainScreen
@@ -150,27 +149,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")
@@ -215,7 +205,6 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
     override fun routeToTab(route: String): MainScreenTab? {
         return when (route) {
             timetableScreenRoute -> Timetable
-            contributorsScreenRoute -> Contributor
             aboutScreenRoute -> About
             floorMapScreenRoute -> FloorMap
             stampsScreenRoute -> Badges
@@ -231,11 +220,6 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
             Timetable -> mainNestedNavController.navigateTimetableScreen()
             About -> mainNestedNavController.navigateAboutScreen()
             FloorMap -> mainNestedNavController.navigateFloorMapScreen()
-            Contributor -> mainNestedNavController.navigate(contributorsScreenRoute) {
-                launchSingleTop = true
-                restoreState = true
-            }
-
             Badges -> mainNestedNavController.navigateStampsScreen()
         }
     }
@@ -304,7 +288,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/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt
@@ -1,7 +1,10 @@
 package io.github.droidkaigi.confsched2023
 
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
@@ -10,6 +13,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.window.layout.DisplayFeature
 import androidx.window.layout.WindowInfoTracker
 import dagger.hilt.android.AndroidEntryPoint
@@ -23,7 +28,27 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        enableEdgeToEdge()
+        // Navigation icon color can be changed since API 26(O)
+        if (VERSION.SDK_INT < VERSION_CODES.O) {
+            enableEdgeToEdge()
+        } else {
+            enableEdgeToEdge(
+                statusBarStyle = SystemBarStyle.auto(
+                    lightScrim = Color.Transparent.toArgb(),
+                    darkScrim = Color.Transparent.toArgb(),
+                ),
+                navigationBarStyle = SystemBarStyle.auto(
+                    lightScrim = Color.Transparent.toArgb(),
+                    darkScrim = Color.Transparent.toArgb(),
+                ),
+            )
+
+            // For API29(Q) or higher and 3-button navigation,
+            // the following code must be written to make the navigation color completely transparent.
+            if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+                window.isNavigationBarContrastEnforced = false
+            }
+        }
 
         setContent {
             val windowSize = calculateWindowSizeClass(this)

diff --git a/app-android/src/test/java/io/github/droidkaigi/confsched2023/KaigiAppTest.kt b/app-android/src/test/java/io/github/droidkaigi/confsched2023/KaigiAppTest.kt
@@ -100,14 +100,6 @@ class KaigiAppTest {
         }
     }
 
-    @Test
-    fun checkNavigateToContributorShot() {
-        kaigiAppRobot {
-            goToContributor()
-            capture()
-        }
-    }
-
     @Test
     fun checkNavigateToTimetableItemDetailShot() {
         kaigiAppRobot {

diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		9EB9E9E92AA2BF3800A9CBA1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		D77DAF6D29FAA148007195DB /* DroidKaigi2023.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DroidKaigi2023.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D77DAF7029FAA148007195DB /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
 		D77DAF7429FAA149007195DB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -109,6 +110,7 @@
 		D77DAF6F29FAA148007195DB /* DroidKaigi2023 */ = {
 			isa = PBXGroup;
 			children = (
+				9EB9E9E92AA2BF3800A9CBA1 /* Info.plist */,
 				D77DAF7029FAA148007195DB /* App.swift */,
 				D77DAF7429FAA149007195DB /* Assets.xcassets */,
 				D77DAF7629FAA149007195DB /* DroidKaigi2023.entitlements */,
@@ -235,10 +237,11 @@
 			};
 			buildConfigurationList = D77DAF6829FAA148007195DB /* Build configuration list for PBXProject "DroidKaigi2023" */;
 			compatibilityVersion = "Xcode 14.0";
-			developmentRegion = en;
+			developmentRegion = ja;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				ja,
 				Base,
 			);
 			mainGroup = D77DAF6429FAA148007195DB;
@@ -449,6 +452,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = DroidKaigi2023/Info.plist;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
@@ -489,6 +493,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = DroidKaigi2023/Info.plist;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;

diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/ContentView.swift b/app-ios/App/DroidKaigi2023/DroidKaigi2023/ContentView.swift
diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/Info.plist b/app-ios/App/DroidKaigi2023/DroidKaigi2023/Info.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+</dict>
+</plist>
diff --git a/app-ios/Modules/Package.swift b/app-ios/Modules/Package.swift
@@ -5,6 +5,7 @@ import PackageDescription
 
 var package = Package(
     name: "Modules",
+    defaultLocalization: "ja",
     platforms: [
         .iOS(.v16),
     ],
@@ -84,6 +85,7 @@ var package = Package(
                 "Assets",
                 "Component",
                 "KMPContainer",
+                "shared",
                 "Model",
                 .product(name: "Dependencies", package: "swift-dependencies"),
             ]

diff --git a/app-ios/Modules/Sources/About/AboutView.swift b/app-ios/Modules/Sources/About/AboutView.swift
@@ -128,6 +128,12 @@ public struct AboutView<ContributorView: View, StaffView: View, SponsorView: Vie
                     Text(Bundle.main.formattedVersion)
                         .font(Font.custom(FontAssets.Montserrat.medium, size: 14))
                         .fontWeight(.medium)
+                    Spacer().frame(height: 8)
+                    Text("The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.")
+                        .foregroundStyle(AssetColors.About.androidRobotDescription.swiftUIColor)
+                        .font(Font.custom(FontAssets.Montserrat.medium, size: 11))
+                        .fontWeight(.medium)
+                        .multilineTextAlignment(.center)
                 }
                 .padding(16)
             }

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
@@ -0,0 +1 @@
+
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
@@ -0,0 +1 @@
+
diff --git a/app-ios/Modules/Sources/Assets/swiftgen.yml b/app-ios/Modules/Sources/Assets/swiftgen.yml
@@ -31,3 +31,13 @@ fonts:
     params:
       enumName: FontAssets
       publicAccess: true
+
+strings:
+  inputs:
+    - Strings/ja.lproj
+  outputs:
+    templateName: structured-swift5
+    output: Strings.generated.swift
+    params:
+      publicAccess: true
+      bundle: Bundle.myModule
diff --git a/app-ios/Modules/Sources/Component/CacheAsyncImage.swift b/app-ios/Modules/Sources/Component/CacheAsyncImage.swift
@@ -1,12 +1,12 @@
 import SwiftUI
 
 public struct CacheAsyncImage<Content, PlaceHolder>: View where Content: View, PlaceHolder: View {
-    
+
     private let url: URL?
     private let scale: CGFloat
     private let contentImage: (Image) -> Content
     private let placeholder: () -> PlaceHolder
-    
+
     public init(
         url: URL?,
         scale: CGFloat = 1.0,
@@ -18,7 +18,7 @@ public struct CacheAsyncImage<Content, PlaceHolder>: View where Content: View, P
         self.contentImage = contentImage
         self.placeholder = placeholder
     }
-    
+
     public var body: some View {
         if let cachedImage = ImageCache[url] {
             contentImage(cachedImage)
@@ -44,7 +44,7 @@ private extension CacheAsyncImage {
 
 private class ImageCache {
     static private var cache: [URL: Image] = [:]
-    
+
     static subscript(url: URL?) -> Image? {
         get {
             guard let url else { return nil }