mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

reset develop and merge bgObjectives branch

This commit is contained in:
Paul Plant 2020-07-12 10:49:48 +02:00
parent cbf43f4554
commit e939ac9595
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Podfile.lock
View File

@ -9,7 +9,7 @@ DEPENDENCIES:
- SwiftCharts (~> 0.6.5)
SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
trunk:
- CryptoSwift
- SwiftCharts

2
xdrip/Supporting Files/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>3898</string>
<string>3899</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

11
xdrip/View Controllers/Root View Controller/RootViewController.swift
View File

@ -1082,14 +1082,7 @@ final class RootViewController: UIViewController {
} else if lastReading.calculatedValue <= UserDefaults.standard.lowMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) {
valueLabelOutlet.textColor = UIColor.red
} else if lastReading.calculatedValue >= UserDefaults.standard.highMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) {
// set BG value label color, depending on value
// if below urgentLow or above urgentHigh, set to red
// if between urgentLow/urgentHigh and target, set to yellow
// if between low and high, set/keep to green
if lastReading.calculatedValue > UserDefaults.standard.urgentHighMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) || lastReading.calculatedValue < UserDefaults.standard.urgentLowMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) {
valueLabelOutlet.textColor = UIColor.red
} else if ( lastReading.calculatedValue <= UserDefaults.standard.urgentHighMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) && lastReading.calculatedValue > UserDefaults.standard.highMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) ) || ( lastReading.calculatedValue >= UserDefaults.standard.urgentLowMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) && lastReading.calculatedValue < UserDefaults.standard.lowMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) ) {
valueLabelOutlet.textColor = UIColor.yellow
} else {
// keep text colour
valueLabelOutlet.textColor = UIColor.green
@ -1262,7 +1255,6 @@ final class RootViewController: UIViewController {
}
// MARK: - conform to CGMTransmitter protocol
/// conform to CGMTransmitterDelegate
extension RootViewController: CGMTransmitterDelegate {
@ -1306,7 +1298,6 @@ extension RootViewController: CGMTransmitterDelegate {
}
// MARK: - conform to UITabBarControllerDelegate protocol
/// conform to UITabBarControllerDelegate, want to receive info when user clicks specific tabs
extension RootViewController: UITabBarControllerDelegate {
@ -1327,7 +1318,6 @@ extension RootViewController: UITabBarControllerDelegate {
}
// MARK: - conform to UNUserNotificationCenterDelegate protocol
/// conform to UNUserNotificationCenterDelegate, for notifications
extension RootViewController: UNUserNotificationCenterDelegate {
@ -1418,7 +1408,6 @@ extension RootViewController: UNUserNotificationCenterDelegate {
}
// MARK: - conform to NightScoutFollowerDelegate protocol
extension RootViewController:NightScoutFollowerDelegate {
func nightScoutFollowerInfoReceived(followGlucoseDataArray: inout [NightScoutBgReading]) {

4
xdrip/xdrip.entitlements
View File

@ -6,9 +6,9 @@
<true/>
<key>com.apple.developer.healthkit.access</key>
<array/>
<key>com.apple.security.application-groups</key>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.RNX44PP998.loopkit.LoopGroup</string>
<string>group.net.paulplant.xdripswift</string>
</array>
</dict>
</plist>