merge fixes

mountrcg · Nov 7, 2024 · 0eadbf3 · 0eadbf3
1 parent 4bbf118
commit 0eadbf3
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/Config.xcconfig b/Config.xcconfig
@@ -1,5 +1,5 @@
 APP_DISPLAY_NAME = iAPS
-APP_VERSION = 3.7
+APP_VERSION = 3.7.1
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE = autoISF 3.0
 DEVELOPER_TEAM = ##TEAM_ID##

diff --git a/FreeAPS/Sources/APS/Storage/CoreDataStorage.swift b/FreeAPS/Sources/APS/Storage/CoreDataStorage.swift
@@ -90,6 +90,7 @@ final class CoreDataStorage {
         }
         return insulinDistribution
     }
+
     func insulinConcentration() -> (concentration: Double, increment: Double) {
         var conc = [InsulinConcentration]()
         coredataContext.performAndWait {

diff --git a/FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift b/FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift
@@ -93,27 +93,25 @@ extension Settings {
                     Toggle("Debug options", isOn: $state.debugOptions)
                     if state.debugOptions {
                         Group {
-                            HStack {
-                                Text("NS Upload Profile and Settings")
-                                Button("Upload") { state.uploadProfileAndSettings(true) }
-                                    .frame(maxWidth: .infinity, alignment: .trailing)
-                                    .buttonStyle(.borderedProminent)
-                            }
-
-                            HStack {
-                                Text("Delete All NS Overrides")
-                                Button("Delete") { state.deleteOverrides() }
-                                    .frame(maxWidth: .infinity, alignment: .trailing)
-                                    .buttonStyle(.borderedProminent)
-                                    .tint(.red)
-                            } /*
-
-                            HStack {
-                                Toggle("Ignore flat CGM readings", isOn: $state.disableCGMError)
-                            }
+//                            HStack {
+//                                Text("NS Upload Profile and Settings")
+//                                Button("Upload") { state.uploadProfileAndSettings(true) }
+//                                    .frame(maxWidth: .infinity, alignment: .trailing)
+//                                    .buttonStyle(.borderedProminent)
+//                            }
+//                            HStack {
+//                                Text("Delete All NS Overrides")
+//                                Button("Delete") { state.deleteOverrides() }
+//                                    .frame(maxWidth: .infinity, alignment: .trailing)
+//                                    .buttonStyle(.borderedProminent)
+//                                    .tint(.red)
+//                            }
+//                            HStack {
+//                                Toggle("Ignore flat CGM readings", isOn: $state.disableCGMError)
+//                            }
 
                             HStack {
-                                Toggle("Allow diluted insulin concentration settings", isOn: $state.allowDilution)
+                                Toggle("Allow insulin concentration settings", isOn: $state.allowDilution)
                             }
                         }
                         Group {

diff --git a/FreeAPS/Sources/Views/ViewModifiers.swift b/FreeAPS/Sources/Views/ViewModifiers.swift
@@ -92,14 +92,14 @@ struct AddShadow: ViewModifier {
     }
 }
 
-struct RaisedRectangle: View {
-    @Environment(\.colorScheme) var colorScheme
-    var body: some View {
-        Rectangle().fill(colorScheme == .dark ? .black : .white)
-            .frame(height: 1)
-            .addShadows()
-    }
-}
+// struct RaisedRectangle: View {
+//    @Environment(\.colorScheme) var colorScheme
+//    var body: some View {
+//        Rectangle().fill(colorScheme == .dark ? .black : .white)
+//            .frame(height: 1)
+//            .addShadows()
+//    }
+// }
 
 struct TestTube: View {
     let opacity: CGFloat