JustOneThing.xcodeproj/project.pbxproj

@@ -37,9 +37,6 @@
 		5493A81B2A471E37001EBA08 /* JustOneThingProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5493A81A2A471E36001EBA08 /* JustOneThingProvider.swift */; };
 		5493A81C2A471E37001EBA08 /* JustOneThingProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5493A81A2A471E36001EBA08 /* JustOneThingProvider.swift */; };
 		5493A81D2A471E37001EBA08 /* JustOneThingProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5493A81A2A471E36001EBA08 /* JustOneThingProvider.swift */; };
-		54EB3C1F2A5434A30082B059 /* Thing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EB3C1E2A5434A30082B059 /* Thing.swift */; };
-		54EB3C202A5434A30082B059 /* Thing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EB3C1E2A5434A30082B059 /* Thing.swift */; };
-		54EB3C212A5434A30082B059 /* Thing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EB3C1E2A5434A30082B059 /* Thing.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -131,7 +128,6 @@
 		54928C462A35F8CB00095445 /* WatchWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WatchWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		54928C4A2A35F8CB00095445 /* JustOneThingWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JustOneThingWidget.swift; sourceTree = "<group>"; };
 		5493A81A2A471E36001EBA08 /* JustOneThingProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JustOneThingProvider.swift; sourceTree = "<group>"; };
-		54EB3C1E2A5434A30082B059 /* Thing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thing.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -200,7 +196,6 @@
 		5472018B2A3655E4005B2FCC /* WidgetShared */ = {
 			isa = PBXGroup;
 			children = (
-				54EB3C1E2A5434A30082B059 /* Thing.swift */,
 				54928C4A2A35F8CB00095445 /* JustOneThingWidget.swift */,
 				5493A81A2A471E36001EBA08 /* JustOneThingProvider.swift */,
 				54928C372A35F8B800095445 /* WidgetAssets.xcassets */,
@@ -490,7 +485,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				54EB3C1F2A5434A30082B059 /* Thing.swift in Sources */,
 				54928C212A35F89A00095445 /* Widget.intentdefinition in Sources */,
 				5493A81B2A471E37001EBA08 /* JustOneThingProvider.swift in Sources */,
 				547201972A461DBE005B2FCC /* JustOneThingWidget.swift in Sources */,
@@ -501,7 +495,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				54EB3C202A5434A30082B059 /* Thing.swift in Sources */,
 				547201962A461DBE005B2FCC /* JustOneThingWidget.swift in Sources */,
 				5493A81C2A471E37001EBA08 /* JustOneThingProvider.swift in Sources */,
 				5472018E2A36563B005B2FCC /* Widget.intentdefinition in Sources */,
@@ -512,7 +505,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				54EB3C212A5434A30082B059 /* Thing.swift in Sources */,
 				547201902A36563C005B2FCC /* Widget.intentdefinition in Sources */,
 				5493A81D2A471E37001EBA08 /* JustOneThingProvider.swift in Sources */,
 				54928C4B2A35F8CB00095445 /* JustOneThingWidget.swift in Sources */,

WidgetShared/JustOneThingProvider.swift

@@ -9,51 +9,31 @@ import WidgetKit
 import SwiftUI
 import Intents
 
-struct ThingDataStore {
+struct Provider: IntentTimelineProvider {
-    public var things:[Thing] = [
+    func placeholder(in context: Context) -> SimpleEntry {
-        Thing(text: "The First Thing", createdAt: Date()),
+        SimpleEntry(date: Date(), configuration: ConfigurationIntent())
-        Thing(text: "The Second Thing", createdAt: Date()),
-        Thing(text: "The Third Thing", createdAt: Date()),
-        Thing(text: "The Fourth Thing", createdAt: Date()),
-        Thing(text: "The Fifth Thing", createdAt: Date()),
-        Thing(text: "The Sixth Thing", createdAt: Date()),
-    ]
-    
-    public var shuffledThings:[Thing] {
-        things.shuffled()
     }
-}
 
-extension Date {
+    func getSnapshot(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (SimpleEntry) -> ()) {
-    mutating public func withAddedMinutes(_ minutes:Double) -> Date {
+        let entry = SimpleEntry(date: Date(), configuration: configuration)
-        self.addTimeInterval(minutes*60)
+        completion(entry)
-        return self
     }
-}
 
-struct ThingProvider: IntentTimelineProvider {
+    func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline<SimpleEntry>) -> ()) {
-    var thingStore:ThingDataStore = ThingDataStore()
+        var entries: [SimpleEntry] = []
-    
-    func placeholder(in context: Context) -> ThingEntry {
-        ThingEntry(thing: .placeholder)
-    }
-
-    func getSnapshot(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (ThingEntry) -> ()) {
-        completion(ThingEntry(thing: .placeholder, config: configuration))
-    }
 
-    func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline<ThingEntry>) -> ()) {
+        // Generate a timeline consisting of five entries an hour apart, starting from the current date.
-        var timestamp = Date.now
+        let currentDate = Date()
-        let entries = thingStore.shuffledThings.map {
+        for hourOffset in 0 ..< 5 {
-            ThingEntry(thing: $0,
+            let entryDate = Calendar.current.date(byAdding: .hour, value: hourOffset, to: currentDate)!
-                       timelineDate: timestamp.withAddedMinutes(15),
+            let entry = SimpleEntry(date: entryDate, configuration: configuration)
-                       config: configuration)
+            entries.append(entry)
         }
-        completion(Timeline(entries: entries, policy: .atEnd))
+
+        let timeline = Timeline(entries: entries, policy: .atEnd)
+        completion(timeline)
     }
-}
 
-extension ThingProvider {
     func recommendations() -> [IntentRecommendation<ConfigurationIntent>] {
         return [
             IntentRecommendation(intent: ConfigurationIntent(), description: "My Intent Widget")
@@ -61,15 +41,7 @@ extension ThingProvider {
     }
 }
 
-
+struct SimpleEntry: TimelineEntry {
-struct ThingEntry: TimelineEntry {
     let date: Date
     let configuration: ConfigurationIntent
-    let thing: Thing
-    
-    public init(thing:Thing, timelineDate:Date = .now, config:ConfigurationIntent = ConfigurationIntent()) {
-        self.thing = thing
-        self.date = timelineDate
-        self.configuration = config
-    }
 }

WidgetShared/JustOneThingWidget.swift

@@ -17,11 +17,11 @@ struct JustOneThingWidgetBundle: WidgetBundle {
 }
 
 
-struct ThingEntryView : View {
+struct JustOneThingWidgetEntryView : View {
-    var entry: ThingEntry
+    var entry: Provider.Entry
 
     var body: some View {
-        Text(entry.thing.text)
+        Text(entry.date, style: .time)
     }
 }
 
@@ -29,10 +29,8 @@ struct JustOneThingWidget: Widget {
     let kind: String = "JustOneThingWidget"
 
     var body: some WidgetConfiguration {
-        IntentConfiguration(kind: kind,
+        IntentConfiguration(kind: kind, intent: ConfigurationIntent.self, provider: Provider()) { entry in
-                            intent: ConfigurationIntent.self,
+            JustOneThingWidgetEntryView(entry: entry)
-                            provider: ThingProvider()) { entry in
-            ThingEntryView(entry: entry)
         }
         .configurationDisplayName("My Widget")
         .description("This is an example widget.")
@@ -41,7 +39,7 @@ struct JustOneThingWidget: Widget {
 
 struct Widget_Previews: PreviewProvider {
     static var previews: some View {
-        ThingEntryView(entry: ThingEntry(thing: .placeholder))
+        JustOneThingWidgetEntryView(entry: SimpleEntry(date: Date(), configuration: ConfigurationIntent()))
         #if os(watchOS)
             .previewContext(WidgetPreviewContext(family: .accessoryRectangular))
         #else

WidgetShared/Thing.swift

@@ -1,15 +0,0 @@
-//
-//  Thing.swift
-//  JustOneThing
-//
-//  Created by Alan Francis on 04/07/2023.
-//
-
-import Foundation
-
-struct Thing {
-    let text: String
-    let createdAt: Date
-    
-    static let placeholder: Thing = Thing(text: "placeholder", createdAt: Date.now)
-}