Przeglądaj źródła

Fixed remote temp targets

Ivan Valkou 5 lat temu
rodzic
commit
33558b53d3

+ 4 - 4
FreeAPS.xcodeproj/project.pbxproj

@@ -1968,7 +1968,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = BA7ZHP4963;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = FreeAPS/Resources/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -1977,7 +1977,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				PRODUCT_BUNDLE_IDENTIFIER = "---CHANGE-IT-TO-YOUR-OWN---";
+				PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1994,7 +1994,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = BA7ZHP4963;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = FreeAPS/Resources/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -2003,7 +2003,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = "$(CURRENT_PROJECT_VERSION)";
-				PRODUCT_BUNDLE_IDENTIFIER = "---CHANGE-IT-TO-YOUR-OWN---";
+				PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 7 - 1
FreeAPS/Sources/Models/TempTarget.swift

@@ -2,16 +2,21 @@ import Foundation
 
 struct TempTarget: JSON, Identifiable, Equatable {
     var id = UUID().uuidString
-    let name: String
+    let name: String?
     var createdAt: Date
     let targetTop: Decimal
     let targetBottom: Decimal
     let duration: Decimal
     let enteredBy: String?
+    let reason: String?
 
     static let manual = "freeaps-x://manual"
     static let custom = "Temp target"
     static let cancel = "Cancel"
+
+    var displayName: String {
+        name ?? reason ?? TempTarget.custom
+    }
 }
 
 extension TempTarget {
@@ -23,5 +28,6 @@ extension TempTarget {
         case targetBottom
         case duration
         case enteredBy
+        case reason
     }
 }

+ 6 - 3
FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetViewModel.swift

@@ -37,7 +37,8 @@ extension AddTempTarget {
                 targetTop: highTarget,
                 targetBottom: lowTarget,
                 duration: duration,
-                enteredBy: TempTarget.manual
+                enteredBy: TempTarget.manual,
+                reason: TempTarget.custom
             )
             storage.storeTempTargets([entry])
             apsManager.determineBasal().sink { _ in }.store(in: &lifetime)
@@ -52,7 +53,8 @@ extension AddTempTarget {
                 targetTop: 0,
                 targetBottom: 0,
                 duration: 0,
-                enteredBy: TempTarget.manual
+                enteredBy: TempTarget.manual,
+                reason: TempTarget.cancel
             )
             storage.storeTempTargets([entry])
             apsManager.determineBasal().sink { _ in }.store(in: &lifetime)
@@ -77,7 +79,8 @@ extension AddTempTarget {
                 targetTop: highTarget,
                 targetBottom: lowTarget,
                 duration: duration,
-                enteredBy: TempTarget.manual
+                enteredBy: TempTarget.manual,
+                reason: newPresetName.isEmpty ? TempTarget.custom : newPresetName
             )
 
             presets.append(entry)

+ 2 - 2
FreeAPS/Sources/Modules/AddTempTarget/View/AddTempTargetRootView.swift

@@ -84,7 +84,7 @@ extension AddTempTarget {
             return HStack {
                 VStack {
                     HStack {
-                        Text(preset.name)
+                        Text(preset.displayName)
                         Spacer()
                     }
                     HStack {
@@ -114,7 +114,7 @@ extension AddTempTarget {
                     .onTapGesture {
                         removeAlert = Alert(
                             title: Text("A you sure?"),
-                            message: Text("Delete preset \"\(preset.name)\""),
+                            message: Text("Delete preset \"\(preset.displayName)\""),
                             primaryButton: .destructive(Text("Delete"), action: { viewModel.removePreset(id: preset.id) }),
                             secondaryButton: .cancel()
                         )

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

@@ -87,7 +87,7 @@ extension Home {
                 }
 
                 if let tempTarget = viewModel.tempTarget {
-                    Text(tempTarget.name).font(.caption).foregroundColor(.secondary)
+                    Text(tempTarget.displayName).font(.caption).foregroundColor(.secondary)
                     if viewModel.units == .mmolL {
                         Text(
                             targetFormatter