Update to CGMBLEKit 2.1 with G6 support, and update settings UI

Cartfile

@@ -1,5 +1,5 @@
 github "LoopKit/LoopKit" == 1.5.6
-github "LoopKit/CGMBLEKit" ~> 2.0
+github "LoopKit/CGMBLEKit" == 2.1
 github "i-schuetz/SwiftCharts" == 0.6.1
 github "mddub/dexcom-share-client-swift" == 0.4.1
 github "mddub/G4ShareSpy" == 0.3.3

Cartfile.resolved

@@ -1,5 +1,5 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "v2.0"
+github "LoopKit/CGMBLEKit" "v2.1.0"
 github "LoopKit/LoopKit" "v1.5.6"
 github "i-schuetz/SwiftCharts" "6b55a26a7b0b95e49202ddc1db5404702fce114f"
 github "mddub/G4ShareSpy" "v0.3.3"

Loop/Info.plist

@@ -37,6 +37,7 @@
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
+		<string>dexcomg6</string>
 		<string>dexcomcgm</string>
 		<string>dexcomshare</string>
 	</array>

Loop/Managers/CGM/DexCGMManager.swift

@@ -183,7 +183,7 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
         return HKDevice(
             name: "CGMBLEKit",
             manufacturer: "Dexcom",
-            model: "G5 Mobile",
+            model: "G5/G6 Mobile",
             hardwareVersion: nil,
             firmwareVersion: nil,
             softwareVersion: String(CGMBLEKitVersionNumber),

Loop/Managers/DeviceDataManager.swift

@@ -192,7 +192,7 @@ final class DeviceDataManager {
     func updateTimerTickPreference() {
         queue.async {
             /// Controls the management of the RileyLink timer tick, which is a reliably-changing BLE
-            /// characteristic which can cause the app to wake. For most users, the G5 Transmitter and
+            /// characteristic which can cause the app to wake. For most users, the G5/G6 Transmitter and
             /// G4 Receiver are reliable as hearbeats, but users who find their resources extremely constrained
             /// due to greedy apps or older devices may choose to always enable the timer by always setting `true`
             self.rileyLinkManager.timerTickEnabled = self.isPumpDataStale() || !(self.cgmManager?.providesBLEHeartbeat == true)

Loop/Models/CGM.swift

@@ -17,8 +17,15 @@ enum CGM {
         switch self {
         case .g4:
             return URL(string: "dexcomshare://")
-        case .g5:
-            return URL(string: "dexcomcgm://")
+        case .g5(let transmitterID):
+            if let transmitterID = transmitterID {
+                if transmitterID.hasPrefix("4") {
+                    return URL(string: "dexcomcgm://")
+                } else {
+                    return URL(string: "dexcomg6://")
+                }
+            }
+            return nil
         case .enlite:
             return nil
         }

Loop/Models/Glucose.swift

@@ -22,7 +22,7 @@ extension Glucose: SensorDisplayable {
         case .ok:
             status = ""
         case .lowBattery:
-            status = NSLocalizedString("Low Battery", comment: "The description of a low G5 transmitter battery with a leading space")
+            status = NSLocalizedString("Low Battery", comment: "The description of a low G5/G6 transmitter battery with a leading space")
         case .unknown(let value):
             status = String(format: "%02x", value)
         }

Loop/View Controllers/SettingsTableViewController.swift

@@ -231,7 +231,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             case .g5TransmitterID:
                 let configCell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
 
-                configCell.textLabel?.text = NSLocalizedString("Transmitter ID", comment: "The title text for the Dexcom G5 transmitter ID config value")
+                configCell.textLabel?.text = NSLocalizedString("Transmitter ID", comment: "The title text for the Dexcom G5/G6 transmitter ID config value")
 
                 if case .g5(let transmitterID)? = dataManager.cgm {
                     configCell.detailTextLabel?.text = transmitterID ?? TapToSetString
@@ -257,7 +257,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
                         switchCell.switch?.isOn = false
                     }
 
-                    switchCell.textLabel?.text = NSLocalizedString("G5 Transmitter", comment: "The title text for the G5 Transmitter switch cell")
+                    switchCell.textLabel?.text = NSLocalizedString("G5/G6 Transmitter", comment: "The title text for the G5/G6 Transmitter switch cell")
                     switchCell.switch?.addTarget(self, action: #selector(g5Changed(_:)), for: .valueChanged)
                 case .dexcomShare, .g5TransmitterID:
                     assertionFailure()

Loop/View Controllers/TextFieldTableViewController.swift

@@ -40,7 +40,7 @@ extension TextFieldTableViewController {
 
         vc.placeholder = NSLocalizedString("Enter the 6-digit transmitter ID", comment: "The placeholder text instructing users how to enter a pump ID")
         vc.value = value
-        vc.contextHelp = NSLocalizedString("The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the G5 receiver and mobile app.", comment: "Instructions on where to find the transmitter ID")
+        vc.contextHelp = NSLocalizedString("The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app.", comment: "Instructions on where to find the transmitter ID")
 
         return vc
     }

Loop/es.lproj/Localizable.strings

@@ -184,7 +184,7 @@
 "G4 Share Receiver" = "Receptor G4 Share";
 
 /* The title text for the G5 Transmitter switch cell */
-"G5 Transmitter" = "Transmisor G5";
+"G5/G6 Transmitter" = "Transmisor G5/G6";
 
 /* The title of the glucose and prediction graph */
 "Glucose" = "Glucosa";
@@ -389,7 +389,7 @@
 "The pump region can be found printed on the back as part of the model number (REF), for example: MMT-551NAB, or MMT-515LWWS. If the model number contains \"NA\" or \"CA\", then the region is North America. If if contains \"WW\", then the region is World-Wide." = "La región de la microinfusora puede enconstrarse impresa en la parte trasera como parte del código de modelo ( REF ), por ejemplo MMT-551NAB o MMT-515LWWS. Si el código de modelo contiene \"NA\" o \"CA\", la región es Norte América. Si contiene \"WW\" la región es Mundial.";
 
 /* Instructions on where to find the transmitter ID */
-"The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the G5 receiver and mobile app." = "El ID de transmisor puede encontrarse impreso en la parte trasera del dispositivo, a un lado de la caja en la que estaba empacado y dentro del menú de ajustes del receptor G5 y la app móvil";
+"The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app." = "El ID de transmisor puede encontrarse impreso en la parte trasera del dispositivo, a un lado de la caja en la que estaba empacado y dentro del menú de ajustes del receptor y la app móvil";
 
 /* The description of the switch which toggles retrospective correction effects */
 "This will more aggresively increase or decrease basal delivery when glucose movement doesn't match the carbohydrate and insulin-based model." = "Esto incrementará o decrementará mas agresivamente la entrega de basales cuando el movimiento de glucosa no concuerde con el modelo de insulina y carbohidratos.";

Loop/it.lproj/Localizable.strings

@@ -181,7 +181,7 @@
 "G4 Share Receiver" = "G4 Ricevitore Share";
 
 /* The title text for the Dexcom G5 transmitter ID config value */
-"G5 Transmitter ID" = "G5 ID Trasmettitore";
+"G5/G6 Transmitter ID" = "G5/G6 ID Trasmettitore";
 
 /* The title of the glucose and prediction graph */
 "Glucose" = "Glicemie";
@@ -328,7 +328,7 @@
 "The pump ID can be found printed on the back, or near the bottom of the STATUS/Esc screen. It is the strictly numerical portion of the serial number (shown as SN or S/N)." = "L'ID della pompa si trova stampato sul retro, o vicino al fondo della schermata STATO/Esc. È la parte strettamente numerica del numero di serie (indicato come SN o S/N).";
 
 /* Instructions on where to find the transmitter ID */
-"The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the G5 receiver and mobile app." = "L'ID trasmettitore può essere trovato stampato sul retro del dispositivo, sul lato della scatola, e all'interno del menu impostazione del ricevitore G5 all'interno dell'applicazione mobile.";
+"The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app." = "L'ID trasmettitore può essere trovato stampato sul retro del dispositivo, sul lato della scatola, e all'interno del menu impostazione del ricevitore all'interno dell'applicazione mobile.";
 
 /* The description of the switch which toggles retrospective correction effects */
 "This will more aggresively increase or decrease basal delivery when glucose movement doesn't match the carbohydrate and insulin-based model." = "Questo sarà più aggressivo all'aumentare o al diminuire della basale quando il movimento di glucosio non corrisponde al modello di carboidrati e al modello insulino-basale";

Loop/ru.lproj/Localizable.strings

@@ -197,7 +197,7 @@
 "G4 Share Receiver" = "Ресивер G4 Шеар";
 
 /* The title text for the G5 Transmitter switch cell */
-"G5 Transmitter" = "Трансмиттер G5";
+"G5/G6 Transmitter" = "Трансмиттер G5/G6";
 
 /* The title of the glucose and prediction graph */
 "Glucose" = "Гликемия";
@@ -254,7 +254,7 @@
 /* The notification alert describing a long-lasting loop failure. The substitution parameter is the time interval since the last loop */
 "Loop has not completed successfully in %@" = "Ну удалось успешно  замкнуть цикл/контур в %@";
 
-/* The description of a low G5 transmitter battery with a leading space */
+/* The description of a low transmitter battery with a leading space */
 "Low Battery" = "Низкий заряд батареи";
 
 /* The title text for the maximum basal rate value */
@@ -399,7 +399,7 @@
 "The pump ID can be found printed on the back, or near the bottom of the STATUS/Esc screen. It is the strictly numerical portion of the serial number (shown as SN or S/N)." = "инд номер помпы находится на ее задней стенке или снизу экрана состояния STATUS/ESC. Это исключительно цифровая часть серийного номера (обозначаемого SN или S/N) ";
 
 /* Instructions on where to find the transmitter ID */
-"The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the G5 receiver and mobile app." = "Инд. номер трансмиттера находится на задней стенке устройства , сбоку упаковочной коробки, в настроечном меню ресивера G5 и мобильного приложения";
+"The transmitter ID can be found printed on the back of the device, on the side of the box it came in, and from within the settings menus of the receiver and mobile app." = "Инд. номер трансмиттера находится на задней стенке устройства , сбоку упаковочной коробки, в настроечном меню ресивера и мобильного приложения";
 
 /* The description of the switch which toggles retrospective correction effects */
 "This will more aggresively increase or decrease basal delivery when glucose movement doesn't match the carbohydrate and insulin-based model." = "Это более радикально понизит или увеличит подачу базала в тех случаях когда динамика гликемии не соответствует моделям основанным на углеводах и инсулине";