[Main] - New Updates ✨

MaatheusGois · Feb 3, 2024 · 08832c4 · 08832c4
1 parent f14502b
commit 08832c4
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 27 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/goisma.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/goisma.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/DuoDemoApp/ContentView.swift b/DuoDemoApp/ContentView.swift
@@ -65,12 +65,10 @@ extension ContentView {
     }
 
     func activityView(_ activity: Activity<DuoDemoAppAttributes>) -> some View {
-        let courierName = activity.contentState.courierName
-        let deliveryTime = activity.contentState.percentage
 
         return HStack(alignment: .center) {
-            Text(courierName)
-            Text(verbatim: "Update")
+            Text("\(activity.contentState.progressString)% -")
+            Text(activity.contentState.initialTime, style: .timer)
             Text("update")
                 .font(.headline)
                 .foregroundColor(.green)

diff --git a/DuoDemoApp/Helpers/Activity/ActivityManager.swift b/DuoDemoApp/Helpers/Activity/ActivityManager.swift
@@ -10,15 +10,20 @@ import SwiftUI
 
 class ActivityManager: ObservableObject {
     @Published var activities = Activity<DuoDemoAppAttributes>.activities
+    private var initalDate = Date()
 
     func createActivity() {
         guard NotificationManager.status == .enable else {
             // Handle error
             return
         }
 
-        let attributes = DuoDemoAppAttributes(numberOfGroceyItems: 12)
-        let contentState = DuoDemoAppAttributes.LiveDeliveryData(courierName: "", percentage: 0.3)
+        let attributes = DuoDemoAppAttributes()
+        let contentState = DuoDemoAppAttributes.LiveDeliveryData(
+            currentLesson: 3,
+            numberOfLessons: 12,
+            initialTime: initalDate
+        )
         do {
             _ = try Activity<DuoDemoAppAttributes>.request(
                 attributes: attributes,
@@ -33,8 +38,9 @@ class ActivityManager: ObservableObject {
     func update(activity: Activity<DuoDemoAppAttributes>) {
         Task {
             let updatedStatus = DuoDemoAppAttributes.LiveDeliveryData(
-                courierName: "",
-                percentage: 0.5
+                currentLesson: 6,
+                numberOfLessons: 12,
+                initialTime: initalDate
             )
             await activity.update(using: updatedStatus)
         }

diff --git a/DuoDemoApp/Helpers/Model/DuoDemoAppAttributes.swift b/DuoDemoApp/Helpers/Model/DuoDemoAppAttributes.swift
@@ -12,10 +12,26 @@ struct DuoDemoAppAttributes: ActivityAttributes, Identifiable {
     public typealias LiveDeliveryData = ContentState
 
     public struct ContentState: Codable, Hashable {
-        var courierName: String
-        var percentage: CGFloat
+        var currentLesson: CGFloat
+        var numberOfLessons: CGFloat
+        var initialTime: Date
+
+        var progress: CGFloat {
+            currentLesson / numberOfLessons
+        }
+
+        var progressString: String {
+            String(Int(currentLesson / numberOfLessons * 100))
+        }
+
+        var currentLessonString: String {
+            String(Int(currentLesson))
+        }
+
+        var numberOfLessonsString: String {
+            String(Int(numberOfLessons))
+        }
     }
 
-    var numberOfGroceyItems: Int
     var id = UUID()
 }
diff --git a/DuoTrackWidget/Assets.xcassets/icons/duo-icon-full.imageset/Contents.json b/DuoTrackWidget/Assets.xcassets/icons/duo-icon-full.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "duo-icon-.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/DuoTrackWidget/Assets.xcassets/icons/duo-icon-full.imageset/duo-icon-.pdf b/DuoTrackWidget/Assets.xcassets/icons/duo-icon-full.imageset/duo-icon-.pdf
diff --git a/DuoTrackWidget/DuoTrackWidget.swift b/DuoTrackWidget/DuoTrackWidget.swift
@@ -58,35 +58,36 @@ struct DuoDemoApp: Widget {
     func dynamicIslandExpandedLeadingView(context: ActivityViewContext<DuoDemoAppAttributes>) -> some View {
         VStack {
             Label {
-                Text("\(context.attributes.numberOfGroceyItems)")
+                Text("\(context.state.numberOfLessonsString)")
                     .font(.title2)
             } icon: {
-                Image("duo-icon")
+                Image("duo-icon-full")
             }
-            Text("items")
+            Text("steps")
                 .font(.title2)
         }
     }
 
     func dynamicIslandExpandedTrailingView(context: ActivityViewContext<DuoDemoAppAttributes>) -> some View {
         Label {
-            Text(verbatim: "Text")
+            Text(context.state.initialTime, style: .timer)
                 .multilineTextAlignment(.trailing)
                 .frame(width: 50)
                 .monospacedDigit()
         } icon: {
-            Image(systemName: "timer")
-                .foregroundColor(.green)
+            Image("duo-icon-full")
+                .resizable()
+                .scaledToFit()
         }
         .font(.title2)
     }
 
     func dynamicIslandExpandedBottomView(context: ActivityViewContext<DuoDemoAppAttributes>) -> some View {
-        Label("Call courier", systemImage: "phone")
+        Label("", systemImage: "")
     }
 
     func dynamicIslandExpandedCenterView(context: ActivityViewContext<DuoDemoAppAttributes>) -> some View {
-        Text("\(context.state.courierName) is on the way!")
+        Text("")
             .lineLimit(1)
             .font(.caption)
     }
@@ -96,9 +97,9 @@ struct DuoDemoApp: Widget {
     func compactLeadingView(context: ActivityViewContext<DuoDemoAppAttributes>) -> some View {
         VStack {
             Label {
-                Text("\(context.attributes.numberOfGroceyItems) items")
+                Text("\(context.state.currentLessonString)/\(context.state.numberOfLessonsString)")
             } icon: {
-                Image("duo-icon")
+                Image("duo-icon-full")
                     .resizable()
                     .scaledToFit()
             }
@@ -107,16 +108,15 @@ struct DuoDemoApp: Widget {
     }
 
     func compactTrailingView(context: ActivityViewContext<DuoDemoAppAttributes>) -> some View {
-        Text(verbatim: "Trailing")
+        Text(context.state.initialTime, style: .timer)
             .multilineTextAlignment(.center)
             .frame(width: 40)
             .font(.caption2)
     }
 
     func minimalView(context: ActivityViewContext<DuoDemoAppAttributes>) -> some View {
         VStack(alignment: .center) {
-            Image(systemName: "timer")
-            Text(verbatim: "MinimalView")
+            Text(context.state.initialTime, style: .timer)
                 .multilineTextAlignment(.center)
                 .monospacedDigit()
                 .font(.caption2)
@@ -135,7 +135,7 @@ struct LockScreenView: View {
                     HStack {
                         VStack(alignment: .leading) {
                             HStack {
-                                ProgressBar(progress: context.state.percentage)
+                                ProgressBar(progress: context.state.progress)
                                     .frame(minHeight: 16)
                                     .padding(.bottom, 6)
                             }
@@ -146,8 +146,8 @@ struct LockScreenView: View {
                                         .font(.title3)
                                         .fontWeight(.bold)
 
-                                    Text("It's been \(context.attributes.numberOfGroceyItems) since you started.")
-                                        .font(.headline)
+                                    Text("It's been \(context.state.initialTime, style: .timer) since you started.")
+                                        .font(.subheadline)
                                         .fontWeight(.thin)
                                 }
                                 Spacer()