Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging 5.4.0 #575

Merged
merged 53 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
cbd6f88
Big fix for false +0 (or +0.0 mmol) bg deltas
aug0211 Jun 19, 2024
fd192c3
Added Bubble Nano support
EquilHack Aug 6, 2024
ef47056
add tab/big number view to watch app
paulplant Aug 16, 2024
60e8ff7
watch app follower network icon fix
paulplant Aug 19, 2024
f1cd83b
include slope info in BGReadingsView
paulplant Aug 19, 2024
71853c4
Bump rexml from 3.2.8 to 3.3.6
dependabot[bot] Aug 22, 2024
e1a3ea2
UI changes for clearer Transmitter/xDrip algorithm and Calibration ty…
paulplant Aug 23, 2024
825e01c
autostart G6 when warm-up detected with newer sensorStartDate
paulplant Aug 26, 2024
f83f98e
fix activeSensorDescription for Libre sensorTypes
paulplant Aug 26, 2024
e2d8940
updates to BgReadingsView
paulplant Aug 27, 2024
ce69c9b
Add "Waiting for data..." to SensorInfoView for when a new transmitte…
paulplant Aug 27, 2024
6188fc9
ensure developer settings load hidden after force-close/crash
paulplant Aug 28, 2024
137a25b
Rename SettingsViewDexcomSettingsViewModel -> SettingsViewDexcomShare…
paulplant Aug 28, 2024
e5a0936
Add "Required" identification to Dexcom Share username/password/seria…
paulplant Aug 28, 2024
1a2e65f
improvements to G5/G6/ONE UI handling
paulplant Aug 30, 2024
876de12
move "smooth libre values" from developer settings to Libre2 peripher…
paulplant Sep 7, 2024
d26640d
CGM connected string update
paulplant Sep 7, 2024
3be233c
Change "Libre 2 Direct" to "Libre 2 EU" (incl. Plus) to avoid confusion
paulplant Sep 15, 2024
dbf147c
Layout warnings + observer fixes
paulplant Sep 18, 2024
eeee5a4
WatchApp updates
paulplant Sep 18, 2024
13650d5
improve follower connection status for Watch App + widget changes
paulplant Sep 20, 2024
6319bb1
Xcode16 compiler warning fixes
paulplant Sep 20, 2024
ecc398a
high contrast contact image option implemented
paulplant Sep 20, 2024
6bff2f1
Rename "NightScout" to "Nightscout"
paulplant Sep 21, 2024
eee9488
refactor Live Activity logic/UI
paulplant Sep 21, 2024
2712b81
improvement to reject older (>12hr) userInfo messages sent to the Wat…
paulplant Sep 22, 2024
78d7c55
systemSmall widget updates + revert previous change to abbreviatedAct…
paulplant Sep 23, 2024
71c422b
Correction to "mins ago" string in Watch app
paulplant Sep 24, 2024
9d7379b
WatchManager + WatchState updates
paulplant Sep 23, 2024
116ab20
Merge pull request #572 from paulplant/develop
paulplant Sep 25, 2024
af670a1
Merge pull request #563 from bubbledevteam/develop
paulplant Sep 25, 2024
a06623b
Merge pull request #565 from JohanDegraeve/dependabot/bundler/rexml-3…
paulplant Sep 25, 2024
74248cd
Merge pull request #545 from aug0211/big-fix-false-0-bg-delta
paulplant Sep 25, 2024
ddf48b0
correction to categoryWatchManager logging
paulplant Sep 28, 2024
c39620e
Correction to section count when displaying DexcomType in view contro…
paulplant Sep 28, 2024
527c695
suppress contact being deleted when disabled Contact Image option
paulplant Sep 28, 2024
09995b2
update libreLinkUpVersionDefault to 4.12.0
paulplant Oct 4, 2024
07f4656
delta calculation/representation re-write for mmol/L
paulplant Oct 6, 2024
364324f
Merge pull request #573 from paulplant/staging-5.4
paulplant Oct 6, 2024
a21c524
Corrections to G6 sensorStartDate handling
paulplant Oct 6, 2024
4f6f9dd
correction to AlertManager logging
paulplant Oct 9, 2024
ba74955
update to LiveActivity logging
paulplant Oct 9, 2024
7c1d9d5
Fix to allow Contact Image to work correctly for follower modes
paulplant Oct 10, 2024
d831908
Rename "Transmitter Algorithm" to "Native Algorithm"
paulplant Oct 10, 2024
048569e
increase maxSensorAgeInDays to 10.5 for G7/ONE+
paulplant Oct 10, 2024
bf7ba4a
change LibreLinkUpFollower to work with no active sensor data
paulplant Oct 12, 2024
0986d7e
avoid G7/ONE+ values after sensor expiry
paulplant Oct 12, 2024
1f7a3cc
correct mmol/L readings for slope view in BgReadingsDetailView
paulplant Oct 12, 2024
e44eccb
add check for keep-alive to Contact Image
paulplant Oct 13, 2024
8c0e7b7
translations added for Algorithm + Calibration Types
paulplant Oct 13, 2024
2117f5c
Merge pull request #574 from paulplant/staging-5.4
paulplant Oct 14, 2024
3adf5f5
translations added for Algorithm + Calibration Types
paulplant Oct 14, 2024
7629b2b
Merge pull request #576 from paulplant/staging-5.4
paulplant Oct 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.6)
strscan
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand Down Expand Up @@ -201,13 +201,13 @@ GEM
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
word_wrap (1.0.0)
xcodeproj (1.24.0)
xcodeproj (1.25.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
rexml (>= 3.3.2, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand Down
16 changes: 6 additions & 10 deletions xDrip Notification Context Extension/NotificationView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct NotificationView: View {
var bgReadingDates: [Date]?
var isMgDl: Bool?
var slopeOrdinal: Int?
var deltaChangeInMgDl: Double?
var deltaValueInUserUnit: Double?
var urgentLowLimitInMgDl: Double?
var lowLimitInMgDl: Double?
var highLimitInMgDl: Double?
Expand Down Expand Up @@ -64,7 +64,7 @@ struct NotificationView: View {
}
.padding(12)

GlucoseChartView(glucoseChartType: .notificationExpanded, bgReadingValues: bgReadingValues, bgReadingDates: bgReadingDates, isMgDl: isMgDl ?? true, urgentLowLimitInMgDl: urgentLowLimitInMgDl ?? 60, lowLimitInMgDl: lowLimitInMgDl ?? 70, highLimitInMgDl: highLimitInMgDl ?? 180, urgentHighLimitInMgDl: urgentHighLimitInMgDl ?? 250, liveActivitySize: nil, hoursToShowScalingHours: nil, glucoseCircleDiameterScalingHours: nil, overrideChartHeight: nil, overrideChartWidth: nil, highContrast: nil)
GlucoseChartView(glucoseChartType: .notificationExpanded, bgReadingValues: bgReadingValues, bgReadingDates: bgReadingDates, isMgDl: isMgDl ?? true, urgentLowLimitInMgDl: urgentLowLimitInMgDl ?? 60, lowLimitInMgDl: lowLimitInMgDl ?? 70, highLimitInMgDl: highLimitInMgDl ?? 180, urgentHighLimitInMgDl: urgentHighLimitInMgDl ?? 250, liveActivityType: nil, hoursToShowScalingHours: nil, glucoseCircleDiameterScalingHours: nil, overrideChartHeight: nil, overrideChartWidth: nil, highContrast: nil)
}
.background(ConstantsAlerts.notificationBackgroundColor)
}
Expand Down Expand Up @@ -104,17 +104,13 @@ struct NotificationView: View {
/// convert the optional delta change int (in mg/dL) to a formatted change value in the user chosen unit making sure all zero values are shown as a positive change to follow Nightscout convention
/// - Returns: a string holding the formatted delta change value (i.e. +0.4 or -6)
func deltaChangeStringInUserChosenUnit() -> String {
if let deltaChangeInMgDl = deltaChangeInMgDl, let isMgDl = isMgDl {
let deltaSign: String = deltaChangeInMgDl > 0 ? "+" : ""
let valueAsString = deltaChangeInMgDl.mgdlToMmolAndToString(mgdl: isMgDl)
if let deltaValueInUserUnit = deltaValueInUserUnit, let isMgDl = isMgDl {
let deltaSign: String = deltaValueInUserUnit > 0 ? "+" : ""
let deltaValueAsString = isMgDl ? deltaValueInUserUnit.mgDlToMmolAndToString(mgDl: isMgDl) : deltaValueInUserUnit.mmolToString()

// quickly check "value" and prevent "-0mg/dl" or "-0.0mmol/l" being displayed
// show unitized zero deltas as +0 or +0.0 as per Nightscout format
if isMgDl {
return (deltaChangeInMgDl > -1 && deltaChangeInMgDl < 1) ? "+0" : (deltaSign + valueAsString)
} else {
return (deltaChangeInMgDl > -0.1 && deltaChangeInMgDl < 0.1) ? "+0.0" : (deltaSign + valueAsString)
}
return deltaValueInUserUnit == 0.0 ? (isMgDl ? "+0" : "+0.0") : (deltaSign + deltaValueAsString)
} else {
return (isMgDl ?? true) ? "-" : "-.-"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
var bgReadingDates: [Date]?
var isMgDl: Bool?
var slopeOrdinal: Int?
var deltaChangeInMgDl: Double?
var deltaValueInUserUnit: Double?
var urgentLowLimitInMgDl: Double?
var lowLimitInMgDl: Double?
var highLimitInMgDl: Double?
Expand Down Expand Up @@ -50,7 +50,7 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
bgReadingValues = userInfo["bgReadingValues"] as? [Double] ?? [0]
isMgDl = userInfo["isMgDl"] as? Bool ?? true
slopeOrdinal = userInfo["slopeOrdinal"] as? Int ?? 0
deltaChangeInMgDl = userInfo["deltaChangeInMgDl"] as? Double ?? 0
deltaValueInUserUnit = userInfo["deltaValueInUserUnit"] as? Double ?? 0
urgentLowLimitInMgDl = userInfo["urgentLowLimitInMgDl"] as? Double ?? 0
lowLimitInMgDl = userInfo["lowLimitInMgDl"] as? Double ?? 0
highLimitInMgDl = userInfo["highLimitInMgDl"] as? Double ?? 0
Expand All @@ -65,15 +65,15 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
bgValueInMgDl = (bgReadingValues?.count ?? 0) > 0 ? bgReadingValues?[0] : nil
bgReadingDate = (bgReadingDates?.count ?? 0) > 0 ? bgReadingDates?[0] : nil

bgValueStringInUserChosenUnit = (bgReadingValues?.count ?? 0) > 0 ? bgReadingValues?[0].mgdlToMmolAndToString(mgdl: isMgDl ?? true) ?? "" : ""
bgValueStringInUserChosenUnit = (bgReadingValues?.count ?? 0) > 0 ? bgReadingValues?[0].mgDlToMmolAndToString(mgDl: isMgDl ?? true) ?? "" : ""

let vc = UIHostingController(rootView: NotificationView(
alertTitle: alertTitle,
bgReadingValues: bgReadingValues,
bgReadingDates: bgReadingDates,
isMgDl: isMgDl,
slopeOrdinal: slopeOrdinal,
deltaChangeInMgDl: deltaChangeInMgDl,
deltaValueInUserUnit: deltaValueInUserUnit,
urgentLowLimitInMgDl: urgentLowLimitInMgDl,
lowLimitInMgDl: lowLimitInMgDl,
highLimitInMgDl: highLimitInMgDl,
Expand Down
8 changes: 4 additions & 4 deletions xDrip Watch App/DataModels/NotificationController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class NotificationController: WKUserNotificationHostingController<NotificationVi
var bgReadingDates: [Date]?
var isMgDl: Bool?
var slopeOrdinal: Int?
var deltaChangeInMgDl: Double?
var deltaValueInUserUnit: Double?
var urgentLowLimitInMgDl: Double?
var lowLimitInMgDl: Double?
var highLimitInMgDl: Double?
Expand All @@ -35,7 +35,7 @@ class NotificationController: WKUserNotificationHostingController<NotificationVi
bgReadingDates: bgReadingDates,
isMgDl: isMgDl,
slopeOrdinal: slopeOrdinal,
deltaChangeInMgDl: deltaChangeInMgDl,
deltaValueInUserUnit: deltaValueInUserUnit,
urgentLowLimitInMgDl: urgentLowLimitInMgDl,
lowLimitInMgDl: lowLimitInMgDl,
highLimitInMgDl: highLimitInMgDl,
Expand All @@ -61,7 +61,7 @@ class NotificationController: WKUserNotificationHostingController<NotificationVi
bgReadingValues = userInfo["bgReadingValues"] as? [Double] ?? [0]
isMgDl = userInfo["isMgDl"] as? Bool ?? true
slopeOrdinal = userInfo["slopeOrdinal"] as? Int ?? 0
deltaChangeInMgDl = userInfo["deltaChangeInMgDl"] as? Double ?? 0
deltaValueInUserUnit = userInfo["deltaValueInUserUnit"] as? Double ?? 0
urgentLowLimitInMgDl = userInfo["urgentLowLimitInMgDl"] as? Double ?? 0
lowLimitInMgDl = userInfo["lowLimitInMgDl"] as? Double ?? 0
highLimitInMgDl = userInfo["highLimitInMgDl"] as? Double ?? 0
Expand All @@ -76,7 +76,7 @@ class NotificationController: WKUserNotificationHostingController<NotificationVi
bgValueInMgDl = (bgReadingValues?.count ?? 0) > 0 ? bgReadingValues?[0] : nil
bgReadingDate = (bgReadingDates?.count ?? 0) > 0 ? bgReadingDates?[0] : nil

bgValueStringInUserChosenUnit = (bgReadingValues?.count ?? 0) > 0 ? bgReadingValues?[0].mgdlToMmolAndToString(mgdl: isMgDl ?? true) ?? "" : ""
bgValueStringInUserChosenUnit = (bgReadingValues?.count ?? 0) > 0 ? bgReadingValues?[0].mgDlToMmolAndToString(mgDl: isMgDl ?? true) ?? "" : ""

}
}
Loading