Switch the layout of the timetable

fumiya-kume · Sep 18, 2023 · 57fe149 · 57fe149
1 parent 0cc5c86
commit 57fe149
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 8 deletions.
diff --git a/app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/list_view.imageset/Contents.json b/app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/list_view.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "trailing-icon 3.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "trailing-icon 4.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...os/Modules/Sources/Assets/Resources/Icons.xcassets/list_view.imageset/trailing-icon 3.pdf b/...os/Modules/Sources/Assets/Resources/Icons.xcassets/list_view.imageset/trailing-icon 3.pdf
diff --git a/...os/Modules/Sources/Assets/Resources/Icons.xcassets/list_view.imageset/trailing-icon 4.pdf b/...os/Modules/Sources/Assets/Resources/Icons.xcassets/list_view.imageset/trailing-icon 4.pdf
diff --git a/app-ios/Modules/Sources/Timetable/TimetableView.swift b/app-ios/Modules/Sources/Timetable/TimetableView.swift
@@ -14,6 +14,7 @@ enum TimetableRouting: Hashable {
 public struct TimetableView<SessionView: View>: View {
     @Environment(\.colorScheme) var colorScheme
     @StateObject var viewModel: TimetableViewModel = .init()
+    @State private var isListPresented: Bool = true
     private let sessionViewBuilder: ViewProvider<TimetableItem, SessionView>
     let gradient = Gradient(stops: [
         .init(color: AssetColors.Surface.surfaceGradientTOP.swiftUIColor, location: 0.0),
@@ -78,13 +79,20 @@ public struct TimetableView<SessionView: View>: View {
                                     .frame(height: shouldCollapse ? 53 : 82)
                                     .animation(.easeInOut(duration: 0.08), value: shouldCollapse)
                                 ) {
-                                    TimetableListView(
-                                        timetableTimeGroupItems: state.timeGroupTimetableItems,
-                                        searchWord: "",
-                                        onToggleBookmark: { [weak viewModel] in
-                                            viewModel?.toggleBookmark($0)
-                                        }
-                                    )
+                                    if isListPresented {
+                                        TimetableListView(
+                                            timetableTimeGroupItems: state.timeGroupTimetableItems,
+                                            searchWord: "",
+                                            onToggleBookmark: { [weak viewModel] in
+                                                viewModel?.toggleBookmark($0)
+                                            }
+                                        )
+                                    } else {
+                                        TimetableGridView(
+                                            day: viewModel.state.selectedDay,
+                                            timetableRoomGroupItems: state.roomGroupTimetableItems
+                                        )
+                                    }
                                 }
                             }
                             .background(AssetColors.Surface.surface.swiftUIColor)
@@ -132,7 +140,16 @@ public struct TimetableView<SessionView: View>: View {
                             .buttonStyle(.plain)
                         }
                         ToolbarItem {
-                            Assets.Icons.gridView.swiftUIImage
+                            Button {
+                                isListPresented.toggle()
+                            } label: {
+                                if isListPresented {
+                                    Assets.Icons.gridView.swiftUIImage
+                                } else {
+                                    Assets.Icons.listView.swiftUIImage
+                                }
+                            }
+                            .buttonStyle(.plain)
                         }
                     }
                 }