Move pair filtering to be passed through environment

Author: asiliuk

Modules/Sources/ScheduleFeature/ContiniousSchedule/ContiniousScheduleFeature+Loading.swift

@@ -39,16 +39,13 @@ extension ContinuousScheduleFeature.State {
         scheduleList.loading = (days.count < count) ? .finished : .loadMore
 
         self.offset = days.last?.date
-        var newDays = days.map { element in
+        let newDays = days.map { element in
             DaySectionFeature.State(
                 element: element,
                 pairRowDetails: pairRowDetails
             )
         }
 
-        // Make sure newly aded sections has pairs filtered out by subgroup
-        newDays.filter(keepingSubgroup: keepingSubgroup)
-
         scheduleList.days.append(contentsOf: newDays)
     }
 }

Modules/Sources/ScheduleFeature/ContiniousSchedule/ContiniousScheduleFeature.swift

@@ -17,15 +17,6 @@ public struct ContinuousScheduleFeature {
         var weekSchedule: WeekSchedule?
         var pairRowDetails: PairRowDetails?
 
-        // Keep track of currently applied subgroup filter
-        // to make sure we'll keep filtering newly added pairs to the list
-        var keepingSubgroup: Int?
-
-        mutating func filter(keepingSubgroup subgroup: Int?) {
-            keepingSubgroup = subgroup
-            scheduleList.filter(keepingSubgroup: subgroup)
-        }
-
         init(
             schedule: DaySchedule,
             startDate: Date?,

Modules/Sources/ScheduleFeature/DaySchedule/DayScheduleFeature.swift

@@ -10,10 +10,6 @@ public struct DayScheduleFeature {
     public struct State {
         var scheduleList: ScheduleListFeature.State
 
-        mutating func filter(keepingSubgroup subgroup: Int?) {
-            scheduleList.filter(keepingSubgroup: subgroup)
-        }
-
         init(schedule: DaySchedule, startDate: Date?, endDate: Date?) {
             @Dependency(\.calendar) var calendar
             @Dependency(\.date.now) var now

Modules/Sources/ScheduleFeature/ExamsSchedule/ExamsScheduleFeature.swift

@@ -12,10 +12,6 @@ public struct ExamsScheduleFeature {
         var scheduleList: ScheduleListFeature.State
         var pairRowDetails: PairRowDetails?
 
-        mutating func filter(keepingSubgroup subgroup: Int?) {
-            scheduleList.filter(keepingSubgroup: subgroup)
-        }
-
         init(exams: [Pair], startDate: Date?, endDate: Date?, pairRowDetails: PairRowDetails?) {
             self.pairRowDetails = pairRowDetails
 

Modules/Sources/ScheduleFeature/Schedule/Day/DaySectionFeature+Filter.swift

@@ -35,7 +35,6 @@ public struct DaySectionFeature {
         var subtitle: String? = nil
         var relativity: Relativity = .future
         var pairRows: IdentifiedArrayOf<PairRowFeature.State>
-        var keepingSubgroup: Int?
 
         init(
             dayDate: DayDate,
@@ -87,7 +86,6 @@ public struct DaySectionFeature {
                     state.subtitle = date.flatMap { Self.relativeFormatter.relativeName(for: $0, now: now) }
                     state.relativity = date.map { State.Relativity(for: $0, now: now, calendar: calendar) } ?? .future
                 }
-                state.filter(keepingSubgroup: state.keepingSubgroup)
                 return .none
             case .pairRows:
                 return .none

Modules/Sources/ScheduleFeature/Schedule/Day/DaySectionFeature.swift

@@ -15,6 +15,9 @@ struct DaySectionView: View {
                     ),
                     content: { PairRowView(store: $0) }
                 )
+                .transformEnvironment(\.pairFilteringMode) { mode in
+                    if store.relativity == .past { mode = .filter }
+                }
             } header:{
                 ScheduleDateTitle(
                     date: store.title,

Modules/Sources/ScheduleFeature/Schedule/Day/DaySectionView.swift

@@ -74,8 +74,6 @@ public struct LoadedScheduleReducer {
                 // Switch to exams if no regular schedule available
                 scheduleType = .exams
             }
-
-            filter(keepingSubgroup: subgroupPicker?.selected)
         }
     }
 
@@ -106,8 +104,7 @@ public struct LoadedScheduleReducer {
             }
             .onChange(of: \.subgroupPicker?.selected) { _, newValue in
                 Reduce { state, _ in
-                    state.filter(keepingSubgroup: newValue)
-                    return .run { [source = state.source] _ in
+                    .run { [source = state.source] _ in
                         subgroupFilterService.preferredSubgroup(source).value = newValue
                     }
                 }