Merge branch 'main' into takahirom/add-describe-tests-based-on-descri…

…be-spec/2024-06-25
DroidKaigi · Jul 5, 2024 · e9e0929 · e9e0929
2 parents 7d9f583 + b05ab56
commit e9e0929
Show file tree

Hide file tree

Showing 160 changed files with 4,464 additions and 455 deletions.
diff --git a/.github/workflows/screenshot-comparison-comment.yml b/.github/workflows/screenshot-comparison-comment.yml
@@ -66,7 +66,7 @@ jobs:
           # Check for invalid file names and add only valid ones
           exist_valid_files="false"
           for file in "${files_to_add[@]}"; do
-            if [[ $file =~ ^[a-zA-Z0-9_./\[\]\- ]+$ ]]; then
+            if [[ $file =~ ^([-a-zA-Z0-9_. ]|\[|\])+$ ]]; then
               exist_valid_files="true"
               break
             fi
@@ -83,7 +83,7 @@ jobs:
           
           # Check for invalid file names and add only valid ones
           for file in $files_to_add; do
-            if [[ "$file" =~ ^[a-zA-Z0-9_./\[\]\- ]+$ ]]; then
+            if [[ "$file" =~ ^([-a-zA-Z0-9_. ]|\[|\])+$ ]]; then
               git add "$file"
             fi
           done
@@ -99,7 +99,7 @@ jobs:
         shell: bash
         run: |
           # Find all the files ending with _compare.png in roborazzi folder
-          files=$(find . -type f -name "*_compare.png" | grep "roborazzi/" | grep -E "^[a-zA-Z0-9_./\[\]\- ]+$")
+          files=$(find . -type f -name "*_compare.png" | grep "roborazzi/" | grep -E "^([-a-zA-Z0-9_. ]|\[|\])+$")
           delimiter="$(openssl rand -hex 8)"
           {
             echo "reports<<${delimiter}"

diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -100,6 +100,7 @@ dependencies {
     implementation(projects.feature.contributors)
     implementation(projects.feature.sessions)
     implementation(projects.feature.eventmap)
+    implementation(projects.feature.profilecard)
     implementation(projects.core.model)
     implementation(projects.core.data)
     implementation(projects.core.designsystem)

diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt b/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt
@@ -47,6 +47,9 @@ import io.github.droidkaigi.confsched.sessions.sessionScreens
 import io.github.droidkaigi.confsched.sessions.timetableScreenRoute
 import io.github.droidkaigi.confsched.share.ShareNavigator
 import io.github.droidkaigi.confsched.ui.NavHostWithSharedAxisX
+import io.github.droidkaigi.confshed.profilecard.navigateProfileCardScreen
+import io.github.droidkaigi.confshed.profilecard.profileCardScreen
+import io.github.droidkaigi.confshed.profilecard.profileCardScreenRoute
 import kotlinx.collections.immutable.PersistentList
 
 @Composable
@@ -115,6 +118,7 @@ private fun NavGraphBuilder.mainScreen(
                 onNavigationIconClick = navController::popBackStack,
                 onEventMapItemClick = externalNavController::navigate,
             )
+            profileCardScreen(contentPadding)
         },
     )
 }
@@ -125,6 +129,7 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
     override fun routeToTab(route: String): MainScreenTab? {
         return when (route) {
             timetableScreenRoute -> Timetable
+            profileCardScreenRoute -> ProfileCard
             else -> null
         }
     }
@@ -137,7 +142,7 @@ class KaigiAppMainNestedGraphStateHolder : MainNestedGraphStateHolder {
             Timetable -> mainNestedNavController.navigateTimetableScreen()
             EventMap -> mainNestedNavController.navigateEventMapScreen()
             About -> TODO()
-            ProfileCard -> TODO()
+            ProfileCard -> mainNestedNavController.navigateProfileCardScreen()
         }
     }
 }

diff --git a/app-ios-shared/build.gradle.kts b/app-ios-shared/build.gradle.kts
@@ -55,6 +55,7 @@ kotlin {
                 api(projects.feature.sessions)
                 api(projects.feature.eventmap)
                 api(projects.feature.contributors)
+                api(projects.feature.profilecard)
                 implementation(libs.kotlinxCoroutinesCore)
                 implementation(libs.skieAnnotation)
             }

diff --git a/app-ios/App/App.swift b/app-ios/App/App.swift
@@ -3,6 +3,7 @@ import SwiftUI
 #if canImport(App)
 import App
 import ComposableArchitecture
+import Theme
 
 final class AppDelegate: NSObject, UIApplicationDelegate {
     let store = Store(
@@ -20,6 +21,8 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
 struct DroidKaigi2024AppApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
 
+    init() { FontAssets.registerAllCustomFonts() }
+
     var body: some Scene {
         WindowGroup {
             RootView(store: appDelegate.store)

diff --git a/app-ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app-ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "f8cbec89e72afd3e8305b98d43e58a9e69ba7ccc12f6d0cc55ff743ff5373f8f",
+  "originHash" : "65e8a333b2fc3bb01c35d55d51ff325d4b6f5bcabdf6053eaff0b18ce8ef5f61",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -100,6 +100,15 @@
         "version" : "1.22.5"
       }
     },
+    {
+      "identity" : "licenselist",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/cybozu/LicenseList.git",
+      "state" : {
+        "revision" : "0828b88c1a6130d56ede2cc6c41ec50068a7ebd6",
+        "version" : "0.7.0"
+      }
+    },
     {
       "identity" : "nanopb",
       "kind" : "remoteSourceControl",
@@ -217,6 +226,15 @@
         "version" : "510.0.2"
       }
     },
+    {
+      "identity" : "swiftgenplugin",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SwiftGen/SwiftGenPlugin",
+      "state" : {
+        "revision" : "879b85a470cacd70c19e22eb7e11a3aed66f4068",
+        "version" : "6.6.2"
+      }
+    },
     {
       "identity" : "swiftui-navigation",
       "kind" : "remoteSourceControl",

diff --git a/app-ios/App/App.xctestplan b/app-ios/App/App.xctestplan
@@ -37,6 +37,34 @@
         "identifier" : "TimetableDetailFeatureTests",
         "name" : "TimetableDetailFeatureTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "FavoriteFeatureTests",
+        "name" : "FavoriteFeatureTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:..",
+        "identifier" : "ContributorFeatureTests",
+        "name" : "ContributorFeatureTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:..",
+        "identifier" : "SponsorFeatureTests",
+        "name" : "SponsorFeatureTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:..",
+        "identifier" : "StaffFeatureTests",
+        "name" : "StaffFeatureTests"
+      }
     }
   ],
   "version" : 1

diff --git a/app-ios/Package.resolved b/app-ios/Package.resolved
@@ -1,6 +1,24 @@
 {
-  "originHash" : "afca4b8d5816f3c4c5b6379bf8d871bbb7b24b7dc679c5d99474b4d2430552e3",
+  "originHash" : "fc296cbf51ba156d83c222f42852e5fa16b6bcd01ef05b8c01c34d58995a19e3",
   "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "748c7837511d0e6a507737353af268484e1745e2",
+        "version" : "1.2024011601.1"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "076b241a625e25eac22f8849be256dfb960fcdfe",
+        "version" : "10.19.1"
+      }
+    },
     {
       "identity" : "combine-schedulers",
       "kind" : "remoteSourceControl",
@@ -10,6 +28,96 @@
         "version" : "1.0.0"
       }
     },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk.git",
+      "state" : {
+        "revision" : "9d17b500cd98d9a7009751ad62f802e152e97021",
+        "version" : "10.26.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "16244d177c4e989f87b25e9db1012b382cfedc55",
+        "version" : "10.25.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
+        "version" : "9.4.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6",
+        "version" : "7.13.3"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "e9fad491d0673bdda7063a0341fb6b47a30c5359",
+        "version" : "1.62.2"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193",
+        "version" : "3.4.1"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
+        "version" : "100.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+        "version" : "2.30910.0"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+        "version" : "2.4.0"
+      }
+    },
     {
       "identity" : "swift-case-paths",
       "kind" : "remoteSourceControl",
@@ -91,6 +199,15 @@
         "version" : "1.1.7"
       }
     },
+    {
+      "identity" : "swift-protobuf",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-protobuf.git",
+      "state" : {
+        "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
+        "version" : "1.26.0"
+      }
+    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",