Merge branch 'main' into docs/add_assemble_xc_framework_script

DroidKaigi · Sep 16, 2023 · 0f958cc · 0f958cc
2 parents 7da58b5 + 62ac7dd
commit 0f958cc
Show file tree

Hide file tree

Showing 160 changed files with 1,117 additions and 559 deletions.
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
@@ -36,7 +36,7 @@ runs:
       run: echo "KOTLIN_VERSION=$(grep -oE 'kotlin\s*=\s*"[0-9.]*"' gradle/libs.versions.toml | grep -oE '[0-9.]+')" >> $GITHUB_OUTPUT
 
     - name: cache Konan
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
       with:
         path: |
           ~/.konan

diff --git a/.github/actions/spm/action.yml b/.github/actions/spm/action.yml
@@ -3,7 +3,7 @@ description: "save and restore SPM cache"
 runs:
   using: "composite"
   steps:
-    - uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+    - uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
       id: cache-spm
       with:
         path: |
@@ -21,7 +21,7 @@ runs:
       run: bundle exec fastlane resolved_package
 
     - if: ${{ steps.cache-spm.outputs.cache-hit != 'true' }}
-      uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+      uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
       with:
         path: |
           ./app-ios/build/DerivedData/SourcePackages

diff --git a/.github/workflows/ActionLint.yml b/.github/workflows/ActionLint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Actionlint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Run actionlint
         run: |
           bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.6.25

diff --git a/.github/workflows/Analyze.yml b/.github/workflows/Analyze.yml
@@ -22,7 +22,7 @@ jobs:
         language: [ 'java' ]
 
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
     - uses: ./.github/actions/setup-java
 

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - uses: ./.github/actions/setup-java
 

diff --git a/.github/workflows/CompareScreenshot.yml b/.github/workflows/CompareScreenshot.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - uses: ./.github/actions/setup-java
 

diff --git a/.github/workflows/CompareScreenshotComment.yml b/.github/workflows/CompareScreenshotComment.yml
@@ -40,7 +40,7 @@ jobs:
           echo "pull_request_number=$(cat NR)" >> "$GITHUB_OUTPUT"
       - name: main checkout
         id: checkout-main
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           ref: main
       - id: switch-companion-branch

diff --git a/.github/workflows/DropStaging.yml b/.github/workflows/DropStaging.yml
@@ -17,7 +17,7 @@ jobs:
       contents: read # for checkout
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           repository: droidkaigi/conference-app-2023
           ref: gh-actions

diff --git a/.github/workflows/Format.yml b/.github/workflows/Format.yml
@@ -20,7 +20,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - uses: ./.github/actions/setup-java
 

diff --git a/.github/workflows/Renovate.yml b/.github/workflows/Renovate.yml
@@ -51,9 +51,9 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@23a02fe7be9e93f857a953cc8162e57d2c8401ef # v39.0.1
+        uses: renovatebot/github-action@5e224f3a02c7ce9cadc83f82d65f1b6dd73876c1 # v39.0.3
         with:
           configurationFile: renovate.json5
           token: ${{ secrets.RENOVATE_TEST_TOKEN }} # workflow, repo, read user:email permissions

diff --git a/.github/workflows/StagePullRequest.yml b/.github/workflows/StagePullRequest.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           repository: droidkaigi/conference-app-2023
           ref: gh-actions

diff --git a/.github/workflows/StagePush.yml b/.github/workflows/StagePush.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           repository: droidkaigi/conference-app-2023
           ref: gh-actions

diff --git a/.github/workflows/UnitTest.yml b/.github/workflows/UnitTest.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - uses: ./.github/actions/setup-java
 

diff --git a/.github/workflows/iOSBuild.yml b/.github/workflows/iOSBuild.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0

diff --git a/.github/workflows/iOSLint.yml b/.github/workflows/iOSLint.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           fetch-depth: 1
 

diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,10 @@ Thumbs.db
 !/.idea/codeStyles/Project.xml
 !/.idea/codeStyles/codeStyleConfig.xml
 !/.idea/icon*.svg
