Kaynağa Gözat

Merge branch 'dev' into feat/dev-scrollable-settings-search

Deniz Cengiz 1 gün önce
ebeveyn
işleme
d85873e5e0

+ 1 - 1
Config.xcconfig

@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 
 // The developers set the version numbers, please leave them alone
 // The developers set the version numbers, please leave them alone
 APP_VERSION = 0.7.0
 APP_VERSION = 0.7.0
-APP_DEV_VERSION = 0.7.0.19
+APP_DEV_VERSION = 0.7.0.20
 APP_BUILD_NUMBER = 1
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 COPYRIGHT_NOTICE =
 
 

+ 10 - 2
Trio/Sources/Modules/Onboarding/View/TherapySettingEditorView.swift

@@ -7,6 +7,13 @@ struct TherapySettingEditorView: View {
     var valueOptions: [Decimal]
     var valueOptions: [Decimal]
     var validateOnDelete: (() -> Void)?
     var validateOnDelete: (() -> Void)?
     var onItemAdded: (() -> Void)?
     var onItemAdded: (() -> Void)?
+    
+    private let basalFormatter: NumberFormatter = {
+        let numberFormatter = NumberFormatter()
+        numberFormatter.maximumFractionDigits = 3
+        numberFormatter.minimumFractionDigits = 2
+        return numberFormatter
+    }()
 
 
     @State private var selectedItemID: UUID?
     @State private var selectedItemID: UUID?
     @Namespace var bottomID
     @Namespace var bottomID
@@ -280,10 +287,11 @@ struct TherapySettingEditorView: View {
         case .mmolL,
         case .mmolL,
              .mmolLPerUnit:
              .mmolLPerUnit:
             return decimalValue.formattedAsMmolL
             return decimalValue.formattedAsMmolL
+        case .unitPerHour:
+            return basalFormatter.string(from: decimalValue as NSNumber) ?? ""
         case .gramPerUnit,
         case .gramPerUnit,
              .mgdL,
              .mgdL,
-             .mgdLPerUnit,
-             .unitPerHour:
+             .mgdLPerUnit:
             return decimalValue.description
             return decimalValue.description
         }
         }
     }
     }