use 4 spacing, common protocol

DroidKaigi · Aug 2, 2023 · bb1d08e · bb1d08e
1 parent 499b2b9
commit bb1d08e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/error.imageset/Contents.json b/app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/error.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "error.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/error.imageset/error.pdf b/app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/error.imageset/error.pdf
diff --git a/app-ios/Modules/Sources/Model/ViewModelState.swift b/app-ios/Modules/Sources/Model/ViewModelState.swift
@@ -0,0 +1 @@
+public protocol ViewModelState: Equatable {}
diff --git a/app-ios/Modules/Sources/Timetable/SessionTimeView.swift b/app-ios/Modules/Sources/Timetable/SessionTimeView.swift
@@ -13,7 +13,7 @@ struct SessionTimeView: View {
     var endsAt: Date
 
     var body: some View {
-        VStack {
+        VStack(spacing: 4) {
             Text(formatter.string(from: startsAt))
                 .foregroundStyle(AssetColors.Surface.onSurface.swiftUIColor)
                 .font(Font(UIFont.systemFont(ofSize: 16, weight: .bold)))

diff --git a/app-ios/Modules/Sources/Timetable/TimetableListItemView.swift b/app-ios/Modules/Sources/Timetable/TimetableListItemView.swift
@@ -1,3 +1,4 @@
+import Assets
 import shared
 import SwiftUI
 import Theme
@@ -33,7 +34,8 @@ struct TimetableListItemView: View {
                     if let message = session.message {
                         Spacer().frame(height: 8)
                         HStack(spacing: 4) {
-                            Image(systemName: "exclamationmark.circle.fill")
+                            Assets.Icons.error.swiftUIImage
+                                .renderingMode(.template)
                             Text(message.currentLangTitle)
                                 .font(Font.system(size: 12, weight: .regular, design: .default))
                         }
@@ -55,9 +57,9 @@ struct TimetableListItemView: View {
                 },
                 label: {
                     if timetableItemWithFavorite.isFavorited {
-                        Image(systemName: "bookmark.fill")
+                        Assets.Icons.bookmark.swiftUIImage
                     } else {
-                        Image(systemName: "bookmark")
+                        Assets.Icons.bookmarkBorder.swiftUIImage
                     }
                 }
             )

diff --git a/app-ios/Modules/Sources/Timetable/TimetableViewModel.swift b/app-ios/Modules/Sources/Timetable/TimetableViewModel.swift
@@ -2,14 +2,14 @@ import Foundation
 import Model
 import shared
 
-struct TimetableState: Equatable {
+struct TimetableState: ViewModelState {
     var selectedDay: DroidKaigi2023Day = .day1
     var timeGroupTimetableItems: LoadingState<[TimetableTimeGroupItems]> = .initial
 }
 
 @MainActor
 final class TimetableViewModel: ObservableObject {
-    @Published var state: TimetableState = .init()
+    @Published private(set) var state: TimetableState = .init()
     private var cachedTimeGroupTimetableItems: [TimetableTimeGroupItems]?
 
     func load() async {