Merkaffe · Merkaffe · Nov 5, 2021 · Nov 5, 2021 · Nov 5, 2021 · Nov 5, 2021
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.gitmodules b/.gitmodules
@@ -1,36 +1,39 @@
+[submodule "Amplitude-iOS"]
+	path = Amplitude-iOS
+	url = https://github.com/loopnlearn/Amplitude-iOS.git
+[submodule "CGMBLEKit"]
+	path = CGMBLEKit
+	url = https://github.com/loopnlearn/CGMBLEKit.git
+[submodule "G4ShareSpy"]
+	path = G4ShareSpy
+	url = https://github.com/loopnlearn/G4ShareSpy.git
 [submodule "Loop"]
 	path = Loop
-	url=https://github.com/loopnlearn/Loop.git
-	branch = freeaps
+	url = https://github.com/loopnlearn/Loop.git
 [submodule "LoopKit"]
 	path = LoopKit
-	url = https://github.com/LoopKit/LoopKit.git
-[submodule "CGMBLEKit"]
-	path = CGMBLEKit
-	url = https://github.com/LoopKit/CGMBLEKit.git
+	url = https://github.com/loopnlearn/LoopKit.git
+[submodule "MKRingProgressView"]
+	path = MKRingProgressView
+	url = https://github.com/loopnlearn/MKRingProgressView.git
+[submodule "NightscoutAPIClient"]
+	path = NightscoutAPIClient
+	url = https://github.com/ivalkou/NightscoutAPIClient.git
+[submodule "OmniBLE"]
+	path = OmniBLE
+	url = https://github.com/loopnlearn/OmniBLE.git
 [submodule "SwiftCharts"]
 	path = SwiftCharts
-	url = https://github.com/i-schuetz/SwiftCharts.git
+	url = https://github.com/ps2/SwiftCharts.git
 [submodule "dexcom-share-client-swift"]
 	path = dexcom-share-client-swift
-	url = https://github.com/LoopKit/dexcom-share-client-swift.git
-[submodule "G4ShareSpy"]
-	path = G4ShareSpy
-	url = https://github.com/LoopKit/G4ShareSpy.git
+	url = https://github.com/loopnlearn/dexcom-share-client-swift.git
+[submodule "libre-direct-client-swift"]
+	path = libre-direct-client-swift
+	url = https://github.com/loopnlearn/libre-direct-client-swift.git
 [submodule "rileylink_ios"]
 	path = rileylink_ios
-	url = https://github.com/ps2/rileylink_ios.git
-[submodule "Amplitude-iOS"]
-	path = Amplitude-iOS
-	url = https://github.com/LoopKit/Amplitude-iOS.git
-	branch = decreepify
-[submodule "MKRingProgressView"]
-	path = MKRingProgressView
-	url = https://github.com/LoopKit/MKRingProgressView.git
-[submodule "NightscoutAPIClient"]
-	path = NightscoutAPIClient
-	url = https://github.com/ivalkou/NightscoutAPIClient.git
+	url = https://github.com/loopnlearn/rileylink_ios.git
 [submodule "xdrip-client-swift"]
 	path = xdrip-client-swift
-	url = https://github.com/alekst1d/xdrip-client-swift
-        branch = master
+	url = https://github.com/loopnlearn/xdrip-client-swift
diff --git a/Amplitude-iOS b/Amplitude-iOS
diff --git a/CGMBLEKit b/CGMBLEKit
diff --git a/G4ShareSpy b/G4ShareSpy
diff --git a/Gemfile b/Gemfile
diff --git a/Loop b/Loop
diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/Loop.xcworkspace/contents.xcworkspacedata
diff --git a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "cryptoswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/krzyzanowskim/CryptoSwift",
+      "state" : {
+        "revision" : "12f2389aca4a07e0dd54c86ec23d0721ed88b8db",
+        "version" : "1.4.3"
+      }
+    },
+  ],
+  "version" : 2
+}
diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme
@@ -300,6 +300,20 @@
                ReferencedContainer = "container:NightscoutAPIClient/NightscoutAPIClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "84752E8126ED0FFE009FD801"
+               BuildableName = "OmniBLE.framework"
+               BlueprintName = "OmniBLE"
+               ReferencedContainer = "container:OmniBLE/OmniBLE.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -384,6 +398,34 @@
                ReferencedContainer = "container:xdrip-client-swift/xDripClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "432B0E871CDFC3C50045347B"
+               BuildableName = "LibreDirectClient.framework"
+               BlueprintName = "LibreDirectClient"
+               ReferencedContainer = "container:libre-direct-client-swift/LibreDirectClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43A8EC81210E664300A81379"
+               BuildableName = "LibreDirectClientUI.framework"
+               BlueprintName = "LibreDirectClientUI"
+               ReferencedContainer = "container:libre-direct-client-swift/LibreDirectClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -393,7 +435,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "43776F8B1B8022E90074EA36"
-               BuildableName = "FreeAPS.app"
+               BuildableName = "Loop.app"
                BlueprintName = "Loop"
                ReferencedContainer = "container:Loop/Loop.xcodeproj">
             </BuildableReference>
