Skip to content

Clear badge counter if bg data is stale #285

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.

Sign up for GitHub

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

Merged
marionbarker merged 2 commits into from
Apr 24, 2024
Merged

Clear badge counter if bg data is stale #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f604091
Remove badge for stale bg data
bjorkert Apr 24, 2024
dbe7bce
Avoid crash with only one bg reading
bjorkert Apr 24, 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
7 changes: 5 additions & 2 deletions LoopFollow/Controllers/Nightscout/BGData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,9 @@ extension MainViewController {
self.startBGTimer(time: 300 - secondsAgo + Double(UserDefaultsRepository.bgUpdateDelay.value))
let timerVal = 310 - secondsAgo
print("##### started 5:10 bg timer: \(timerVal)")
self.updateBadge(val: data[0].sgv)
self.evaluateSpeakConditions(currentValue: data[0].sgv, previousValue: data[1].sgv)
if data.count > 1 {
self.evaluateSpeakConditions(currentValue: data[0].sgv, previousValue: data[1].sgv)
}
}
}

Expand Down Expand Up @@ -276,8 +277,10 @@ extension MainViewController {
attributeString.addAttribute(.strikethroughStyle, value: NSUnderlineStyle.single.rawValue, range: NSRange(location: 0, length: attributeString.length))
if deltaTime >= 12 { // Data is stale
attributeString.addAttribute(.strikethroughColor, value: UIColor.systemRed, range: NSRange(location: 0, length: attributeString.length))
self.updateBadge(val: 0)
} else { // Data is fresh
attributeString.addAttribute(.strikethroughColor, value: UIColor.clear, range: NSRange(location: 0, length: attributeString.length))
self.updateBadge(val: latestBG)
}
self.BGText.attributedText = attributeString

Expand Down
6 changes: 2 additions & 4 deletions LoopFollow/ViewControllers/MainViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,11 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
}

func updateBadge(val: Int) {
DispatchQueue.main.async {
if UserDefaultsRepository.appBadge.value {
let latestBG = String(val)
UIApplication.shared.applicationIconBadgeNumber = Int(bgUnits.removePeriodAndCommaForBadge(bgUnits.toDisplayUnits(latestBG))) ?? val
} else {
UIApplication.shared.applicationIconBadgeNumber = 0
}
} else {
UIApplication.shared.applicationIconBadgeNumber = 0
}
}

Expand Down