From 386b59121c9801cdaf6ba3b8243562d323f4121a Mon Sep 17 00:00:00 2001 From: Dirk Hermanns Date: Tue, 28 Sep 2021 20:53:01 +0200 Subject: [PATCH] #160: Now the mmols should be really rounded if there is not enough space on the complication --- nightguard WatchKit App/Info.plist | 2 +- nightguard WatchKit Extension/Info.plist | 2 +- nightguard.xcodeproj/project.pbxproj | 12 ++++++------ nightguard/Info.plist | 2 +- nightguard/UnitsConverter.swift | 5 +++-- nightguardTests/Info.plist | 2 +- nightguardUITests/Info.plist | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/nightguard WatchKit App/Info.plist b/nightguard WatchKit App/Info.plist index d06ebac9..a25de267 100644 --- a/nightguard WatchKit App/Info.plist +++ b/nightguard WatchKit App/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 747 + 748 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/nightguard WatchKit Extension/Info.plist b/nightguard WatchKit Extension/Info.plist index b8bed73f..ff0f5eaf 100644 --- a/nightguard WatchKit Extension/Info.plist +++ b/nightguard WatchKit Extension/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 747 + 748 CLKComplicationPrincipalClass $(PRODUCT_MODULE_NAME).ComplicationController NSAppTransportSecurity diff --git a/nightguard.xcodeproj/project.pbxproj b/nightguard.xcodeproj/project.pbxproj index 5de2aac8..79f3673e 100644 --- a/nightguard.xcodeproj/project.pbxproj +++ b/nightguard.xcodeproj/project.pbxproj @@ -2101,7 +2101,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 747; + CURRENT_PROJECT_VERSION = 748; DEVELOPMENT_TEAM = BSAVUVP8PV; INFOPLIST_FILE = "nightguard WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -2132,7 +2132,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 747; + CURRENT_PROJECT_VERSION = 748; DEVELOPMENT_TEAM = BSAVUVP8PV; INFOPLIST_FILE = "nightguard WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -2164,7 +2164,7 @@ CODE_SIGN_ENTITLEMENTS = "nightguard WatchKit App/nightguard.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 747; + CURRENT_PROJECT_VERSION = 748; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; IBSC_MODULE = scoutwatch_WatchKit_Extension; @@ -2197,7 +2197,7 @@ CODE_SIGN_ENTITLEMENTS = "nightguard WatchKit App/nightguard.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 747; + CURRENT_PROJECT_VERSION = 748; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; IBSC_MODULE = scoutwatch_WatchKit_Extension; @@ -2227,7 +2227,7 @@ CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 747; + CURRENT_PROJECT_VERSION = 748; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; ENABLE_BITCODE = NO; @@ -2255,7 +2255,7 @@ CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 747; + CURRENT_PROJECT_VERSION = 748; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; ENABLE_BITCODE = NO; diff --git a/nightguard/Info.plist b/nightguard/Info.plist index b62454cb..3b963d73 100644 --- a/nightguard/Info.plist +++ b/nightguard/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 747 + 748 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/nightguard/UnitsConverter.swift b/nightguard/UnitsConverter.swift index c81a7140..7dc6f962 100644 --- a/nightguard/UnitsConverter.swift +++ b/nightguard/UnitsConverter.swift @@ -41,7 +41,8 @@ class UnitsConverter { } // Converts the internally mg/dL to mmol if thats the defined - // Unit to be used. + // Unit to be used. To save some space, the mmol values are rounded. + // This is used to display the values on the circular complication static func mgdlToShortDisplayUnits(_ value : String) -> String { if value == "---" { @@ -63,7 +64,7 @@ class UnitsConverter { return value } - return toMmol(value) + return toRoundedMmol(value) } static func mgdlToDisplayUnitsWithSign(_ value : String) -> String { diff --git a/nightguardTests/Info.plist b/nightguardTests/Info.plist index c0212ca1..7e71f6a0 100644 --- a/nightguardTests/Info.plist +++ b/nightguardTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 747 + 748 diff --git a/nightguardUITests/Info.plist b/nightguardUITests/Info.plist index c0212ca1..7e71f6a0 100644 --- a/nightguardUITests/Info.plist +++ b/nightguardUITests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 747 + 748