Просмотр исходного кода

Refactor class names and references to reflect renaming

Deniz Cengiz 1 год назад
Родитель
Сommit
7fc4ae1239

+ 2 - 2
FreeAPS/Sources/Modules/Adjustments/AdjustmentsDataFlow.swift

@@ -1,7 +1,7 @@
 import Foundation
 import SwiftUI
 
-enum OverrideConfig {
+enum Adjustments {
     enum Config {}
 
     enum Tab: String, Hashable, Identifiable, CaseIterable {
@@ -24,4 +24,4 @@ enum OverrideConfig {
     }
 }
 
-protocol OverrideProvider: Provider {}
+protocol AdjustmentsProvider: Provider {}

+ 2 - 2
FreeAPS/Sources/Modules/Adjustments/AdjustmentsProvider.swift

@@ -1,5 +1,5 @@
-extension OverrideConfig {
-    final class Provider: BaseProvider, OverrideProvider {
+extension Adjustments {
+    final class Provider: BaseProvider, AdjustmentsProvider {
         func getBGTarget() async -> BGTargets {
             await storage.retrieveAsync(OpenAPS.Settings.bgTargets, as: BGTargets.self)
                 ?? BGTargets(from: OpenAPS.defaults(for: OpenAPS.Settings.bgTargets))

+ 6 - 6
FreeAPS/Sources/Modules/Adjustments/AdjustmentsStateModel.swift

@@ -3,7 +3,7 @@ import CoreData
 import Observation
 import SwiftUI
 
-extension OverrideConfig {
+extension Adjustments {
     @Observable final class StateModel: BaseStateModel<Provider> {
         @ObservationIgnored @Injected() var broadcaster: Broadcaster!
         @ObservationIgnored @Injected() var tempTargetStorage: TempTargetsStorage!
@@ -165,7 +165,7 @@ extension OverrideConfig {
 
 // MARK: - Setup Notifications
 
-extension OverrideConfig.StateModel {
+extension Adjustments.StateModel {
     // Custom Notification to update View when an Override has been cancelled via Home View
     func setupNotification() {
         Foundation.NotificationCenter.default.addObserver(
@@ -591,7 +591,7 @@ extension OverrideConfig.StateModel {
 
 // MARK: - Temp Targets
 
-extension OverrideConfig.StateModel {
+extension Adjustments.StateModel {
     // MARK: - Setup the State variables with the last Temp Target configuration
 
     /// First get the latest Temp Target corresponding NSManagedObjectID with a background fetch
@@ -1041,7 +1041,7 @@ extension OverrideConfig.StateModel {
     }
 }
 
-extension OverrideConfig.StateModel: SettingsObserver {
+extension Adjustments.StateModel: SettingsObserver {
     func settingsDidChange(_: FreeAPSSettings) {
         units = settingsManager.settings.units
         defaultSmbMinutes = settingsManager.preferences.maxSMBBasalMinutes
@@ -1213,7 +1213,7 @@ struct TargetPicker: View {
                             label: label
                         ) {
                             targetStep = step
-                            selection = OverrideConfig.StateModel.roundTargetToStep(selection, step)
+                            selection = Adjustments.StateModel.roundTargetToStep(selection, step)
                         }
                         .padding(.top, 10)
                     }
@@ -1224,7 +1224,7 @@ struct TargetPicker: View {
 
                 // Picker on the right side
                 Picker(selection: Binding(
-                    get: { OverrideConfig.StateModel.roundTargetToStep(selection, targetStep) },
+                    get: { Adjustments.StateModel.roundTargetToStep(selection, targetStep) },
                     set: {
                         selection = $0
                         hasChanges?.wrappedValue = true // This safely updates if hasChanges is provided

+ 3 - 3
FreeAPS/Sources/Modules/Adjustments/View/AdjustmentsRootView.swift

@@ -2,7 +2,7 @@ import CoreData
 import SwiftUI
 import Swinject
 
-extension OverrideConfig {
+extension Adjustments {
     struct RootView: BaseView {
         let resolver: Resolver
 
@@ -80,7 +80,7 @@ extension OverrideConfig {
                         Image(systemName: "clock.arrow.2.circlepath")
                             .font(.system(size: 20))
                             .foregroundStyle(Color.primary, Color(red: 0.6235294118, green: 0.4235294118, blue: 0.9803921569))
-                        Text(OverrideConfig.Tab.overrides.name)
+                        Text(Adjustments.Tab.overrides.name)
                             .font(.subheadline)
                             .lineLimit(1)
                             .minimumScaleFactor(0.8)
@@ -99,7 +99,7 @@ extension OverrideConfig {
                         Image(systemName: "target")
                             .font(.system(size: 20))
                             .foregroundStyle(Color.loopGreen)
-                        Text(OverrideConfig.Tab.tempTargets.name)
+                        Text(Adjustments.Tab.tempTargets.name)
                             .font(.subheadline)
                             .lineLimit(1)
                             .minimumScaleFactor(0.8)

+ 2 - 2
FreeAPS/Sources/Modules/Adjustments/View/Overrides/AddOverrideForm.swift

@@ -5,7 +5,7 @@ struct AddOverrideForm: View {
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.dismiss) var dismiss
-    @Bindable var state: OverrideConfig.StateModel
+    @Bindable var state: Adjustments.StateModel
     @State private var selectedIsfCrOption: IsfAndOrCrOptions = .isfAndCr
     @State private var selectedDisableSmbOption: DisableSmbOptions = .dontDisable
     @State private var percentageStep: Int = 5
@@ -122,7 +122,7 @@ struct AddOverrideForm: View {
                             ForEach([1, 5], id: \.self) { step in
                                 RadioButton(isSelected: percentageStep == step, label: "\(step) %") {
                                     percentageStep = step
-                                    state.overridePercentage = OverrideConfig.StateModel.roundOverridePercentageToStep(
+                                    state.overridePercentage = Adjustments.StateModel.roundOverridePercentageToStep(
                                         state.overridePercentage,
                                         step
                                     )

+ 3 - 3
FreeAPS/Sources/Modules/Adjustments/View/Overrides/EditOverrideForm.swift

@@ -5,7 +5,7 @@ struct EditOverrideForm: View {
     var override: OverrideStored
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.colorScheme) var colorScheme
-    @Bindable var state: OverrideConfig.StateModel
+    @Bindable var state: Adjustments.StateModel
 
     @State private var name: String
     @State private var percentage: Double
@@ -35,7 +35,7 @@ struct EditOverrideForm: View {
     @State private var displayPickerDisableSmbSchedule: Bool = false
     @State private var displayPickerSmbMinutes: Bool = false
 
-    init(overrideToEdit: OverrideStored, state: OverrideConfig.StateModel) {
+    init(overrideToEdit: OverrideStored, state: Adjustments.StateModel) {
         override = overrideToEdit
         _state = Bindable(wrappedValue: state)
         _name = State(initialValue: overrideToEdit.name ?? "")
@@ -187,7 +187,7 @@ struct EditOverrideForm: View {
                             ForEach([1, 5], id: \.self) { step in
                                 RadioButton(isSelected: percentageStep == step, label: "\(step) %") {
                                     percentageStep = step
-                                    percentage = OverrideConfig.StateModel.roundOverridePercentageToStep(percentage, step)
+                                    percentage = Adjustments.StateModel.roundOverridePercentageToStep(percentage, step)
                                 }
                                 .padding(.top, 10)
                             }

+ 1 - 1
FreeAPS/Sources/Modules/Adjustments/View/TempTargets/AddTempTargetForm.swift

@@ -2,7 +2,7 @@ import Foundation
 import SwiftUI
 
 struct AddTempTargetForm: View {
-    @StateObject var state: OverrideConfig.StateModel
+    @StateObject var state: Adjustments.StateModel
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.dismiss) var dismiss

+ 2 - 2
FreeAPS/Sources/Modules/Adjustments/View/TempTargets/EditTempTargetForm.swift

@@ -5,7 +5,7 @@ struct EditTempTargetForm: View {
     @ObservedObject var tempTarget: TempTargetStored
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.colorScheme) var colorScheme
-    @StateObject var state: OverrideConfig.StateModel
+    @StateObject var state: Adjustments.StateModel
     @State private var displayPickerDuration: Bool = false
     @State private var displayPickerTarget: Bool = false
     @State private var tempTargetSensitivityAdjustmentType: TempTargetSensitivityAdjustmentType = .standard
@@ -25,7 +25,7 @@ struct EditTempTargetForm: View {
     @State private var isPreset = false
     @State private var isEnabled = false
 
-    init(tempTargetToEdit: TempTargetStored, state: OverrideConfig.StateModel) {
+    init(tempTargetToEdit: TempTargetStored, state: Adjustments.StateModel) {
         tempTarget = tempTargetToEdit
         _state = StateObject(wrappedValue: state)
         _name = State(initialValue: tempTargetToEdit.name ?? "")

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -954,7 +954,7 @@ extension Home {
 
                     Spacer()
 
-                    NavigationStack { OverrideConfig.RootView(resolver: resolver) }
+                    NavigationStack { Adjustments.RootView(resolver: resolver) }
                         .tabItem {
                             Label(
                                 "Adjustments",

+ 1 - 1
FreeAPS/Sources/Router/Screen.swift

@@ -103,7 +103,7 @@ extension Screen {
         case .iconConfig:
             IconConfig.RootView(resolver: resolver)
         case .overrideConfig:
-            OverrideConfig.RootView(resolver: resolver)
+            Adjustments.RootView(resolver: resolver)
         case .snooze:
             Snooze.RootView(resolver: resolver)
         case .watch: