Merge branch 'LoopKit:dev' into dev

Trpl7ca · Oct 29, 2023 · 8c8bf59 · 8c8bf59
2 parents 01c6bcf + 6b7bba6
commit 8c8bf59
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Loop b/Loop
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -71,6 +71,15 @@
         "revision" : "8e4022f2852d77240d0a17482cbfe325354aac70"
       }
     },
+    {
+      "identity" : "slidebutton",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/no-comment/SlideButton",
+      "state" : {
+        "branch" : "main",
+        "revision" : "82e907608fbd42cc23232bdb0c1720c288dbca2f"
+      }
+    },
     {
       "identity" : "swiftcharts",
       "kind" : "remoteSourceControl",

diff --git a/OmniBLE b/OmniBLE
diff --git a/OmniKit b/OmniKit
+17 −0		OmniBLE.xcodeproj/project.pbxproj
+1 −0		OmniBLE/PumpManagerUI/ViewControllers/DashUICoordinator.swift
+10 −2		OmniBLE/PumpManagerUI/ViewModels/InsertCannulaViewModel.swift
+3 −0		OmniBLE/PumpManagerUI/Views/AttachPodView.swift
+3 −0		OmniBLE/PumpManagerUI/Views/CheckInsertedCannulaView.swift
+62 −9		OmniBLE/PumpManagerUI/Views/InsertCannulaView.swift
+3 −0		OmniBLE/PumpManagerUI/Views/PairPodView.swift
+3 −0		OmniBLE/PumpManagerUI/Views/SetupCompleteView.swift
+29 −0		OmniKit.xcodeproj/project.pbxproj
+178 −0		OmniKit/Resources/hi.lproj/Localizable.strings
+10 −2		OmniKitUI/ViewModels/InsertCannulaViewModel.swift
+59 −9		OmniKitUI/Views/InsertCannulaView.swift