Merge pull request #872 from fumiyasac/feature/fix_timeline_grid_margin

[iOS] Fix timeline grid unexpected margin.
DroidKaigi · Aug 30, 2024 · be38af7 · be38af7
2 parents a1eb3ba + 1bf4d69
commit be38af7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app-ios/Sources/TimetableFeature/TimetableGridCard.swift b/app-ios/Sources/TimetableFeature/TimetableGridCard.swift
@@ -63,7 +63,8 @@ public struct TimetableGridCard: View {
             }
             .frame(maxWidth: .infinity)
             .padding(12)
-            .frame(width: 192 * CGFloat(cellCount) + CGFloat(12 * (cellCount - 1)), height: 153)
+            .frame(maxWidth: 192 * CGFloat(cellCount) + CGFloat(12 * (cellCount - 1)))
+            .frame(height: 153)
             .background(cellCount > 1 ? AssetColors.Surface.surfaceContainer.swiftUIColor : timetableItem.room.roomTheme.containerColor, in: RoundedRectangle(cornerRadius: 4))
             .overlay(RoundedRectangle(cornerRadius: 4).stroke(cellCount > 1 ? AssetColors.Surface.onSurface.swiftUIColor : timetableItem.room.roomTheme.primaryColor, lineWidth: 1))
         }

diff --git a/app-ios/Sources/TimetableFeature/TimetableListView.swift b/app-ios/Sources/TimetableFeature/TimetableListView.swift
@@ -137,7 +137,7 @@ struct TimetableGridView: View {
                             Text(timeBlock.startsTimeString).foregroundStyle(AssetColors.Surface.onSurface.swiftUIColor).textStyle(.labelMedium)
                             Spacer()
 
-                        }.frame(height: 153)
+                        }.frame(width: 40, height: 153)
 
                         if (timeBlock.items.count == 1 && timeBlock.isTopLunch()) {