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

fix #106 

Stale data now shown correctly in grey+strikethrough
This commit is contained in:
Paul Plant 2020-05-23 11:03:41 +02:00
parent 5ae71be43b
commit 49c383e945
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdrip.xcodeproj/project.pbxproj
View File

@ -2779,7 +2779,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3009;
DEVELOPMENT_TEAM = RNX44PP998;
DEVELOPMENT_TEAM = 92C77A2942;
INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = (
@ -2787,7 +2787,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.0.1;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_BUNDLE_IDENTIFIER = net.paulplant.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";
@ -2808,7 +2808,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3009;
DEVELOPMENT_TEAM = RNX44PP998;
DEVELOPMENT_TEAM = 92C77A2942;
INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = (
@ -2816,7 +2816,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.0.1;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_BUNDLE_IDENTIFIER = net.paulplant.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";

2
xdrip/Supporting Files/Info.plist
View File

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

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

@ -1021,7 +1021,7 @@ final class RootViewController: UIViewController {
// start creating text for valueLabelOutlet, first the calculated value
var calculatedValueAsString = lastReading.unitizedString(unitIsMgDl: UserDefaults.standard.bloodGlucoseUnitIsMgDl)
// if latestReading older dan 11 minutes, then it should be strikethrough
// if latestReading is older than 11 minutes, then it should be strikethrough
if lastReading.timeStamp < Date(timeIntervalSinceNow: -60 * 11) {
let attributeString: NSMutableAttributedString = NSMutableAttributedString(string: calculatedValueAsString)
@ -1043,9 +1043,12 @@ final class RootViewController: UIViewController {
}
// set color, depending on value lower than low mark or higher than high mark
// if data is stale (over 11 minutes old), show it as gray colour to indicate that it isn't current
// if not, then set color, depending on value lower than low mark or higher than high mark
// set both HIGH and LOW BG values to red as previous yellow for hig is now not so obvious due to in-range colour of green.
if lastReading.calculatedValue <= UserDefaults.standard.lowMarkValueInUserChosenUnit.mmolToMgdl(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) {
if lastReading.timeStamp < Date(timeIntervalSinceNow: -60 * 11) {
valueLabelOutlet.textColor = UIColor.lightGray
} 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) {
valueLabelOutlet.textColor = UIColor.red