+# Suppress typo
+!/.idea/dictionaries
+/.idea/dictionaries/*
+!/.idea/dictionaries/dictionary.xml
 
 # Gradle cache
 .gradle

diff --git a/.idea/dictionaries/dictionary.xml b/.idea/dictionaries/dictionary.xml
diff --git a/.run/detekt.run.xml b/.run/detekt.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="detekt" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="detekt" />
+          <option value="--auto-correct" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/generateComposeCompilerMetricsReports.run.xml b/.run/generateComposeCompilerMetricsReports.run.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="generateComposeMetricsReport" type="GradleRunConfiguration" factoryName="Gradle">
+        <ExternalSystemSettings>
+            <option name="executionName" />
+            <option name="externalProjectPath" value="$PROJECT_DIR$" />
+            <option name="externalSystemIdString" value="GRADLE" />
+            <option name="scriptParameters" value="-PenableComposeCompilerMetrics=true -PenableComposeCompilerReports=true" />
+            <option name="taskDescriptions">
+                <list />
+            </option>
+            <option name="taskNames">
+                <list>
+                    <option value="assembleRelease" />
+                </list>
+            </option>
+            <option name="vmOptions" />
+        </ExternalSystemSettings>
+        <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+        <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+        <DebugAllEnabled>false</DebugAllEnabled>
+        <method v="2" />
+    </configuration>
+</component>
diff --git a/README.md b/README.md
@@ -12,13 +12,19 @@
 
 This is a video of an app in development, and it will be updated as needed.
 
-[Screen_recording_20230805_160952.webm](https://github.com/DroidKaigi/conference-app-2023-images/assets/1386930/32968ea9-6ef8-4707-b402-0fd009cc04fe)
+<video src="https://github.com/DroidKaigi/conference-app-2023/assets/13657682/ec91d1b8-639d-4622-8371-1387be4c6bac" width="320" controls>
+  https://github.com/DroidKaigi/conference-app-2023/assets/13657682/ec91d1b8-639d-4622-8371-1387be4c6bac
+</video>
 
 # Try it out!
 
 ## Android
 
-The app is currently in preparation for release on Google Play and the App Store. In the meantime, you can try the app on DeployGate. Stay tuned for updates!
+<a href="https://play.google.com/store/apps/details?id=io.github.droidkaigi.confsched2023"><img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="70"></a>
+
+### Development version
+
+You can test the development app through DeployGate.
 
 [<img src="https://dply.me/fim4ik/button/large" alt="Try it on your device via DeployGate">](https://dply.me/fim4ik#install)
 

diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         buildConfig = true
     }
     defaultConfig {
-        versionCode = 8
-        versionName = "1.3.0"
+        versionCode = 11
+        versionName = "1.6.0"
     }
     signingConfigs {
         create("dev") {

diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/AppModule.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/AppModule.kt
@@ -19,4 +19,5 @@ class AppModule {
 
 class AppBuildConfigProvider(
     override val versionName: String = BuildConfig.VERSION_NAME,
+    override val debugBuild: Boolean = BuildConfig.DEBUG,
 ) : BuildConfigProvider
diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/ResolveDynamicLinksActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/ResolveDynamicLinksActivity.kt
@@ -6,8 +6,13 @@ import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.Intent.FLAG_ACTIVITY_REQUIRE_DEFAULT
 import android.net.Uri
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks
+import io.github.droidkaigi.confsched2023.model.Lang.ENGLISH
+import io.github.droidkaigi.confsched2023.model.Lang.JAPANESE
+import io.github.droidkaigi.confsched2023.model.Lang.MIXED
+import io.github.droidkaigi.confsched2023.model.defaultLang
 
 class ResolveDynamicLinksActivity : ComponentActivity() {
 
@@ -17,9 +22,18 @@ class ResolveDynamicLinksActivity : ComponentActivity() {
         FirebaseDynamicLinks.getInstance()
             .getDynamicLink(intent)
             .addOnSuccessListener(this) { pendingDynamicLinkData ->
-                val deepLink = pendingDynamicLinkData.link
-
-                handleDeepLink(deepLink)
+                if (pendingDynamicLinkData != null) {
+                    val deepLink = pendingDynamicLinkData.link
+                    handleDeepLink(deepLink)
+                } else {
+                    val message = when (defaultLang()) {
+                        MIXED -> "Please connect to the network/ネットワークに接続してください"
+                        JAPANESE -> "ネットワークに接続してください"
+                        ENGLISH -> "Please connect to the network"
+                    }
+                    Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+                    finishAndRemoveTask()
+                }
             }
             .addOnFailureListener {
                 finishAndRemoveTask()

diff --git a/app-android/src/main/res/drawable-night/splash_icon.xml b/app-android/src/main/res/drawable-night/splash_icon.xml
@@ -1,12 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="192dp"
-    android:height="192dp"
+    android:width="108dp"
+    android:height="108dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M65,117.79C60.04,110.86 57.03,103.54 57.03,96.04C57.03,88.54 60.04,81.21 65,74.28C69.12,68.52 78.07,59.27 88.56,49.89C89.02,49.48 89.01,48.76 88.53,48.36C80.81,42.06 73.32,36.73 68,34.34C53.73,27.9 32,35.04 32,52.48V139.61C32,157.07 55.24,164.22 68.21,157.51C72.96,155.05 80.61,149.21 88.6,142.51C89.06,142.12 89.08,141.41 88.63,141C84.68,137.39 68.11,122.14 65,117.79Z"
-      android:fillColor="#00B1E2"/>
-  <path
-      android:pathData="M123.99,34.33C138.26,27.89 159.99,35.04 159.99,52.48V139.61C159.99,157.07 136.75,164.22 123.78,157.51C110.81,150.79 76.29,118.94 71.91,112.82C64.07,101.86 64.07,90.21 71.91,79.25C79.75,68.29 109.72,40.77 123.99,34.33Z"
-      android:fillColor="#49D395"/>
+    <path
+        android:pathData="m80.87,106.64c-2.42,-3.38 -3.89,-6.96 -3.89,-10.62 0,-3.66 1.47,-7.24 3.89,-10.62 2.01,-2.81 6.38,-7.33 11.51,-11.91 0.22,-0.2 0.22,-0.56 -0.01,-0.75C88.59,69.66 84.93,67.06 82.33,65.89 75.36,62.75 64.75,66.24 64.75,74.75l0,42.55c0,8.52 11.35,12.02 17.69,8.74 2.32,-1.2 6.05,-4.05 9.95,-7.32 0.23,-0.19 0.23,-0.54 0.02,-0.74 -1.93,-1.76 -10.02,-9.21 -11.54,-11.33z"
+        android:strokeWidth="0.49"
+        android:fillColor="#00b1e2"/>
+    <path
+        android:pathData="m109.67,65.89c6.97,-3.14 17.58,0.34 17.58,8.86l0,42.55c0,8.52 -11.35,12.02 -17.68,8.74 -6.33,-3.28 -23.19,-18.83 -25.32,-21.82 -3.83,-5.35 -3.83,-11.04 0,-16.39 3.83,-5.35 18.46,-18.79 25.43,-21.93z"
+        android:strokeWidth="0.49"
+        android:fillColor="#49d395"/>
 </vector>
diff --git a/app-android/src/main/res/drawable/splash_icon.xml b/app-android/src/main/res/drawable/splash_icon.xml
@@ -1,12 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="192dp"
-    android:height="192dp"
+    android:width="108dp"
+    android:height="108dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M65,117.79C60.04,110.86 57.03,103.54 57.03,96.04C57.03,88.54 60.04,81.21 65,74.28C69.12,68.52 78.07,59.27 88.56,49.89C89.02,49.48 89.01,48.76 88.53,48.36C80.81,42.06 73.32,36.73 68,34.34C53.73,27.9 32,35.04 32,52.48V139.61C32,157.07 55.24,164.22 68.21,157.51C72.96,155.05 80.61,149.21 88.6,142.51C89.06,142.12 89.08,141.41 88.63,141C84.68,137.39 68.11,122.14 65,117.79Z"
-      android:fillColor="#00B1E2"/>
-  <path
-      android:pathData="M123.99,34.33C138.26,27.89 159.99,35.04 159.99,52.48V139.61C159.99,157.07 136.75,164.22 123.78,157.51C110.81,150.79 76.29,118.94 71.91,112.82C64.07,101.86 64.07,90.21 71.91,79.25C79.75,68.29 109.72,40.77 123.99,34.33Z"
-      android:fillColor="#49D395"/>
+    <path
+        android:pathData="m80.87,106.64c-2.42,-3.38 -3.89,-6.96 -3.89,-10.62 0,-3.66 1.47,-7.24 3.89,-10.62 2.01,-2.81 6.38,-7.33 11.51,-11.91 0.22,-0.2 0.22,-0.56 -0.01,-0.75C88.59,69.66 84.93,67.06 82.33,65.89 75.36,62.75 64.75,66.24 64.75,74.75l0,42.55c0,8.52 11.35,12.02 17.69,8.74 2.32,-1.2 6.05,-4.05 9.95,-7.32 0.23,-0.19 0.23,-0.54 0.02,-0.74 -1.93,-1.76 -10.02,-9.21 -11.54,-11.33z"
+        android:strokeWidth="0.49"
+        android:fillColor="#00b1e2"/>
+    <path
+        android:pathData="m109.67,65.89c6.97,-3.14 17.58,0.34 17.58,8.86l0,42.55c0,8.52 -11.35,12.02 -17.68,8.74 -6.33,-3.28 -23.19,-18.83 -25.32,-21.82 -3.83,-5.35 -3.83,-11.04 0,-16.39 3.83,-5.35 18.46,-18.79 25.43,-21.93z"
+        android:strokeWidth="0.49"
+        android:fillColor="#49d395"/>
 </vector>
diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj
@@ -448,6 +448,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = DroidKaigi2023/DroidKaigi2023.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"DroidKaigi2023/Preview Content\"";
@@ -490,6 +491,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = DroidKaigi2023/DroidKaigi2023.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"DroidKaigi2023/Preview Content\"";