@@ -423,7 +465,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "43776F8B1B8022E90074EA36"
-            BuildableName = "FreeAPS.app"
+            BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop/Loop.xcodeproj">
          </BuildableReference>
@@ -539,6 +581,16 @@
                ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "84752E8A26ED0FFE009FD801"
+               BuildableName = "OmniBLETests.xctest"
+               BlueprintName = "OmniBLETests"
+               ReferencedContainer = "container:OmniBLE/OmniBLE.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -556,7 +608,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "43776F8B1B8022E90074EA36"
-            BuildableName = "FreeAPS.app"
+            BuildableName = "Loop.app"
             BlueprintName = "Loop"
             ReferencedContainer = "container:Loop/Loop.xcodeproj">
          </BuildableReference>

diff --git a/LoopConfigOverride.xcconfig b/LoopConfigOverride.xcconfig
@@ -1,17 +1,14 @@
-//
+// This enables a persistent override file used across clones at the same level
+#include? "../../LoopConfigOverride.xcconfig"
 
 // Override this if you don't want the default com.${DEVELOPMENT_TEAM}.loopkit that loop uses
 // MAIN_APP_BUNDLE_IDENTIFIER = com.myname.loop
 
 // Customize this to change the app name displayed
-MAIN_APP_DISPLAY_NAME = FreeAPS
-
-MAIN_APP_PRODUCT_NAME = FreeAPS
+// MAIN_APP_DISPLAY_NAME = Loop
 
 // Features
-// SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) FEATURE_OVERRIDES_DISABLED
-
-// Assets
-INCLUDED_SOURCE_FILE_NAMES = AdditionalAssets.xcassets
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) ALLOW_SIMULATORS_ENABLED //ALLOW_DEBUG_FEATURES_ENABLED
 
-APPICON_NAME = CustomLoopIcon
+// Put your team id here for signing
+// LOOP_DEVELOPMENT_TEAM = YOUR_ID_HERE
diff --git a/LoopKit b/LoopKit
diff --git a/MKRingProgressView b/MKRingProgressView
diff --git a/OmniBLE b/OmniBLE
diff --git a/README.md b/README.md
@@ -1,34 +1,24 @@
-# Attention please!
+## Do Not Use This Branch
 
-There are so many people who rely on the FreeAPS fork of Loop that it has been forked again to the loopnlearn github site. There are no guarantees as to how long this support can be maintained, but the loopnlearn team will do their best and are willing to accept pull requests.
+This branch is kept for historical reasons. It is not supported and might not be usable with newer versions of Xcode and iOS.
 
-Ivan - the originator of the FreeAPS project (ivalkou github site) has frozen his repository. All the forces of Ivan's team are aimed at developing a new project FreeAPS X based on OpenAPS. 
+Please refer to the original repository to build Loop Verson 3 (and later): https://github.com/LoopKit/LoopWorkspace
 
+* That is where Loop updates originate. 
 
-# LoopWorkspace
+* The `main` and `dev` branches for this GitHub username (loopnlearn) fork of LoopWorkspace are manually updated to match LoopKit / LoopWorkspace, but you should not rely on this process.
 
-## Clone
+* The other branches are no longer supported and should not be used.
 
-This repository uses git submodules to pull in the various workspace dependencies.
+## History
 
-To clone this repo:
+There was a fork created from LoopKit / LoopWorkspace called ivalkou / LoopWorkspace which was used to create an alternative to Loop version 2, called FreeAPS.
 
-```
-git clone --branch=freeaps --recurse-submodules https://github.com/loopnlearn/LoopWorkspace
-```
+This fork, loopnlearn / LoopWorkspace was created from ivalkou / LoopWorkspace and used to support the FreeAPS version of Loop 2 after support was dropped by the ivalkou GitHub account.
 
+* **FreeAPS is no longer supported and should not be used** 
+* Most features people used with FreeAPS are now included in Loop 3 or can be added with customization
 
-## Open
+Some branches in this repository were configured to add specific customizations for earlier versions of Loop 3. These are no longer needed and are not kept updated. [Customization scripts](https://www.loopandlearn.org/custom-code) are provided instead.
 
-Change to the cloned directory and open the workspace in Xcode:
-
-```
-cd LoopWorkspace
-xed .
-```
-
-## Build
-
-Select the "Loop (Workspace)" scheme (not the "Loop" scheme) and Build, Run, or Test.
-
-<a href="/docs/scheme-selection.png"><img src="/docs/scheme-selection.png?raw=true" alt="Image showing how to select the Loop (Workspace) scheme in Xcode" width="400"></a>
+* Branches such as **main_lnl_patches** are out-of-date and should not be used
diff --git a/SwiftCharts b/SwiftCharts
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
diff --git a/fastlane/Appfile.swift b/fastlane/Appfile.swift
diff --git a/fastlane/Fastfile.swift b/fastlane/Fastfile.swift