Merge branch 'LoopKit:dev' into trio

loopandlearn · Oct 7, 2024 · edb6956 · edb6956
2 parents a5c1d66 + a03be57
commit edb6956
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/LoopKitUI/CarbKit/CarbQuantityRow.swift b/LoopKitUI/CarbKit/CarbQuantityRow.swift
@@ -22,6 +22,7 @@ public struct CarbQuantityRow: View {
     private let formatter: NumberFormatter = {
         let formatter = NumberFormatter()
         formatter.numberStyle = .decimal
+        formatter.maximumIntegerDigits = 3
         formatter.maximumFractionDigits = 1
         return formatter
     }()
@@ -76,13 +77,8 @@ public struct CarbQuantityRow: View {
 
     // Update quantity based on text field input
     private func updateQuantity(with input: String) {
-        let filtered = input.filter { "0123456789.".contains($0) }
-        if filtered != input {
-            self.carbInput = filtered
-        }
-
-        if let doubleValue = Double(filtered) {
-            quantity = doubleValue
+        if let number = formatter.number(from: input) {
+            quantity = number.doubleValue
         } else {
             quantity = nil
         }

diff --git a/LoopKitUI/Views/CheckmarkListItem.swift b/LoopKitUI/Views/CheckmarkListItem.swift
@@ -74,8 +74,8 @@ public struct CheckmarkListItem: View {
                 .foregroundColor(.accentColor)
         } else {
             Circle()
-                .stroke()
-                .foregroundColor(Color(.systemGray4))
+                .stroke(lineWidth: 2)
+                .foregroundColor(Color(.systemGray))
         }
     }