Merge branch 'main' into feature/update-string-ReadMore-to-More

DroidKaigi · Aug 11, 2024 · 448d76f · 448d76f
2 parents 41ccaa7 + 07a19a2
commit 448d76f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -10,10 +10,6 @@ on:
 
 run-name: "unit-test by ${{ github.actor }}"
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
 permissions: { }
 
 jobs:

diff --git a/app-ios/Sources/EventMapFeature/Model/FloorMap.swift b/app-ios/Sources/EventMapFeature/Model/FloorMap.swift
@@ -1,5 +1,5 @@
 import Foundation
-import CommonComponents
+import Model
 import SwiftUI
 
 public enum FloorMap {
@@ -10,7 +10,7 @@ public enum FloorMap {
 extension FloorMap: Selectable {
     public var id: Self { self }
 
-    public var title: String {
+    public var caseTitle: String {
         switch self {
         case .first: "1F"
         case .firstBasement: "B1F"

diff --git a/app-ios/Sources/TimetableFeature/TimetableReducer.swift b/app-ios/Sources/TimetableFeature/TimetableReducer.swift
@@ -96,6 +96,9 @@ public struct TimetableReducer : Sendable{
                 }
             case .requestDay(.timetableItemTapped):
                 return .none
+
+            case .requestDay(.searchTapped):
+                return .none
             }
         }
     }

diff --git a/feature/sessions/src/commonMain/composeResources/values-ja/strings.xml b/feature/sessions/src/commonMain/composeResources/values-ja/strings.xml
@@ -26,4 +26,8 @@
     <string name="content_description_location">場所</string>
     <string name="content_description_language">言語</string>
     <string name="content_description_category">カテゴリ</string>
+    <string name="schedule_title">日時</string>
+    <string name="location_title">場所</string>
+    <string name="language_title">対応言語</string>
+    <string name="category_title">カテゴリ</string>
 </resources>
diff --git a/feature/sessions/src/commonMain/composeResources/values/strings.xml b/feature/sessions/src/commonMain/composeResources/values/strings.xml
@@ -26,4 +26,8 @@
     <string name="content_description_location">Location</string>
     <string name="content_description_language">Language</string>
     <string name="content_description_category">Category</string>
+    <string name="schedule_title">Date/Time</string>
+    <string name="location_title">Location</string>
+    <string name="language_title">Supported Languages</string>
+    <string name="category_title">Category</string>
 </resources>
diff --git a/...otlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailSummaryCard.kt b/...otlin/io/github/droidkaigi/confsched/sessions/component/TimetableItemDetailSummaryCard.kt
@@ -25,10 +25,14 @@ import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
+import conference_app_2024.feature.sessions.generated.resources.category_title
 import conference_app_2024.feature.sessions.generated.resources.content_description_category
 import conference_app_2024.feature.sessions.generated.resources.content_description_language
 import conference_app_2024.feature.sessions.generated.resources.content_description_location
 import conference_app_2024.feature.sessions.generated.resources.content_description_schedule
+import conference_app_2024.feature.sessions.generated.resources.language_title
+import conference_app_2024.feature.sessions.generated.resources.location_title
+import conference_app_2024.feature.sessions.generated.resources.schedule_title
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.designsystem.theme.LocalRoomTheme
 import io.github.droidkaigi.confsched.model.Locale
@@ -70,23 +74,23 @@ fun TimetableItemDetailSummaryCard(
             modifier = Modifier.fillMaxWidth(),
             imageVector = Icons.Outlined.Schedule,
             contentDescription = stringResource(SessionsRes.string.content_description_schedule),
-            title = "日時",
+            title = stringResource(SessionsRes.string.schedule_title),
             description = timetableItem.formattedDateTimeString,
         )
         Spacer(Modifier.height(8.dp))
         SummaryCardRow(
             modifier = Modifier.fillMaxWidth(),
             imageVector = Icons.Outlined.LocationOn,
             contentDescription = stringResource(SessionsRes.string.content_description_location),
-            title = "場所",
+            title = stringResource(SessionsRes.string.location_title),
             description = timetableItem.room.nameAndFloor,
         )
         Spacer(Modifier.height(8.dp))
         SummaryCardRow(
             modifier = Modifier.fillMaxWidth(),
             imageVector = Icons.Outlined.Language,
             contentDescription = stringResource(SessionsRes.string.content_description_language),
-            title = "対応言語",
+            title = stringResource(SessionsRes.string.language_title),
             description = timetableItem.getSupportedLangString(
                 getDefaultLocale() == Locale.JAPAN,
             ),
@@ -96,7 +100,7 @@ fun TimetableItemDetailSummaryCard(
             modifier = Modifier.fillMaxWidth(),
             imageVector = Icons.Outlined.Category,
             contentDescription = stringResource(SessionsRes.string.content_description_category),
-            title = "カテゴリ",
+            title = stringResource(SessionsRes.string.category_title),
             description = timetableItem.category.title.currentLangTitle,
         )
     }