Skip to content

Display HIGH/LOW for out-of-range BG on main screen #565

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

Open
bjorkert wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Display HIGH/LOW for out-of-range BG on main screen #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions LoopFollow/Controllers/Nightscout/BGData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,19 @@ extension MainViewController {
let latestBG = entries[latestEntryIndex].sgv
let priorBG = entries[latestEntryIndex - 1].sgv
let deltaBG = latestBG - priorBG
let lastBGTime = entries[latestEntryIndex].date

self.updateServerText(with: sourceName)

// Set BGText with the latest BG value
self.setBGTextColor()
self.updateBGTextAppearance()

Observable.shared.bgText.value = Localizer.toDisplayUnits(String(latestBG))
if latestBG <= 39 {
Observable.shared.bgText.value = "LOW"
} else if latestBG >= 400 {
Observable.shared.bgText.value = "HIGH"
} else {
Observable.shared.bgText.value = Localizer.toDisplayUnits(String(latestBG))
}
Observable.shared.bg.value = latestBG

// Direction handling
Expand Down
10 changes: 8 additions & 2 deletions LoopFollow/ViewControllers/MainViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
Storage.shared.colorBGText.$value
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
self?.setBGTextColor()
self?.updateBGTextAppearance()
}
.store(in: &cancellables)

Expand Down Expand Up @@ -1085,7 +1085,7 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
}
}

func setBGTextColor() {
func updateBGTextAppearance() {
if bgData.count > 0 {
let latestBG = bgData[bgData.count - 1].sgv
var color = NSUIColor.label
Expand All @@ -1105,6 +1105,12 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
}

BGText.textColor = color

if latestBG <= 39 || latestBG >= 400 {
BGText.font = UIFont.systemFont(ofSize: 65, weight: .black)
} else {
BGText.font = UIFont.systemFont(ofSize: 85, weight: .black)
}
}
}

Expand Down