Remove unnecessary HStack and public modifiers. Add preview for swipe to remove.

Author: vargaat

Core/Core/Common/CommonUI/InstUI/Utils/SwipeToRemove.swift

@@ -192,3 +192,36 @@ private struct SwipeToRemoveModifier<Label: View>: ViewModifier {
         }
     }
 }
+
+#if DEBUG
+
+#Preview {
+    ScrollView {
+        VStack(spacing: 0) {
+            ForEach(0..<5) { index in
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(verbatim: "Todo Item \(index + 1)")
+                        .font(.headline)
+                    Text(verbatim: "Swipe left to mark as done")
+                        .font(.subheadline)
+                        .foregroundStyle(.secondary)
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding()
+                .background(.backgroundLightest)
+                .swipeToRemove(
+                    backgroundColor: .backgroundSuccess,
+                    onSwipe: {},
+                    label: {
+                        Image(systemName: "checkmark.circle.fill")
+                            .font(.title)
+                            .foregroundStyle(.textLightest)
+                            .paddingStyle(.horizontal, .standard)
+                    }
+                )
+            }
+        }
+    }
+}
+
+#endif

Core/Core/Features/Todos/Model/TodoInteractor.swift

@@ -19,24 +19,23 @@
 import Foundation
 import Combine
 
-public protocol TodoInteractor {
+protocol TodoInteractor {
     var todoGroups: CurrentValueSubject<[TodoGroupViewModel], Never> { get }
     func refresh(ignoreCache: Bool) -> AnyPublisher<Void, Error>
     func markItemAsDone(_ item: TodoItemViewModel, done: Bool) -> AnyPublisher<Void, Error>
 }
 
-public final class TodoInteractorLive: TodoInteractor {
-    public var todoGroups = CurrentValueSubject<[TodoGroupViewModel], Never>([])
+final class TodoInteractorLive: TodoInteractor {
+    var todoGroups = CurrentValueSubject<[TodoGroupViewModel], Never>([])
 
     private let env: AppEnvironment
-
     private var subscriptions = Set<AnyCancellable>()
 
     init(env: AppEnvironment) {
         self.env = env
     }
 
-    public func refresh(ignoreCache: Bool) -> AnyPublisher<Void, Error> {
+    func refresh(ignoreCache: Bool) -> AnyPublisher<Void, Error> {
         let startDate = Clock.now.addDays(-28)
         let endDate = Clock.now.addDays(28)
         let currentUserID = env.currentSession?.userID
@@ -77,7 +76,7 @@ public final class TodoInteractorLive: TodoInteractor {
             .eraseToAnyPublisher()
     }
 
-    public func markItemAsDone(_ item: TodoItemViewModel, done: Bool) -> AnyPublisher<Void, Error> {
+    func markItemAsDone(_ item: TodoItemViewModel, done: Bool) -> AnyPublisher<Void, Error> {
         let useCase = MarkPlannableItemDone(
             plannableId: item.plannableId,
             plannableType: item.plannableType,
@@ -119,10 +118,10 @@ public final class TodoInteractorLive: TodoInteractor {
 
 #if DEBUG
 
-public final class TodoInteractorPreview: TodoInteractor {
-    public let todoGroups: CurrentValueSubject<[TodoGroupViewModel], Never>
+final class TodoInteractorPreview: TodoInteractor {
+    let todoGroups: CurrentValueSubject<[TodoGroupViewModel], Never>
 
-    public init(todoGroups: [TodoGroupViewModel]? = nil) {
+    init(todoGroups: [TodoGroupViewModel]? = nil) {
         if let todoGroups {
             self.todoGroups = CurrentValueSubject<[TodoGroupViewModel], Never>(todoGroups)
             return
@@ -147,11 +146,11 @@ public final class TodoInteractorPreview: TodoInteractor {
         self.todoGroups = CurrentValueSubject<[TodoGroupViewModel], Never>([todayGroup, tomorrowGroup])
     }
 
-    public func refresh(ignoreCache: Bool) -> AnyPublisher<Void, Error> {
+    func refresh(ignoreCache: Bool) -> AnyPublisher<Void, Error> {
         Publishers.typedJust(())
     }
 
-    public func markItemAsDone(_ item: TodoItemViewModel, done: Bool) -> AnyPublisher<Void, Error> {
+    func markItemAsDone(_ item: TodoItemViewModel, done: Bool) -> AnyPublisher<Void, Error> {
         Publishers.typedJust(())
     }
 }

Core/Core/Features/Todos/View/TodoListItemCell.swift

@@ -29,38 +29,36 @@ struct TodoListItemCell: View {
     let isSwiping: Binding<Bool>?
 
     var body: some View {
-        VStack(spacing: 0) {
-            HStack(spacing: 0) {
-                TodoItemContentView(item: item, isCompactLayout: false)
+        HStack(spacing: 0) {
+            TodoItemContentView(item: item, isCompactLayout: false)
 
-                checkboxButton
-                    .paddingStyle(.leading, .cellAccessoryPadding)
-                    .accessibilityHidden(true)
-            }
-            .padding(.vertical, 8)
-            .paddingStyle(.trailing, .standard)
-            .background(.backgroundLightest)
-            .contentShape(Rectangle())
-            .onTapGesture {
-                guard isSwiping?.wrappedValue != true else { return }
-                onTap(item, viewController)
-            }
-            .accessibilityElement(children: .combine)
-            .accessibilityAddTraits(.isButton)
-            .accessibilityActions {
-                if let label = item.markAsDoneAccessibilityLabel {
-                    Button(label) {
-                        onMarkAsDone(item)
-                    }
+            checkboxButton
+                .paddingStyle(.leading, .cellAccessoryPadding)
+                .accessibilityHidden(true)
+        }
+        .padding(.vertical, 8)
+        .paddingStyle(.trailing, .standard)
+        .background(.backgroundLightest)
+        .contentShape(Rectangle())
+        .onTapGesture {
+            guard isSwiping?.wrappedValue != true else { return }
+            onTap(item, viewController)
+        }
+        .accessibilityElement(children: .combine)
+        .accessibilityAddTraits(.isButton)
+        .accessibilityActions {
+            if let label = item.markAsDoneAccessibilityLabel {
+                Button(label) {
+                    onMarkAsDone(item)
                 }
             }
-            .swipeToRemove(
-                backgroundColor: .backgroundSuccess,
-                isSwiping: isSwiping,
-                onSwipe: { onSwipeMarkAsDone(item) },
-                label: { swipeActionView }
-            )
         }
+        .swipeToRemove(
+            backgroundColor: .backgroundSuccess,
+            isSwiping: isSwiping,
+            onSwipe: { onSwipeMarkAsDone(item) },
+            label: { swipeActionView }
+        )
     }
 
     private var swipeActionView: some View {

Core/Core/Features/Todos/View/TodoListScreen.swift

@@ -18,19 +18,19 @@
 
 import SwiftUI
 
-public struct TodoListScreen: View {
+struct TodoListScreen: View {
     @Environment(\.viewController) private var viewController
     @Environment(\.dynamicTypeSize) private var dynamicTypeSize
     @ObservedObject var viewModel: TodoListViewModel
     /// The sticky section header grows horizontally, so we need to increase paddings here not to let the header overlap the cell content.
     @ScaledMetric private var uiScale: CGFloat = 1
     @State private var isCellSwiping = false
 
-    public init(viewModel: TodoListViewModel) {
+    init(viewModel: TodoListViewModel) {
         self.viewModel = viewModel
     }
 
-    public var body: some View {
+    var body: some View {
         InstUI.BaseScreen(
             state: viewModel.state,
             config: viewModel.screenConfig,

Core/Core/Features/Todos/ViewModel/TodoGroupViewModel.swift

@@ -18,17 +18,17 @@
 
 import Foundation
 
-public struct TodoGroupViewModel: Identifiable, Equatable, Comparable {
-    public let id: String
-    public let date: Date
-    public let items: [TodoItemViewModel]
-    public let weekdayAbbreviation: String
-    public let dayNumber: String
-    public let isToday: Bool
-    public let displayDate: String
-    public let accessibilityLabel: String
+struct TodoGroupViewModel: Identifiable, Equatable, Comparable {
+    let id: String
+    let date: Date
+    let items: [TodoItemViewModel]
+    let weekdayAbbreviation: String
+    let dayNumber: String
+    let isToday: Bool
+    let displayDate: String
+    let accessibilityLabel: String
 
-    public init(date: Date, items: [TodoItemViewModel]) {
+    init(date: Date, items: [TodoItemViewModel]) {
         self.id = date.isoString()
         self.date = date
         self.items = items
@@ -45,7 +45,7 @@ public struct TodoGroupViewModel: Identifiable, Equatable, Comparable {
 
     // MARK: - Comparable
 
-    public static func < (lhs: TodoGroupViewModel, rhs: TodoGroupViewModel) -> Bool {
+    static func < (lhs: TodoGroupViewModel, rhs: TodoGroupViewModel) -> Bool {
         lhs.date < rhs.date
     }
 }