[MBL-19375] To-do Filters

Core/Core/Common/CommonModels/AppEnvironment/SessionDefaults.swift

@@ -223,7 +223,23 @@ public struct SessionDefaults: Equatable {
         }
     }
 
-    // MARK: Offline Settings -
+    // MARK: - Todo List Settings
+
+    public var todoFilterOptions: TodoFilterOptions? {
+        get {
+            guard let data = self["todoFilterOptions"] as? Data else {
+                return nil
+            }
+            return try? JSONDecoder().decode(TodoFilterOptions.self, from: data)
+        }
+        set {
+            if let newValue, let data = try? JSONEncoder().encode(newValue) {
+                self["todoFilterOptions"] = data
+            } else {
+                self["todoFilterOptions"] = nil
+            }
+        }
+    }
 
     public mutating func reset() {
         sessionDefaults = nil

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

@@ -18,49 +18,75 @@
 
 import SwiftUI
 
+extension InstUI {
+
+    public enum SwipeCompletionBehavior: Equatable {
+        /// Swipe action remains fully revealed after swipe completion. Gesture is disabled after action is triggered.
+        case stayOpen
+        /// Swipe action immediately resets to closed position after swipe completion. Gesture remains enabled for repeated use.
+        case reset
+    }
+}
+
 extension View {
 
-    /// Adds a swipe-to-remove gesture that reveals an action view when swiping left.
+    /// Adds a swipe action gesture that reveals an action view when swiping left.
     ///
     /// The gesture requires swiping past a threshold to trigger the action.
     /// Visual and haptic feedback is provided when the threshold is crossed.
-    /// Once the action is triggered, the view remains in the fully revealed position
-    /// and it's the caller's responsibility to remove the cell from the view hierarcy.
     ///
     /// - Parameters:
     ///   - backgroundColor: The background color revealed behind the content during the swipe.
+    ///   - completionBehavior: Determines what happens after the swipe action completes. Defaults to `.stayOpen`.
     ///   - isSwiping: Binding that tracks whether a swipe gesture is currently active. Use this to disable scrolling or other gestures while swiping.
-    ///   - onSwipe: Closure called when the swipe action is completed.
+    ///   - isEnabled: Whether the swipe gesture is enabled. Defaults to `true`.
+    ///   - onSwipeCommitted: Optional closure called immediately when the swipe action is committed (user releases after reaching threshold) but before animations finish.
+    ///   - onSwipe: Closure called when the swipe action is completed animations included. For `.reset` behavior, this is called after the close animation finishes. For `.stayOpen` behavior, this is called while the open animation is running.
     ///   - label: The view displayed in the revealed area during the swipe.
-    public func swipeToRemove<Label: View>(
+    public func swipeAction<Label: View>(
         backgroundColor: Color,
+        completionBehavior: InstUI.SwipeCompletionBehavior = .stayOpen,
         isSwiping: Binding<Bool> = .constant(false),
+        isEnabled: Bool = true,
+        onSwipeCommitted: (() -> Void)? = nil,
         onSwipe: @escaping () -> Void,
         @ViewBuilder label: @escaping () -> Label
     ) -> some View {
-        modifier(SwipeToRemoveModifier(
+        modifier(SwipeActionModifier(
             backgroundColor: backgroundColor,
+            completionBehavior: completionBehavior,
             isSwiping: isSwiping,
+            isEnabled: isEnabled,
+            onSwipeCommitted: onSwipeCommitted,
             onSwipe: onSwipe,
             label: label
         ))
     }
 }
 
-private struct SwipeToRemoveModifier<Label: View>: ViewModifier {
+private struct SwipeActionModifier<Label: View>: ViewModifier {
     let backgroundColor: Color
+    let completionBehavior: InstUI.SwipeCompletionBehavior
     @Binding var isSwiping: Bool
+    let isEnabled: Bool
+    let onSwipeCommitted: (() -> Void)?
     let onSwipe: () -> Void
     let label: () -> Label
 
     init(
         backgroundColor: Color,
+        completionBehavior: InstUI.SwipeCompletionBehavior,
         isSwiping: Binding<Bool>,
+        isEnabled: Bool,
+        onSwipeCommitted: (() -> Void)?,
         onSwipe: @escaping () -> Void,
         label: @escaping () -> Label
     ) {
         self.backgroundColor = backgroundColor
+        self.completionBehavior = completionBehavior
         self._isSwiping = isSwiping
+        self.isEnabled = isEnabled
+        self.onSwipeCommitted = onSwipeCommitted
         self.onSwipe = onSwipe
         self.label = label
     }
@@ -99,10 +125,11 @@ private struct SwipeToRemoveModifier<Label: View>: ViewModifier {
         .contentShape(Rectangle())
         // If this is a simple gesture and the cell is a button then swiping won't work
         .simultaneousGesture(
-            DragGesture()
+            // Values lower than 20 will prevent parent gesture recognizers from working. (Parent scrollview cannot be scrolled when tapped on an element having this swipe modifier.)
+            DragGesture(minimumDistance: 20)
                 .onChanged(handleDragChanged)
                 .onEnded(handleDragEnded),
-            isEnabled: !isActionInvoked
+            isEnabled: isEnabled && !isActionInvoked
         )
     }
 
@@ -181,9 +208,23 @@ private struct SwipeToRemoveModifier<Label: View>: ViewModifier {
         isSwiping = false
 
         if isActionThresholdReached {
-            animateToOpenedState()
-            isActionInvoked = true
-            onSwipe()
+            onSwipeCommitted?()
+
+            switch completionBehavior {
+            case .stayOpen:
+                animateToOpenedState()
+                isActionInvoked = true
+                onSwipe()
+            case .reset:
+                animateToClosedState()
+                Task { @MainActor in
+                    // Wait for close animation to complete before invoking callback.
+                    // This prevents visual state changes during the animation
+                    // Note: await suspends the Task but does NOT block the main thread
+                    try? await Task.sleep(nanoseconds: 430_000_000)
+                    onSwipe()
+                }
+            }
         } else {
             animateToClosedState()
         }
@@ -221,8 +262,9 @@ private struct SwipeToRemoveModifier<Label: View>: ViewModifier {
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .padding()
                 .background(.backgroundLightest)
-                .swipeToRemove(
+                .swipeAction(
                     backgroundColor: .backgroundSuccess,
+                    completionBehavior: .reset,
                     onSwipe: {},
                     label: {
                         Image(systemName: "checkmark.circle.fill")

Core/Core/Common/Extensions/Foundation/DateExtensions.swift

@@ -62,6 +62,11 @@ public extension Date {
             ?? Date()
     }
 
+    func addWeeks(_ weeks: Int) -> Date {
+        Cal.currentCalendar.date(byAdding: .weekOfYear, value: weeks, to: self)
+            ?? Date()
+    }
+
     func addDays(_ days: Int) -> Date {
         Cal.currentCalendar.date(byAdding: .day, value: days, to: self)
             ?? Date()
@@ -202,6 +207,12 @@ public extension Date {
         return formatter
     }()
 
+    private static var shortDayMonthFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.setLocalizedDateFormatFromTemplate("dMMM")
+        return formatter
+    }()
+
     private static var timeOnlyFormatter: DateFormatter = {
         let formatter = DateFormatter()
         formatter.dateStyle = .none
@@ -306,6 +317,13 @@ public extension Date {
         Date.dayFormatter.string(from: self)
     }
 
+    /**
+     E.g.: 6 Sep
+     */
+    var shortDayMonth: String {
+        Date.shortDayMonthFormatter.string(from: self)
+    }
+
     var timeString: String {
         Date.timeOnlyFormatter.string(from: self)
     }

Core/Core/Common/Extensions/InstIconExtensions.swift

@@ -78,6 +78,8 @@ public extension UIImage {
     static var dashboardSolid: UIImage { UIImage(named: "dashboardSolid", in: .core, compatibleWith: nil)! }
     static var discussionLine: UIImage { UIImage(named: "discussionLine", in: .core, compatibleWith: nil)! }
     static var discussionSolid: UIImage { UIImage(named: "discussionSolid", in: .core, compatibleWith: nil)! }
+    static var discussionReply2Line: UIImage { UIImage(named: "discussionReply2Line", in: .core, compatibleWith: nil)! }
+    static var discussionReply2Solid: UIImage { UIImage(named: "discussionReply2Solid", in: .core, compatibleWith: nil)! }
     static var documentLine: UIImage { UIImage(named: "documentLine", in: .core, compatibleWith: nil)! }
     static var documentSolid: UIImage { UIImage(named: "documentSolid", in: .core, compatibleWith: nil)! }
     static var editLine: UIImage { UIImage(named: "editLine", in: .core, compatibleWith: nil)! }
@@ -345,6 +347,8 @@ public extension Image {
     static var dashboardSolid: Image { Image("dashboardSolid", bundle: .core) }
     static var discussionLine: Image { Image("discussionLine", bundle: .core) }
     static var discussionSolid: Image { Image("discussionSolid", bundle: .core) }
+    static var discussionReply2Line: Image { Image("discussionReply2Line", bundle: .core) }
+    static var discussionReply2Solid: Image { Image("discussionReply2Solid", bundle: .core) }
     static var documentLine: Image { Image("documentLine", bundle: .core) }
     static var documentSolid: Image { Image("documentSolid", bundle: .core) }
     static var editLine: Image { Image("editLine", bundle: .core) }

Core/Core/Features/Planner/Model/API/APIPlannable.swift

@@ -19,6 +19,7 @@
 import Foundation
 
 public struct APIPlannable: Codable, Equatable {
+    let account_id: ID?
     let course_id: ID?
     let group_id: ID?
     let user_id: ID?
@@ -56,6 +57,7 @@ public struct APIPlannable: Codable, Equatable {
         case .course: Context(.course, id: course_id?.rawValue)
         case .group: Context(.group, id: group_id?.rawValue)
         case .user: Context(.user, id: user_id?.rawValue)
+        case .account: Context(.account, id: account_id?.rawValue)
         default: nil
         }
     }
@@ -113,6 +115,7 @@ public struct APIPlannerOverride: Codable, Equatable {
 #if DEBUG
 extension APIPlannable {
     public static func make(
+        account_id: ID? = nil,
         course_id: ID? = "1",
         group_id: ID? = nil,
         user_id: ID? = nil,
@@ -128,6 +131,7 @@ extension APIPlannable {
         details: APIPlannable.Details? = nil
     ) -> APIPlannable {
         return APIPlannable(
+            account_id: account_id,
             course_id: course_id,
             group_id: group_id,
             user_id: user_id,

Core/Core/Features/Planner/Model/CoreData/Plannable.swift

@@ -27,6 +27,7 @@ public enum PlannableType: String, Codable {
 
 public enum PlannableUseCaseID: String, Codable {
     case syllabusSummary
+    case todo
 }
 
 public final class Plannable: NSManagedObject {
@@ -40,6 +41,8 @@ public final class Plannable: NSManagedObject {
     @NSManaged public var canvasContextIDRaw: String?
     @NSManaged public var contextName: String?
     @NSManaged public var date: Date?
+    @NSManaged public var isAllDay: Bool
+    @NSManaged public var endAt: Date?
     @NSManaged public var hasDate: Bool
     @NSManaged public var pointsPossibleRaw: NSNumber?
     @NSManaged public var userID: String?
@@ -87,6 +90,8 @@ public final class Plannable: NSManagedObject {
         model.title = item.plannable?.title
         model.date = item.plannable_date
         model.hasDate = true
+        model.isAllDay = item.plannable?.all_day ?? false
+        model.endAt = item.plannable?.end_at
         model.pointsPossible = item.plannable?.points_possible
         model.details = item.plannable?.details
         model.context = item.context
@@ -137,6 +142,8 @@ public final class Plannable: NSManagedObject {
         model.contextName = item.context_name
         model.date = item.start_at
         model.hasDate = item.start_at != nil
+        model.isAllDay = item.all_day
+        model.endAt = item.end_at
         model.pointsPossible = item.assignment?.points_possible
         model.details = item.description
         model.userID = userId
@@ -207,6 +214,8 @@ extension Plannable {
         } else {
             if let color: ContextColor = managedObjectContext?.first(where: #keyPath(ContextColor.canvasContextID), equals: canvasContextID) {
                 return color.color
+            } else if context?.contextType == .account {
+                return Brand.shared.primary
             } else {
                 return .textDark
             }

Core/Core/Features/Planner/Model/UseCase/GetPlannables.swift

@@ -35,23 +35,38 @@ public class GetPlannables: UseCase {
     var endDate: Date
     var contextCodes: [String]?
     var filter: String = ""
+    var allowEmptyContextCodesFetch: Bool = false
+    var useCaseID: PlannableUseCaseID?
 
     let observerEvents = PassthroughSubject<EventsRequest, Never>()
     var subscriptions = Set<AnyCancellable>()
 
-    public init(userID: String? = nil, startDate: Date, endDate: Date, contextCodes: [String]? = nil, filter: String = "") {
+    /// - parameters:
+    ///   - useCaseID: When set, filters and tags plannables instance on saving with this use case ID for data isolation.
+    public init(
+        userID: String? = nil,
+        startDate: Date,
+        endDate: Date,
+        contextCodes: [String]? = nil,
+        filter: String = "",
+        allowEmptyContextCodesFetch: Bool = false,
+        useCaseID: PlannableUseCaseID? = nil
+    ) {
         self.userID = userID
         self.startDate = startDate
         self.endDate = endDate
         self.contextCodes = contextCodes
         self.filter = filter
+        self.allowEmptyContextCodesFetch = allowEmptyContextCodesFetch
+        self.useCaseID = useCaseID
 
         setupObserverEventsSubscription()
     }
 
     public var cacheKey: String? {
         let codes = contextCodes?.joined(separator: ",") ?? ""
-        return "get-plannables-\(userID ?? "")-\(startDate)-\(endDate)-\(filter)-\(codes)"
+        let useCaseIDString = useCaseID?.rawValue ?? "nil"
+        return "get-plannables-\(userID ?? "")-\(startDate)-\(endDate)-\(filter)-\(codes)-\(useCaseIDString)"
     }
 
     public var scope: Scope {
@@ -61,10 +76,10 @@ public class GetPlannables: UseCase {
                 startDate as NSDate, #keyPath(Plannable.date),
                 #keyPath(Plannable.date), endDate as NSDate
             ),
-            NSPredicate(format: "%K == nil", #keyPath(Plannable.originUseCaseIDRaw))
+            NSPredicate(key: #keyPath(Plannable.originUseCaseIDRaw), equals: useCaseID?.rawValue)
         ]
 
-        if let userID = userID {
+        if let userID {
             subPredicates.append(
                 NSPredicate(key: #keyPath(Plannable.userID), equals: userID)
             )
@@ -87,8 +102,12 @@ public class GetPlannables: UseCase {
     }
 
     public func makeRequest(environment: AppEnvironment, completionHandler: @escaping RequestCallback) {
-        // If we would send out the request without any context codes the API would return all events so we do an early exit
-        if (contextCodes ?? []).isEmpty {
+        // If we would send out the request without any context codes the API would return all events.
+        // ^ Old comment
+        //
+        // Only return empty if allowEmptyContextCodesFetch is false. Student To-do needs to fetch all plannables
+        // without context codes so that's why the allowEmptyContextCodesFetch param was introduced.
+        if !allowEmptyContextCodesFetch, (contextCodes ?? []).isEmpty {
             completionHandler(.empty, nil, nil)
             return
         }
@@ -126,15 +145,15 @@ public class GetPlannables: UseCase {
         let plannerNoteItems: [APIPlannerNote] = response?.plannerNotes ?? []
 
         for item in plannableItems where item.plannableType != .announcement {
-            Plannable.save(item, userId: userID, in: client)
+            Plannable.save(item, userId: userID, useCase: useCaseID, in: client)
         }
 
         for item in calendarEventItems where item.hidden != true {
-            Plannable.save(item, userId: userID, in: client)
+            Plannable.save(item, userId: userID, useCase: useCaseID, in: client)
         }
 
         for item in plannerNoteItems {
-            Plannable.save(item, contextName: nil, in: client)
+            Plannable.save(item, contextName: nil, useCase: useCaseID, in: client)
         }
     }
 }