Skip to content

Commit c80c8bb

Browse files
SwiftlyNoahSwiftlyNoah
authored
Merge pull request #693 from tidepool-org/noah/LOOP-4994/widget-asset-fix
[LOOP-4994] Widget asset fix
2 parents d737086 + a30cd12 commit c80c8bb

21 files changed

+211
-189
lines changed

‎Loop Widget Extension/Components/BasalView.swift

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import SwiftUI
1010

1111
struct BasalView: View {
1212
let netBasal: NetBasalContext
13-
let isOld: Bool
14-
13+
let isStale: Bool
1514

1615
var body: some View {
1716
let percent = netBasal.percentage
@@ -21,20 +20,20 @@ struct BasalView: View {
2120
BasalRateView(percent: percent)
2221
.overlay(
2322
BasalRateView(percent: percent)
24-
.stroke(isOld ? Color(UIColor.systemGray3) : Color("insulin"), lineWidth: 2)
23+
.stroke(isStale ? Color.staleGray : Color.insulin, lineWidth: 2)
2524
)
26-
.foregroundColor((isOld ? Color(UIColor.systemGray3) : Color("insulin")).opacity(0.5))
25+
.foregroundColor((isStale ? Color.staleGray : Color.insulin).opacity(0.5))
2726
.frame(width: 44, height: 22)
2827

2928
if let rateString = decimalFormatter.string(from: NSNumber(value: rate)) {
3029
Text("\(rateString) U")
3130
.font(.footnote)
32-
.foregroundColor(Color(isOld ? UIColor.systemGray3 : UIColor.secondaryLabel))
31+
.foregroundColor(isStale ? .staleGray : .secondary)
3332
}
3433
else {
3534
Text("-U")
3635
.font(.footnote)
37-
.foregroundColor(Color(isOld ? UIColor.systemGray3 : UIColor.secondaryLabel))
36+
.foregroundColor(isStale ? .staleGray : .secondary)
3837
}
3938
}
4039
}

‎Loop Widget Extension/Components/DeeplinkView.swift

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
//
2+
// DeeplinkView.swift
3+
// Loop Widget Extension
4+
//
5+
// Created by Noah Brauner on 8/9/24.
6+
// Copyright © 2024 LoopKit Authors. All rights reserved.
7+
//
8+
9+
import SwiftUI
10+
11+
fileprivate extension Deeplink {
12+
var deeplinkURL: URL {
13+
URL(string: "loop://\(rawValue)")!
14+
}
15+
16+
var accentColor: Color {
17+
switch self {
18+
case .carbEntry:
19+
return .carbs
20+
case .bolus:
21+
return .insulin
22+
case .preMeal:
23+
return .carbs
24+
case .customPresets:
25+
return .glucose
26+
}
27+
}
28+
29+
var icon: Image {
30+
switch self {
31+
case .carbEntry:
32+
return Image(.carbs)
33+
case .bolus:
34+
return Image(.bolus)
35+
case .preMeal:
36+
return Image(.premeal)
37+
case .customPresets:
38+
return Image(.workout)
39+
}
40+
}
41+
}
42+
43+
struct DeeplinkView: View {
44+
let destination: Deeplink
45+
var isActive: Bool = false
46+
47+
var body: some View {
48+
Link(destination: destination.deeplinkURL) {
49+
destination.icon
50+
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
51+
.foregroundColor(isActive ? .white : destination.accentColor)
52+
.containerRelativeBackground(color: isActive ? destination.accentColor : .widgetSecondaryBackground)
53+
}
54+
}
55+
}

‎Loop Widget Extension/Components/EventualGlucoseView.swift

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//
2+
// EventualGlucoseView.swift
3+
// Loop Widget Extension
4+
//
5+
// Created by Noah Brauner on 8/8/24.
6+
// Copyright © 2024 LoopKit Authors. All rights reserved.
7+
//
8+
9+
import SwiftUI
10+
11+
struct EventualGlucoseView: View {
12+
let entry: StatusWidgetTimelimeEntry
13+
14+
var body: some View {
15+
if let eventualGlucose = entry.eventualGlucose {
16+
let glucoseFormatter = NumberFormatter.glucoseFormatter(for: eventualGlucose.unit)
17+
if let glucoseString = glucoseFormatter.string(from: eventualGlucose.quantity.doubleValue(for: eventualGlucose.unit)) {
18+
VStack {
19+
Text("Eventual")
20+
.font(.footnote)
21+
.foregroundColor(entry.contextIsStale ? .staleGray : .secondary)
22+
23+
Text("\(glucoseString)")
24+
.font(.subheadline)
25+
.fontWeight(.heavy)
26+
27+
Text(eventualGlucose.unit.shortLocalizedUnitString())
28+
.font(.footnote)
29+
.foregroundColor(entry.contextIsStale ? .staleGray : .secondary)
30+
}
31+
}
32+
}
33+
}
34+
}

‎Loop Widget Extension/Components/GlucoseView.swift

+11-24
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,17 @@ import HealthKit
1212
import LoopCore
1313

1414
struct GlucoseView: View {
15-
1615
var entry: StatusWidgetTimelimeEntry
1716

1817
var body: some View {
1918
VStack(alignment: .center, spacing: 0) {
2019
HStack(spacing: 2) {
21-
if let glucose = entry.currentGlucose,
22-
!entry.glucoseIsStale,
23-
let unit = entry.unit
24-
{
25-
let quantity = glucose.quantity
26-
let glucoseFormatter = NumberFormatter.glucoseFormatter(for: unit)
27-
if let glucoseString = glucoseFormatter.string(from: quantity.doubleValue(for: unit)) {
28-
Text(glucoseString)
29-
.font(.system(size: 24, weight: .heavy, design: .default))
30-
}
31-
else {
32-
Text("??")
33-
.font(.system(size: 24, weight: .heavy, design: .default))
34-
}
20+
if !entry.glucoseIsStale,
21+
let glucoseQuantity = entry.currentGlucose?.quantity,
22+
let unit = entry.unit,
23+
let glucoseString = NumberFormatter.glucoseFormatter(for: unit).string(from: glucoseQuantity.doubleValue(for: unit)) {
24+
Text(glucoseString)
25+
.font(.system(size: 24, weight: .heavy, design: .default))
3526
}
3627
else {
3728
Text("---")
@@ -42,26 +33,22 @@ struct GlucoseView: View {
4233
Image(systemName: trendImageName)
4334
}
4435
}
45-
// Prevent truncation of text
46-
.fixedSize(horizontal: true, vertical: false)
47-
.foregroundColor(entry.glucoseStatusIsStale ? Color(UIColor.systemGray3) : .primary)
36+
.foregroundColor(entry.glucoseStatusIsStale ? .staleGray : .primary)
4837

49-
let unitString = entry.unit == nil ? "-" : entry.unit!.localizedShortUnitString
38+
let unitString = entry.unit?.localizedShortUnitString ?? "-"
5039
if let delta = entry.delta, let unit = entry.unit {
5140
let deltaValue = delta.doubleValue(for: unit)
5241
let numberFormatter = NumberFormatter.glucoseFormatter(for: unit)
5342
let deltaString = (deltaValue < 0 ? "-" : "+") + numberFormatter.string(from: abs(deltaValue))!
5443

5544
Text(deltaString + " " + unitString)
56-
// Dynamic text causes string to be cut off
57-
.font(.system(size: 13))
58-
.foregroundColor(entry.glucoseStatusIsStale ? Color(UIColor.systemGray3) : Color(UIColor.secondaryLabel))
59-
.fixedSize(horizontal: true, vertical: true)
45+
.font(.footnote)
46+
.foregroundColor(entry.glucoseStatusIsStale ? .staleGray : .secondary)
6047
}
6148
else {
6249
Text(unitString)
6350
.font(.footnote)
64-
.foregroundColor(entry.glucoseStatusIsStale ? Color(UIColor.systemGray3) : Color(UIColor.secondaryLabel))
51+
.foregroundColor(entry.glucoseStatusIsStale ? .staleGray : .secondary)
6552
}
6653
}
6754
}

‎Loop Widget Extension/Components/PumpView.swift

+10-33
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,19 @@
99
import SwiftUI
1010

1111
struct PumpView: View {
12-
13-
var entry: StatusWidgetTimelineProvider.Entry
12+
var entry: StatusWidgetTimelimeEntry
1413

1514
var body: some View {
16-
HStack(alignment: .center) {
17-
if let pumpHighlight = entry.pumpHighlight {
18-
HStack {
19-
Image(systemName: pumpHighlight.imageName)
20-
.foregroundColor(pumpHighlight.state == .critical ? .critical : .warning)
21-
Text(pumpHighlight.localizedMessage)
22-
.fontWeight(.heavy)
23-
}
24-
}
25-
else if let netBasal = entry.netBasal {
26-
BasalView(netBasal: netBasal, isOld: entry.contextIsStale)
27-
28-
if let eventualGlucose = entry.eventualGlucose {
29-
let glucoseFormatter = NumberFormatter.glucoseFormatter(for: eventualGlucose.unit)
30-
if let glucoseString = glucoseFormatter.string(from: eventualGlucose.quantity.doubleValue(for: eventualGlucose.unit)) {
31-
VStack {
32-
Text("Eventual")
33-
.font(.footnote)
34-
.foregroundColor(entry.contextIsStale ? Color(UIColor.systemGray3) : Color(UIColor.secondaryLabel))
35-
36-
Text("\(glucoseString)")
37-
.font(.subheadline)
38-
.fontWeight(.heavy)
39-
40-
Text(eventualGlucose.unit.shortLocalizedUnitString())
41-
.font(.footnote)
42-
.foregroundColor(entry.contextIsStale ? Color(UIColor.systemGray3) : Color(UIColor.secondaryLabel))
43-
}
44-
}
45-
}
15+
if let pumpHighlight = entry.pumpHighlight {
16+
HStack {
17+
Image(systemName: pumpHighlight.imageName)
18+
.foregroundColor(pumpHighlight.state == .critical ? .critical : .warning)
19+
Text(pumpHighlight.localizedMessage)
20+
.fontWeight(.heavy)
4621
}
47-
22+
}
23+
else if let netBasal = entry.netBasal {
24+
BasalView(netBasal: netBasal, isStale: entry.contextIsStale)
4825
}
4926
}
5027
}

‎Loop Widget Extension/Components/SystemActionLink.swift

-82
This file was deleted.

‎Loop Widget Extension/DefaultAssets.xcassets/bolus.imageset/Contents.json ‎Loop Widget Extension/DerivedAssetsBase.xcassets/bolus.imageset/Contents.json

File renamed without changes.

‎Loop Widget Extension/DefaultAssets.xcassets/bolus.imageset/bolus.pdf ‎Loop Widget Extension/DerivedAssetsBase.xcassets/bolus.imageset/bolus.pdf

File renamed without changes.

‎Loop Widget Extension/DefaultAssets.xcassets/carbs.imageset/Contents.json ‎Loop Widget Extension/DerivedAssetsBase.xcassets/carbs.imageset/Contents.json

File renamed without changes.

‎Loop Widget Extension/DefaultAssets.xcassets/carbs.imageset/Meal.pdf ‎Loop Widget Extension/DerivedAssetsBase.xcassets/carbs.imageset/Meal.pdf

File renamed without changes.

‎Loop Widget Extension/DefaultAssets.xcassets/premeal.imageset/Contents.json ‎Loop Widget Extension/DerivedAssetsBase.xcassets/premeal.imageset/Contents.json

File renamed without changes.

‎Loop Widget Extension/DefaultAssets.xcassets/premeal.imageset/Pre-Meal.pdf ‎Loop Widget Extension/DerivedAssetsBase.xcassets/premeal.imageset/Pre-Meal.pdf

File renamed without changes.

‎Loop Widget Extension/DefaultAssets.xcassets/workout.imageset/Contents.json ‎Loop Widget Extension/DerivedAssetsBase.xcassets/workout.imageset/Contents.json

File renamed without changes.

‎Loop Widget Extension/DefaultAssets.xcassets/workout.imageset/workout.pdf ‎Loop Widget Extension/DerivedAssetsBase.xcassets/workout.imageset/workout.pdf

File renamed without changes.

‎Loop Widget Extension/Helpers/Color.swift

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// Color.swift
3+
// Loop
4+
//
5+
// Created by Noah Brauner on 8/9/24.
6+
// Copyright © 2024 LoopKit Authors. All rights reserved.
7+
//
8+
9+
import SwiftUI
10+
11+
extension Color {
12+
static let widgetBackground = Color(.widgetBackground)
13+
static let widgetSecondaryBackground = Color(.widgetSecondaryBackground)
14+
static let staleGray = Color(.systemGray3)
15+
16+
static let insulin = Color(.insulin)
17+
static let glucose = Color(.glucose)
18+
static let carbs = Color(.fresh)
19+
}

‎Loop Widget Extension/Helpers/WidgetBackground.swift

+10-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,18 @@ extension View {
1313
func widgetBackground() -> some View {
1414
if #available(iOSApplicationExtension 17.0, *) {
1515
containerBackground(for: .widget) {
16-
background { Color("WidgetBackground") }
16+
background { Color.widgetBackground }
1717
}
1818
} else {
19-
background { Color("WidgetBackground") }
19+
background { Color.widgetBackground }
2020
}
2121
}
22+
23+
@ViewBuilder
24+
func containerRelativeBackground(color: Color = .widgetSecondaryBackground) -> some View {
25+
background(
26+
ContainerRelativeShape()
27+
.fill(color)
28+
)
29+
}
2230
}

‎Loop Widget Extension/LoopWidgets.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import SwiftUI
1010

1111
@main
1212
struct LoopWidgets: WidgetBundle {
13-
1413
@WidgetBundleBuilder
1514
var body: some Widget {
1615
SystemStatusWidget()

0 commit comments

Comments
 (0)