Przeglądaj źródła

Remove animated background + setting

Deniz Cengiz 1 rok temu
rodzic
commit
52cbbe80f6

+ 0 - 1
FreeAPS/Resources/json/defaults/freeaps/freeaps_settings.json

@@ -25,7 +25,6 @@
   "lowGlucose" : 72,
   "highGlucose" : 270,
   "carbsRequiredThreshold" : 10,
-  "animatedBackground" : false,
   "useFPUconversion" : true,
   "tins": false,
   "individualAdjustmentFactor" : 0.5,

+ 0 - 5
FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -26,7 +26,6 @@ struct FreeAPSSettings: JSON, Equatable {
     var lowGlucose: Decimal = 72
     var highGlucose: Decimal = 270
     var carbsRequiredThreshold: Decimal = 10
-    var animatedBackground: Bool = false
     var useFPUconversion: Bool = true
     var tins: Bool = false
     var individualAdjustmentFactor: Decimal = 0.5
@@ -229,10 +228,6 @@ extension FreeAPSSettings: Decodable {
             settings.carbsRequiredThreshold = carbsRequiredThreshold
         }
 
-        if let animatedBackground = try? container.decode(Bool.self, forKey: .animatedBackground) {
-            settings.animatedBackground = animatedBackground
-        }
-
         if let smoothGlucose = try? container.decode(Bool.self, forKey: .smoothGlucose) {
             settings.smoothGlucose = smoothGlucose
         }

+ 0 - 4
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -42,7 +42,6 @@ extension Home {
         @Published var units: GlucoseUnits = .mgdL
         @Published var pumpDisplayState: PumpDisplayState?
         @Published var alarm: GlucoseAlarm?
-        @Published var animatedBackground = false
         @Published var manualTempBasal = false
         @Published var smooth = false
         @Published var maxValue: Decimal = 1.2
@@ -138,8 +137,6 @@ extension Home {
             broadcaster.register(PumpReservoirObserver.self, observer: self)
             broadcaster.register(PumpDeactivatedObserver.self, observer: self)
 
-            animatedBackground = settingsManager.settings.animatedBackground
-
             timer.eventHandler = {
                 DispatchQueue.main.async { [weak self] in
                     self?.timerDate = Date()
@@ -450,7 +447,6 @@ extension Home.StateModel:
         allowManualTemp = !settings.closedLoop
         closedLoop = settingsManager.settings.closedLoop
         units = settingsManager.settings.units
-        animatedBackground = settingsManager.settings.animatedBackground
         manualTempBasal = apsManager.isManualTempBasal
         smooth = settingsManager.settings.smoothGlucose
         lowGlucose = settingsManager.settings.low

+ 0 - 25
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -34,25 +34,6 @@ extension Home {
 
         let buttonFont = Font.custom("TimeButtonFont", size: 14)
 
-        struct DefinitionRow: View {
-            var term: String
-            var definition: String
-            var color: Color
-
-            var body: some View {
-                VStack(alignment: .leading) {
-                    HStack {
-                        Image(systemName: "circle.fill").foregroundStyle(color)
-                        Text(term).font(.subheadline).fontWeight(.semibold)
-                    }
-                    Text(definition)
-                        .font(.subheadline)
-                        .foregroundColor(.secondary)
-                }
-                .padding(.vertical, 5)
-            }
-        }
-
         @Environment(\.managedObjectContext) var moc
         @Environment(\.colorScheme) var colorScheme
 
@@ -354,12 +335,6 @@ extension Home {
 
         @ViewBuilder func mainChart(geo: GeometryProxy) -> some View {
             ZStack {
-                if state.animatedBackground {
-                    SpriteView(scene: spriteScene, options: [.allowsTransparency])
-                        .ignoresSafeArea()
-                        .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
-                }
-
                 MainChartView(
                     geo: geo,
                     units: $state.units,

+ 0 - 3
FreeAPS/Sources/Modules/Settings/SettingsStateModel.swift

@@ -12,7 +12,6 @@ extension Settings {
 
         @Published var closedLoop = false
         @Published var debugOptions = false
-        @Published var animatedBackground = false
         @Published var serviceUIType: ServiceUI.Type?
         @Published var setupTidepool = false
 
@@ -35,8 +34,6 @@ extension Settings {
 
             copyrightNotice = Bundle.main.infoDictionary?["NSHumanReadableCopyright"] as? String ?? ""
 
-            subscribeSetting(\.animatedBackground, on: $animatedBackground) { animatedBackground = $0 }
-
             serviceUIType = pluginManager.getServiceTypeByIdentifier("TidepoolService")
         }
 

+ 8 - 8
FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift

@@ -146,14 +146,14 @@ extension Settings {
                 } header: { Text("Developer") }.listRowBackground(Color.chart)
 
                 Section {
-                    Toggle("Animated Background", isOn: $state.animatedBackground)
-                }.listRowBackground(Color.chart)
-
-                Section {
-                    Text("Share logs")
-                        .onTapGesture {
-                            showShareSheet = true
-                        }
+                    HStack {
+                        Text("Share logs")
+                            .onTapGesture {
+                                showShareSheet.toggle()
+                            }
+                        Spacer()
+                        Image(systemName: "square.and.arrow.up")
+                    }
                 }.listRowBackground(Color.chart)
             }.scrollContentBackground(.hidden).background(color)
                 .sheet(isPresented: $showShareSheet) {

+ 8 - 0
FreeAPS/Sources/Views/DefinitionRow.swift

@@ -0,0 +1,8 @@
+//
+//  DefinitionRow.swift
+//  FreeAPS
+//
+//  Created by Cengiz Deniz on 23.07.24.
+//
+
+import Foundation