Added logic to add bookmark

DroidKaigi · Jul 11, 2024 · d3acfea · d3acfea
1 parent 62fe3e6
commit d3acfea
Show file tree

Hide file tree

Showing 14 changed files with 173 additions and 39 deletions.
diff --git a/app-ios/Package.swift b/app-ios/Package.swift
@@ -114,7 +114,9 @@ let package = Package(
             dependencies: [
                 .tca,
                 .theme,
-                .commonComponents
+                .commonComponents,
+                .kmpClient,
+                .kmpModule,
             ]
         ),
         .testTarget(

diff --git a/app-ios/Sources/App/RootReducer.swift b/app-ios/Sources/App/RootReducer.swift
@@ -100,6 +100,10 @@ public struct RootReducer {
             case .about(.view(.acknowledgementsTapped)):
                 state.paths.about.append(.acknowledgements)
                 return .none
+
+            case .timetable(.view(.timetableItemTapped)):
+                state.paths.timetable.append(.timetableDetail(TimetableDetailReducer.State()))
+                return .none
 
             default:
                 return .none

diff --git a/app-ios/Sources/KMPClient/TestKey.swift b/app-ios/Sources/KMPClient/TestKey.swift
@@ -2,20 +2,20 @@ import Dependencies
 
 extension TimetableClient: TestDependencyKey {
     public static let previewValue: Self = Self()
-    public static let testValue: Self = Self()
+
+    public static let testValue: Self = Self(
+        streamTimetable: unimplemented("TimetableClient.streamTimetable"),
+        streamTimetableItemWithFavorite: unimplemented("TimetableClient.streamTimetableItemWithFavorite"),
+        toggleBookmark: unimplemented("TimetableClient.toggleBookmark")
+    )
 }
 
 extension StaffClient: TestDependencyKey {
     public static let previewValue: Self = Self()
-    public static let testValue: Self = .init {
-        AsyncThrowingStream {
-            $0.yield([.init(id: 0, username: "testValue", profileUrl: "https://2024.droidkaigi.jp/", iconUrl: "https://avatars.githubusercontent.com/u/10727543?s=200&v=4"),])
-            $0.finish()
-        }
-    }
+    public static let testValue: Self = Self(streamStaffs: unimplemented("StaffClient.streamStaffs"))
 }
 
 extension SponsorsClient: TestDependencyKey {
     public static let previewValue: Self = Self()
-    public static let testValue: Self = Self()
+    public static let testValue: Self = Self(streamSponsors: unimplemented("SponsorsClient.streamSponsors"))
 }
diff --git a/...tableDetailFeature/Resource/Media.xcassets/ic_favorite.imageset/ic_favorite.svg b/...tableDetailFeature/Resource/Media.xcassets/ic_favorite.imageset/ic_favorite.svg
diff --git a/...assets/ic_favorite.imageset/Contents.json → ...s/ic_favorite_fill.imageset/Contents.json b/...assets/ic_favorite.imageset/Contents.json → ...s/ic_favorite_fill.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_favorite.svg",
+      "filename" : "favorite.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/...bleDetailFeature/Resource/Media.xcassets/ic_favorite_fill.imageset/favorite.svg b/...bleDetailFeature/Resource/Media.xcassets/ic_favorite_fill.imageset/favorite.svg
diff --git a/...TimetableDetailFeature/Resource/Media.xcassets/ic_favorite_outline.imageset/Contents.json b/...TimetableDetailFeature/Resource/Media.xcassets/ic_favorite_outline.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_favorite_outline.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...re/Resource/Media.xcassets/ic_favorite_outline.imageset/ic_favorite_outline.svg b/...re/Resource/Media.xcassets/ic_favorite_outline.imageset/ic_favorite_outline.svg
diff --git a/app-ios/Sources/TimetableDetailFeature/TimetableDetailReducer.swift b/app-ios/Sources/TimetableDetailFeature/TimetableDetailReducer.swift
@@ -1,31 +1,80 @@
 import ComposableArchitecture
 import CommonComponents
+import KMPClient
+import shared
 
 @Reducer
-public struct TimetableDetailReducer {
+public struct TimetableDetailReducer: Sendable {
+    @Dependency(\.timetableClient) private var timetableClient
+
     public init() {}
 
     @ObservableState
     public struct State: Equatable {
+        public init(isBookmarked: Bool = false, toast: ToastState? = nil) {
+            self.isBookmarked = isBookmarked
+            self.toast = toast
+        }
+
+        var isBookmarked = false
         var toast: ToastState?
     }
-    
+
     public enum Action: BindableAction {
         case binding(BindingAction<State>)
         case view(View)
+        case bookmarkResponse(Result<Void, any Error>)
 
         public enum View {
-            case favoriteButtonTapped
+            case bookmarkButtonTapped
+            case shareButtonTapped
+            case calendarButtonTapped
+            case slideButtonTapped
+            case videoButtonTapped
         }
     }
 
     public var body: some ReducerOf<Self> {
         BindingReducer()
         Reduce { state, action in
+            enum CancelID { case request }
+
             switch action {
-            case .view(.favoriteButtonTapped):
-                state.toast = .init(text: String(localized: "TimetableDetailAddBookmark", bundle: .module))
+            case .view(.bookmarkButtonTapped):
+                return .run { send in
+                    do {
+                        await send(.bookmarkResponse(.success(
+                            try await timetableClient.toggleBookmark(id: TimetableItemId(value: ""))
+                        )))
+                    } catch {
+                        await send(.bookmarkResponse(.failure(error)))
+                    }
+                }
+                .cancellable(id: CancelID.request)
+
+            case .view(.calendarButtonTapped):
+                return .none
+
+            case .view(.shareButtonTapped):
                 return .none
+
+            case .view(.slideButtonTapped):
+                return .none
+
+            case .view(.videoButtonTapped):
+                return .none
+
+            case .bookmarkResponse(.success):
+                if !state.isBookmarked {
+                    state.toast = .init(text: String(localized: "TimetableDetailAddBookmark", bundle: .module))
+                }
+                state.isBookmarked.toggle()
+                return .none
+
+            case let .bookmarkResponse(.failure(error)):
+                print(error)
+                return .none
+
             case .binding:
                 return .none
             }

diff --git a/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift b/app-ios/Sources/TimetableDetailFeature/TimetableDetailView.swift
@@ -31,20 +31,21 @@ public struct TimetableDetailView: View {
             .frame(maxWidth: .infinity)
             .ignoresSafeArea(edges: [.top])
         }
+        .toolbarBackground(AssetColors.Surface.surface.swiftUIColor, for: .navigationBar)
     }
 
-    @ViewBuilder var footer: some View {
+    @MainActor var footer: some View {
         HStack(spacing: 8) {
             Button {
-                // do something
+                store.send(.view(.shareButtonTapped))
             } label: {
                 Group {
                     Image(.icShare)
                 }
                 .frame(width: 40, height: 40)
             }
             Button {
-                // do something
+                store.send(.view(.calendarButtonTapped))
             } label: {
                 Group {
                     Image(.icAddCalendar)
@@ -53,13 +54,18 @@ public struct TimetableDetailView: View {
             }
             Spacer()
             Button {
-                store.send(.view(.favoriteButtonTapped))
+                store.send(.view(.bookmarkButtonTapped))
             } label: {
                 Group {
-                    Image(.icFavorite)
+                    if store.isBookmarked {
+                        Image(.icFavoriteFill)
+                    } else {
+                        Image(.icFavoriteOutline)
+                    }
+
                 }
                 .frame(width: 56, height: 56)
-                .background(AssetColors.Surface.surfaceContainer.swiftUIColor)
+                .background(AssetColors.Secondary.secondaryContainer.swiftUIColor)
                 .clipShape(RoundedRectangle(cornerRadius: 16))
             }
         }
@@ -69,7 +75,7 @@ public struct TimetableDetailView: View {
         .background(AssetColors.Surface.surfaceContainer.swiftUIColor)
     }
 
-    @ViewBuilder var headLine: some View {
+    @MainActor var headLine: some View {
         VStack(alignment: .leading, spacing: 0) {
             HStack(spacing: 4) {
                 RoomTag(.arcticFox)
@@ -99,11 +105,11 @@ public struct TimetableDetailView: View {
             }
             .padding(.bottom, 20)
         }
-        .padding(.horizontal, 16)
+        .padding([.top, .horizontal], 16)
         .background(AssetColors.Custom.arcticFoxContainer.swiftUIColor)
     }
 
-    @ViewBuilder var detail: some View {
+    @MainActor var detail: some View {
         VStack(alignment: .leading, spacing: 20) {
             VStack(spacing: 16) {
                 InformationRow(
@@ -143,7 +149,7 @@ public struct TimetableDetailView: View {
         }
     }
 
-    @ViewBuilder var applicants: some View {
+    @MainActor var applicants: some View {
         VStack(alignment: .leading, spacing: 16) {
             Text(String(localized: "TimeTableDetailApplicants", bundle: .module))
                 .textStyle(.titleLarge)
@@ -155,15 +161,15 @@ public struct TimetableDetailView: View {
         }
     }
 
-    @ViewBuilder var archive: some View {
+    @MainActor var archive: some View {
         VStack(alignment: .leading, spacing: 16) {
             Text(String(localized: "TimeTableDetailArchive", bundle: .module))
                 .textStyle(.titleLarge)
                 .foregroundStyle(AssetColors.Custom.arcticFox.swiftUIColor)
 
             HStack {
                 Button {
-                    // do something
+                    store.send(.view(.slideButtonTapped))
                 } label: {
                     VStack {
                         Label(
@@ -181,7 +187,7 @@ public struct TimetableDetailView: View {
                     .clipShape(Capsule())
                 }
                 Button {
-                    // do something
+                    store.send(.view(.videoButtonTapped))
                 } label: {
                     VStack {
                         Label(
@@ -209,7 +215,7 @@ public struct TimetableDetailView: View {
 
 #Preview {
     TimetableDetailView(
-        store: .init(initialState: .init(toast: nil)) {
+        store: .init(initialState: .init()) {
             TimetableDetailReducer()
         }
     )

diff --git a/app-ios/Sources/TimetableFeature/TimetableListView.swift b/app-ios/Sources/TimetableFeature/TimetableListView.swift
@@ -13,7 +13,7 @@ public struct TimetableView: View {
             HStack {
                 ForEach(DayTab.allCases) { tabItem in
                     Button(action: {
-                        store.send(.selectDay(tabItem))
+                        store.send(.view(.selectDay(tabItem)))
                     }, label: {
                         //TODO: Only selected button should be green and underlined
                         Text(tabItem.rawValue).foregroundStyle(Color(.greenSelectColorset))
@@ -41,7 +41,11 @@ struct TimetableListView: View {
         ScrollView{
             LazyVStack {
                 ForEach(store.timetableItems, id: \.self) { item in
-                    TimeGroupMiniList(contents: item)
+                    Button {
+                        store.send(.view(.timetableItemTapped))
+                    } label: {
+                        TimeGroupMiniList(contents: item)
+                    }
                 }
             }.scrollContentBackground(.hidden)
 

diff --git a/app-ios/Sources/TimetableFeature/TimetableReducer.swift b/app-ios/Sources/TimetableFeature/TimetableReducer.swift
@@ -17,8 +17,13 @@ public struct TimetableReducer {
     }
 
     public enum Action {
+        case view(View)
         case onAppear
-        case selectDay(DayTab)
+
+        public enum View {
+            case selectDay(DayTab)
+            case timetableItemTapped
+        }
     }
 
     public var body: some Reducer<State, Action> {
@@ -27,7 +32,9 @@ public struct TimetableReducer {
             case .onAppear:
                 state.timetableItems = sampleData.day1Results
                 return .none
-            case .selectDay(let dayTab):
+            case .view(.timetableItemTapped):
+                return .none
+            case .view(.selectDay(let dayTab)):
                 //TODO: Replace with real data
 
                 switch dayTab {

diff --git a/app-ios/Tests/StaffFeatureTests/StaffFeatureTests.swift b/app-ios/Tests/StaffFeatureTests/StaffFeatureTests.swift
@@ -8,6 +8,13 @@ final class StaffFeatureTests: XCTestCase {
     func testExample() async throws {
         let store = TestStore(initialState: StaffReducer.State()) {
             StaffReducer()
+        } withDependencies: {
+            $0.staffClient.streamStaffs = {
+                AsyncThrowingStream {
+                    $0.yield([.init(id: 0, username: "testValue", profileUrl: "https://2024.droidkaigi.jp/", iconUrl: "https://avatars.githubusercontent.com/u/10727543?s=200&v=4"),])
+                    $0.finish()
+                }
+            }
         }
         await store.send(.onAppear)
         await store.receive(\.response.success) {