|
|
@@ -1,4 +1,5 @@
|
|
|
import ActivityKit
|
|
|
+import Charts
|
|
|
import SwiftUI
|
|
|
import WidgetKit
|
|
|
|
|
|
@@ -19,46 +20,107 @@ struct LiveActivity: Widget {
|
|
|
}
|
|
|
|
|
|
func updatedLabel(context: ActivityViewContext<LiveActivityAttributes>) -> Text {
|
|
|
- Text("Updated: \(dateFormatter.string(from: context.state.date))")
|
|
|
+ Text(dateFormatter.string(from: context.state.date))
|
|
|
}
|
|
|
|
|
|
func bgLabel(context: ActivityViewContext<LiveActivityAttributes>) -> Text {
|
|
|
if context.isStale {
|
|
|
Text("--")
|
|
|
} else {
|
|
|
- Text(context.state.bg)
|
|
|
+ Text(context.state.bg).fontWeight(.bold)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @ViewBuilder func bgAndTrend(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
|
|
|
+ @ViewBuilder func trend(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
|
|
|
if context.isStale {
|
|
|
Text("--")
|
|
|
} else {
|
|
|
- Text(context.state.bg)
|
|
|
if let trendSystemImage = context.state.trendSystemImage {
|
|
|
Image(systemName: trendSystemImage)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @ViewBuilder func bgAndTrend(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
|
|
|
+ if context.isStale {
|
|
|
+ Text("--")
|
|
|
+ } else {
|
|
|
+ HStack {
|
|
|
+ Text(context.state.bg).fontWeight(.bold)
|
|
|
+ if let trendSystemImage = context.state.trendSystemImage {
|
|
|
+ Image(systemName: trendSystemImage)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @ViewBuilder func bobble(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
|
|
|
+ @State var angularGradient = AngularGradient(colors: [
|
|
|
+ Color(red: 0.7215686275, green: 0.3411764706, blue: 1),
|
|
|
+ Color(red: 0.6235294118, green: 0.4235294118, blue: 0.9803921569),
|
|
|
+ Color(red: 0.4862745098, green: 0.5450980392, blue: 0.9529411765),
|
|
|
+ Color(red: 0.3411764706, green: 0.6666666667, blue: 0.9254901961),
|
|
|
+ Color(red: 0.262745098, green: 0.7333333333, blue: 0.9137254902),
|
|
|
+ Color(red: 0.7215686275, green: 0.3411764706, blue: 1)
|
|
|
+ ], center: .center, startAngle: .degrees(270), endAngle: .degrees(-90))
|
|
|
+ let triangleColor = Color(red: 0.262745098, green: 0.7333333333, blue: 0.9137254902)
|
|
|
+
|
|
|
+ WidgetBobble(gradient: angularGradient, color: triangleColor)
|
|
|
+ .rotationEffect(.degrees(context.state.rotationDegrees))
|
|
|
+ }
|
|
|
+
|
|
|
+ @ViewBuilder func chart(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
|
|
|
+ if context.isStale {
|
|
|
+ Text("No data available")
|
|
|
+ } else {
|
|
|
+ Chart {
|
|
|
+ ForEach(context.state.chart.indices, id: \.self) { index in
|
|
|
+ LineMark(
|
|
|
+ x: .value("Time", context.state.chartDate[index] ?? Date()),
|
|
|
+ y: .value("Value", context.state.chart[index] ?? 0)
|
|
|
+ ).foregroundStyle(Color.green.gradient).symbolSize(12)
|
|
|
+ }
|
|
|
+ }.chartPlotStyle { plotContent in
|
|
|
+ plotContent.background(.cyan.opacity(0.1))
|
|
|
+ }
|
|
|
+ .chartYAxis {
|
|
|
+ AxisMarks(position: .leading)
|
|
|
+ }
|
|
|
+ .chartXAxis {
|
|
|
+ AxisMarks(position: .automatic)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
var body: some WidgetConfiguration {
|
|
|
ActivityConfiguration(for: LiveActivityAttributes.self) { context in
|
|
|
// Lock screen/banner UI goes here
|
|
|
|
|
|
- HStack(spacing: 3) {
|
|
|
- bgAndTrend(context: context).font(.title)
|
|
|
- Spacer()
|
|
|
- VStack(alignment: .trailing, spacing: 5) {
|
|
|
- changeLabel(context: context).font(.title3)
|
|
|
- updatedLabel(context: context).font(.caption).foregroundStyle(.black.opacity(0.7))
|
|
|
+ HStack(spacing: 2) {
|
|
|
+ VStack {
|
|
|
+ chart(context: context).frame(width: UIScreen.main.bounds.width / 1.7)
|
|
|
+ }.padding(.vertical, 5).padding(.horizontal, 15)
|
|
|
+ Divider()
|
|
|
+ VStack {
|
|
|
+ ZStack {
|
|
|
+ bobble(context: context)
|
|
|
+ .scaleEffect(0.6)
|
|
|
+ .clipped()
|
|
|
+ VStack {
|
|
|
+// bgAndTrend(context: context).imageScale(.small).font(.title2)
|
|
|
+ bgLabel(context: context).font(.title2).imageScale(.small)
|
|
|
+ changeLabel(context: context).font(.callout)
|
|
|
+ }
|
|
|
+ }.padding(.trailing, 5).padding(.top, 5)
|
|
|
+ updatedLabel(context: context).font(.caption).padding(.bottom)
|
|
|
}
|
|
|
}
|
|
|
.privacySensitive()
|
|
|
.imageScale(.small)
|
|
|
.padding(.all, 15)
|
|
|
.background(Color.white.opacity(0.2))
|
|
|
- .foregroundColor(Color.black)
|
|
|
- .activityBackgroundTint(Color.cyan.opacity(0.2))
|
|
|
+ .foregroundColor(Color.white)
|
|
|
+ .activityBackgroundTint(Color.black.opacity(0.7))
|
|
|
.activitySystemActionForegroundColor(Color.black)
|
|
|
|
|
|
} dynamicIsland: { context in
|
|
|
@@ -76,6 +138,7 @@ struct LiveActivity: Widget {
|
|
|
DynamicIslandExpandedRegion(.bottom) {
|
|
|
updatedLabel(context: context).font(.caption).foregroundStyle(Color.secondary)
|
|
|
.padding(.bottom, 5)
|
|
|
+ chart(context: context).frame(height: 70)
|
|
|
}
|
|
|
} compactLeading: {
|
|
|
HStack(spacing: 1) {
|
|
|
@@ -92,20 +155,20 @@ struct LiveActivity: Widget {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-private extension LiveActivityAttributes {
|
|
|
- static var preview: LiveActivityAttributes {
|
|
|
- LiveActivityAttributes(startDate: Date())
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-private extension LiveActivityAttributes.ContentState {
|
|
|
- static var test: LiveActivityAttributes.ContentState {
|
|
|
- LiveActivityAttributes.ContentState(bg: "100", trendSystemImage: "arrow.right", change: "+2", date: Date())
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-#Preview("Notification", as: .content, using: LiveActivityAttributes.preview) {
|
|
|
- LiveActivity()
|
|
|
-} contentStates: {
|
|
|
- LiveActivityAttributes.ContentState.test
|
|
|
-}
|
|
|
+// private extension LiveActivityAttributes {
|
|
|
+// static var preview: LiveActivityAttributes {
|
|
|
+// LiveActivityAttributes(startDate: Date())
|
|
|
+// }
|
|
|
+// }
|
|
|
+//
|
|
|
+// private extension LiveActivityAttributes.ContentState {
|
|
|
+// static var test: LiveActivityAttributes.ContentState {
|
|
|
+// LiveActivityAttributes.ContentState(bg: "100", trendSystemImage: "arrow.right", change: "+2", date: Date())
|
|
|
+// }
|
|
|
+// }
|
|
|
+//
|
|
|
+// #Preview("Notification", as: .content, using: LiveActivityAttributes.preview) {
|
|
|
+// LiveActivity()
|
|
|
+// } contentStates: {
|
|
|
+// LiveActivityAttributes.ContentState.test
|
|
|
+// }
|
polscm32