|
@@ -23,7 +23,8 @@ struct LiveActivityView: View {
|
|
|
|
|
|
|
|
return Color.getDynamicGlucoseColor(
|
|
return Color.getDynamicGlucoseColor(
|
|
|
glucoseValue: Decimal(string: state.bg) ?? 100,
|
|
glucoseValue: Decimal(string: state.bg) ?? 100,
|
|
|
- highGlucoseColorValue: !hasStaticColorScheme ? hardCodedHigh : (isMgdL ? state.highGlucose : state.highGlucose.asMmolL),
|
|
|
|
|
|
|
+ highGlucoseColorValue: !hasStaticColorScheme ? hardCodedHigh :
|
|
|
|
|
+ (isMgdL ? state.highGlucose : state.highGlucose.asMmolL),
|
|
|
lowGlucoseColorValue: !hasStaticColorScheme ? hardCodedLow : (isMgdL ? state.lowGlucose : state.lowGlucose.asMmolL),
|
|
lowGlucoseColorValue: !hasStaticColorScheme ? hardCodedLow : (isMgdL ? state.lowGlucose : state.lowGlucose.asMmolL),
|
|
|
targetGlucose: isMgdL ? state.target : state.target.asMmolL,
|
|
targetGlucose: isMgdL ? state.target : state.target.asMmolL,
|
|
|
glucoseColorScheme: state.glucoseColorScheme
|
|
glucoseColorScheme: state.glucoseColorScheme
|
|
@@ -33,7 +34,7 @@ struct LiveActivityView: View {
|
|
|
var body: some View {
|
|
var body: some View {
|
|
|
if isWatchOS, context.state.useDetailedViewWatchOS {
|
|
if isWatchOS, context.state.useDetailedViewWatchOS {
|
|
|
VStack {
|
|
VStack {
|
|
|
- LiveActivityBGLabelWatchView(context: context, glucoseColor: .primary)
|
|
|
|
|
|
|
+ LiveActivityBGLabelWatchView(context: context, glucoseColor: glucoseColor)
|
|
|
LiveActivityChartView(context: context, additionalState: context.state.detailedViewState)
|
|
LiveActivityChartView(context: context, additionalState: context.state.detailedViewState)
|
|
|
.frame(maxWidth: UIScreen.main.bounds.width * 0.9)
|
|
.frame(maxWidth: UIScreen.main.bounds.width * 0.9)
|
|
|
}
|
|
}
|