nativescript 8.9.0-dev.2 → 8.9.0-dev.4

package/lib/commands/widget.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WidgetIOSCommand = exports.WidgetCommand = void 0;
 const fs = require("fs");
@@ -26,20 +17,16 @@ class WidgetCommand {
         this.allowedParameters = [];
         this.$projectData.initializeProjectData();
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.failWithUsage();
-            return Promise.resolve();
-        });
+    async execute(args) {
+        this.failWithUsage();
+        return Promise.resolve();
     }
     failWithUsage() {
         this.$errors.failWithHelp("Usage: ns widget ios");
     }
-    canExecute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.failWithUsage();
-            return false;
-        });
+    async canExecute(args) {
+        this.failWithUsage();
+        return false;
     }
     getIosSourcePathBase() {
         const resources = this.$projectData.getAppResourcesDirectoryPath();
@@ -51,77 +38,64 @@ class WidgetIOSCommand extends WidgetCommand {
     constructor($projectData, $projectConfigService, $logger, $errors) {
         super($projectData, $projectConfigService, $logger, $errors);
     }
-    canExecute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return true;
-        });
+    async canExecute(args) {
+        return true;
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.startPrompt(args);
-        });
+    async execute(args) {
+        this.startPrompt(args);
     }
-    startPrompt(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = yield prompts.prompt({
-                type: "text",
-                name: "name",
-                message: `What name would you like for this widget? (Default is 'widget')`,
-            });
-            const name = (result.name || "widget").toLowerCase();
-            result = yield prompts.prompt({
-                type: "select",
-                name: "value",
-                message: `What type of widget would you like? (Request more options: https://github.com/NativeScript/nativescript-cli/issues)`,
-                choices: [
-                    {
-                        title: "Live Activity",
-                        description: "This will create a Live Activity that will display on the iOS Lock Screen.",
-                        value: 0,
-                    },
-                    {
-                        title: "Live Activity with Home Screen Widget",
-                        description: "This will create a Live Activity that will display on the iOS Lock Screen with an optional Widget.",
-                        value: 1,
-                    },
-                    {
-                        title: "Home Screen Widget",
-                        description: "This will create just a Home Screen Widget.",
-                        value: 2,
-                    },
-                ],
-                initial: 1,
-            });
-            switch (result.value) {
-                case 0:
-                    this.$logger.info("TODO");
-                    break;
-                case 1:
-                    yield this.generateSharedWidgetPackage(this.$projectData.projectDir, name);
-                    this.generateWidget(this.$projectData.projectDir, name, result.value);
-                    this.generateAppleUtility(this.$projectData.projectDir, name);
-                    break;
-                case 2:
-                    this.$logger.info("TODO");
-                    break;
-            }
+    async startPrompt(args) {
+        let result = await prompts.prompt({
+            type: "text",
+            name: "name",
+            message: `What name would you like for this widget? (Default is 'widget')`,
+        });
+        const name = (result.name || "widget").toLowerCase();
+        result = await prompts.prompt({
+            type: "select",
+            name: "value",
+            message: `What type of widget would you like?`,
+            choices: [
+                {
+                    title: "Live Activity",
+                    description: "This will create a Live Activity that will display on the iOS Lock Screen.",
+                    value: 0,
+                },
+                {
+                    title: "Live Activity with Home Screen Widget",
+                    description: "This will create a Live Activity that will display on the iOS Lock Screen with ability to also display a Home Screen Widget.",
+                    value: 1,
+                },
+                {
+                    title: "Home Screen Widget",
+                    description: "This will create just a Home Screen Widget.",
+                    value: 2,
+                },
+            ],
+            initial: 1,
         });
+        const bundleId = this.$projectConfigService.getValue(`id`, "");
+        if ([0, 1].includes(result.value)) {
+            // shared model only needed with live activities
+            await this.generateSharedWidgetPackage(this.$projectData.projectDir, name);
+        }
+        this.generateWidget(this.$projectData.projectDir, name, bundleId, result.value);
+        this.generateAppleUtility(this.$projectData.projectDir, name, bundleId, result.value);
     }
-    generateSharedWidgetPackage(projectDir, name) {
+    async generateSharedWidgetPackage(projectDir, name) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const sharedWidgetDir = "Shared_Resources/iOS/SharedWidget";
-            const sharedWidgetPath = path.join(projectDir, sharedWidgetDir);
-            const sharedWidgetSourceDir = "Sources/SharedWidget";
-            const sharedWidgetPackagePath = path.join(projectDir, `${sharedWidgetDir}/Package.swift`);
-            const sharedWidgetSourcePath = path.join(sharedWidgetPath, `${sharedWidgetSourceDir}/${(0, utils_1.capitalizeFirstLetter)(name)}Model.swift`);
-            const gitIgnorePath = path.join(projectDir, ".gitignore");
-            if (!fs.existsSync(sharedWidgetPackagePath)) {
-                fs.mkdirSync(sharedWidgetPath, { recursive: true });
-                fs.mkdirSync(path.join(sharedWidgetPath, sharedWidgetSourceDir), {
-                    recursive: true,
-                });
-                let content = `// swift-tools-version:5.9
+        const sharedWidgetDir = "Shared_Resources/iOS/SharedWidget";
+        const sharedWidgetPath = path.join(projectDir, sharedWidgetDir);
+        const sharedWidgetSourceDir = "Sources/SharedWidget";
+        const sharedWidgetPackagePath = path.join(projectDir, `${sharedWidgetDir}/Package.swift`);
+        const sharedWidgetSourcePath = path.join(sharedWidgetPath, `${sharedWidgetSourceDir}/${(0, utils_1.capitalizeFirstLetter)(name)}Model.swift`);
+        const gitIgnorePath = path.join(projectDir, ".gitignore");
+        if (!fs.existsSync(sharedWidgetPackagePath)) {
+            fs.mkdirSync(sharedWidgetPath, { recursive: true });
+            fs.mkdirSync(path.join(sharedWidgetPath, sharedWidgetSourceDir), {
+                recursive: true,
+            });
+            let content = `// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
@@ -144,8 +118,8 @@ let package = Package(
 		)
 	]
 )${os_1.EOL}`;
-                fs.writeFileSync(sharedWidgetPackagePath, content);
-                content = `import ActivityKit
+            fs.writeFileSync(sharedWidgetPackagePath, content);
+            content = `import ActivityKit
 import WidgetKit
 
 public struct ${(0, utils_1.capitalizeFirstLetter)(name)}Model: ActivityAttributes {
@@ -153,12 +127,12 @@ public struct ${(0, utils_1.capitalizeFirstLetter)(name)}Model: ActivityAttribut
 
   public struct ContentState: Codable, Hashable {
     // Dynamic stateful properties about your activity go here!
-    public var driverName: String
-    public var estimatedDeliveryTime: ClosedRange<Date>
+    public var message: String
+    public var deliveryTime: Double
 
-    public init(driverName: String, estimatedDeliveryTime: ClosedRange<Date>) {
-      self.driverName = driverName
-      self.estimatedDeliveryTime = estimatedDeliveryTime
+    public init(message: String, deliveryTime: Double) {
+      self.message = message
+      self.deliveryTime = deliveryTime
     }
   }
 
@@ -171,52 +145,51 @@ public struct ${(0, utils_1.capitalizeFirstLetter)(name)}Model: ActivityAttribut
     self.totalAmount = totalAmount
   }
 }${os_1.EOL}`;
-                fs.writeFileSync(sharedWidgetSourcePath, content);
-                // update spm package
-                const configData = this.$projectConfigService.readConfig(projectDir);
-                if (!configData.ios) {
-                    configData.ios = {};
-                }
-                if (!configData.ios.SPMPackages) {
-                    configData.ios.SPMPackages = [];
-                }
-                const spmPackages = configData.ios.SPMPackages;
-                const sharedWidgetPackage = spmPackages === null || spmPackages === void 0 ? void 0 : spmPackages.find((p) => p.name === "SharedWidget");
-                if (!sharedWidgetPackage) {
-                    spmPackages.push({
-                        name: "SharedWidget",
-                        libs: ["SharedWidget"],
-                        path: "./Shared_Resources/iOS/SharedWidget",
-                        // @ts-ignore
-                        targets: [name],
-                    });
-                }
-                else {
-                    // add target if needed
-                    if (!((_a = sharedWidgetPackage.targets) === null || _a === void 0 ? void 0 : _a.includes(name))) {
-                        sharedWidgetPackage.targets.push(name);
-                    }
+            fs.writeFileSync(sharedWidgetSourcePath, content);
+            // update spm package
+            const configData = this.$projectConfigService.readConfig(projectDir);
+            if (!configData.ios) {
+                configData.ios = {};
+            }
+            if (!configData.ios.SPMPackages) {
+                configData.ios.SPMPackages = [];
+            }
+            const spmPackages = configData.ios.SPMPackages;
+            const sharedWidgetPackage = spmPackages === null || spmPackages === void 0 ? void 0 : spmPackages.find((p) => p.name === "SharedWidget");
+            if (!sharedWidgetPackage) {
+                spmPackages.push({
+                    name: "SharedWidget",
+                    libs: ["SharedWidget"],
+                    path: "./Shared_Resources/iOS/SharedWidget",
+                    // @ts-ignore
+                    targets: [name],
+                });
+            }
+            else {
+                // add target if needed
+                if (!((_a = sharedWidgetPackage.targets) === null || _a === void 0 ? void 0 : _a.includes(name))) {
+                    sharedWidgetPackage.targets.push(name);
                 }
-                configData.ios.SPMPackages = spmPackages;
-                yield this.$projectConfigService.setValue("", // root
-                configData);
-                if (fs.existsSync(gitIgnorePath)) {
-                    const gitIgnore = fs.readFileSync(gitIgnorePath, {
-                        encoding: "utf-8",
-                    });
-                    const swiftBuildIgnore = `# Swift
+            }
+            configData.ios.SPMPackages = spmPackages;
+            await this.$projectConfigService.setValue("", // root
+            configData);
+            if (fs.existsSync(gitIgnorePath)) {
+                const gitIgnore = fs.readFileSync(gitIgnorePath, {
+                    encoding: "utf-8",
+                });
+                const swiftBuildIgnore = `# Swift
 .build
 .swiftpm`;
-                    if (gitIgnore.indexOf(swiftBuildIgnore) === -1) {
-                        content = `${gitIgnore}${os_1.EOL}${swiftBuildIgnore}${os_1.EOL}`;
-                        fs.writeFileSync(gitIgnorePath, content);
-                    }
+                if (gitIgnore.indexOf(swiftBuildIgnore) === -1) {
+                    content = `${gitIgnore}${os_1.EOL}${swiftBuildIgnore}${os_1.EOL}`;
+                    fs.writeFileSync(gitIgnorePath, content);
                 }
-                console.log(`\nCreated Shared Resources: ${sharedWidgetDir}.\n`);
             }
-        });
+            console.log(`\nCreated Shared Resources: ${sharedWidgetDir}.\n`);
+        }
     }
-    generateWidget(projectDir, name, type) {
+    generateWidget(projectDir, name, bundleId, type) {
         const appResourcePath = this.$projectData.appResourcesDirectoryPath;
         const capitalName = (0, utils_1.capitalizeFirstLetter)(name);
         const appInfoPlistPath = path.join(appResourcePath, "iOS", "Info.plist");
@@ -230,7 +203,7 @@ public struct ${(0, utils_1.capitalizeFirstLetter)(name)}Model: ActivityAttribut
         const widgetBundlePath = path.join(widgetPath, `${capitalName}Bundle.swift`);
         const widgetHomeScreenPath = path.join(widgetPath, `${capitalName}HomeScreenWidget.swift`);
         const widgetLiveActivityPath = path.join(widgetPath, `${capitalName}LiveActivity.swift`);
-        const appIntentPath = path.join(widgetPath, `AppIntent.swift`);
+        // const appIntentPath = path.join(widgetPath, `AppIntent.swift`);
         // const widgetLockScreenControlPath = path.join(
         // 	widgetPath,
         // 	`${capitalName}LockScreenControl.swift`
@@ -247,6 +220,10 @@ public struct ${(0, utils_1.capitalizeFirstLetter)(name)}Model: ActivityAttribut
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.widgetkit-extension</string>
 	</dict>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
 </dict>
 </plist>${os_1.EOL}`;
             fs.writeFileSync(extensionsInfoPath, content);
@@ -278,117 +255,124 @@ public struct ${(0, utils_1.capitalizeFirstLetter)(name)}Model: ActivityAttribut
 import SwiftUI
 
 @main
-struct ${capitalName}Bundle: WidgetBundle {
+struct ${capitalName}Bundle: SwiftUI.WidgetBundle {
 	var body: some Widget {
 		${[1, 2].includes(type) ? capitalName + "HomeScreenWidget()" : ""}
 		${[0, 1].includes(type) ? capitalName + "LiveActivity()" : ""}
 	}
 }${os_1.EOL}`;
             fs.writeFileSync(widgetBundlePath, content);
-            content = `import WidgetKit
-import AppIntents
-
-struct ConfigurationAppIntent: WidgetConfigurationIntent {
-    static var title: LocalizedStringResource { "Pizza Delivery" }
-    static var description: IntentDescription { "Get up to date delivery details" }
-
-    // An example configurable parameter.
-    @Parameter(title: "Favorite Pizza", default: "🍕")
-    var favoritePizza: String
-
-    @Parameter(title: "Random", default: "Hello")
-    var random: String
-}${os_1.EOL}`;
-            fs.writeFileSync(appIntentPath, content);
             if ([0, 1].includes(type)) {
                 content = `import ActivityKit
 import SwiftUI
 import WidgetKit
 import Foundation
 import SharedWidget
+import os
 
 struct ${capitalName}LiveActivity: Widget {
-  var body: some WidgetConfiguration {
-    ActivityConfiguration(for: ${capitalName}Model.self) { context in
-      // Lock screen/banner UI goes here
-      ContentView(driver: context.state.driverName)
-        .activityBackgroundTint(Color.black)
-        .activitySystemActionForegroundColor(Color.white)
-
-    } dynamicIsland: { context in
-      DynamicIsland {
-        // Expanded UI goes here.  Compose the expanded UI through
-        // various regions, like leading/trailing/center/bottom
-        DynamicIslandExpandedRegion(.leading) {
-            if let timeLeft = timeLeft(range1: Date(), range2: context.state.estimatedDeliveryTime) {
-              Image(systemName: "car")
-                  .resizable()
-                  .scaledToFit()
-                  .frame(width: 50, height: 50) // Adjust size
-                  .foregroundColor(timeLeft <= 1000 ? Color.green : Color.orange)
-            }
-        }
-        DynamicIslandExpandedRegion(.trailing) {
-            if let timeLeft = timeLeft(range1: Date(), range2: context.state.estimatedDeliveryTime) {
-                ProgressView(value: timeLeft, total: 3600)
-                    .progressViewStyle(.circular)
-                    .tint(timeLeft <= 1000 ? Color.green : Color.orange)
-            }
-        }
-        DynamicIslandExpandedRegion(.bottom) {
-            if let timeLeft = timeLeft(range1: Date(), range2: context.state.estimatedDeliveryTime) {
-                Text("\\(context.state.driverName) \\(timeLeft <= 0 ? "has arrived!" : String(format: "is %.1f min away", timeLeft / 60))")
-            }
-        }
-      } compactLeading: {
-        if let timeLeft = timeLeft(range1: Date(), range2: context.state.estimatedDeliveryTime) {
-          Image(systemName: "car")
-              .resizable()
-              .scaledToFit()
-              .frame(width: 20, height: 20)
-              .foregroundColor(timeLeft <= 0 ? .green : .orange)
-        }
-      } compactTrailing: {
-        if let timeLeft = timeLeft(range1: Date(), range2: context.state.estimatedDeliveryTime) {
-          Image(systemName: "timer.circle.fill")
-              .resizable()
-              .scaledToFit()
-              .frame(width: 20, height: 20)
-              .foregroundColor(timeLeft <= 0 ? .green : .orange)
-        }
-      } minimal: {
-        Text(context.state.driverName).font(.system(size: 12)) 
-      }
-      .widgetURL(URL(string: "http://www.apple.com"))
-      .keylineTint(Color.red)
-    }
-  }
     
-    func timeLeft(range1: Date, range2: ClosedRange<Date>) -> TimeInterval? {
-        let end = min(range1, range2.upperBound)
-        
-        if end > range1 {
-          	let remaining = end.timeIntervalSince(range1)
-          	print("Time left: \\(remaining)")
-        	return remaining
-        } else {
-            return 0
-        }
-    }
+	var body: some WidgetConfiguration {
+		ActivityConfiguration(for: ${capitalName}Model.self) { context in
+
+			LockScreenView(message: context.state.message, deliveryTime: context.state.deliveryTime)
+				.activityBackgroundTint(Color.black)
+				.activitySystemActionForegroundColor(Color.white)
+
+		} dynamicIsland: { context in
+			DynamicIsland {
+				DynamicIslandExpandedRegion(.leading) {
+					Image(systemName: context.state.deliveryTime >= 0 ? "car.side.arrowtriangle.up.fill" : "face.smiling.inverse")
+						.resizable()
+						.scaledToFit()
+						.frame(width: 50, height: 50)
+						.foregroundColor(context.state.deliveryTime >= 0 ? Color.green : Color.blue)
+				}
+				DynamicIslandExpandedRegion(.trailing) {
+					if (context.state.deliveryTime >= 0) {
+						ZStack {
+							ProgressView(value: context.state.deliveryTime, total: 60)
+								.progressViewStyle(.circular)
+								.tint(Color.green)
+								.frame(width: 75, height: 75)
+							Text("\\(formatter.string(for: context.state.deliveryTime) ?? "") mins")
+								.font(.system(size: 11)) 
+								.foregroundStyle(.white)
+						}.frame(width: 75, height: 75)
+					} else {
+						Image(systemName: "checkmark.circle.fill")
+							.resizable()
+							.scaledToFit()
+							.frame(width: 50, height: 50)
+							.foregroundColor(.blue)
+					}
+				}
+				DynamicIslandExpandedRegion(.bottom) {
+					Text("\\(context.state.message)")
+				}
+			} compactLeading: {
+				Image(systemName: context.state.deliveryTime >= 0 ? "car.side.arrowtriangle.up.fill" : "face.smiling.inverse")
+					.resizable()
+					.scaledToFit()
+					.frame(width: 20, height: 20)
+					.foregroundColor(context.state.deliveryTime >= 0 ? .green : .blue)
+			} compactTrailing: {
+				Image(systemName: context.state.deliveryTime >= 0 ? "timer.circle.fill" : "checkmark.circle.fill")
+					.resizable()
+					.scaledToFit()
+					.frame(width: 20, height: 20)
+					.foregroundColor(context.state.deliveryTime >= 0 ? .green : .blue)
+			} minimal: {
+				Text(context.state.message).font(.system(size: 12)) 
+			}
+			.widgetURL(URL(string: "http://www.apple.com"))
+			.keylineTint(Color.red)
+		}
+	}
+
+	private let formatter: NumberFormatter = {
+        let formatter = NumberFormatter()
+        formatter.maximumFractionDigits = 0
+        formatter.minimumFractionDigits = 0
+        return formatter
+    }()
 }
 
-struct ContentView: View {
-  @State var driver = ""
+struct LockScreenView: View {
+	@State private var message = ""
+	@State private var deliveryTime: Double = 0
+	// for console debugging
+	let logger = Logger(subsystem: "${bundleId}.${name}", category: "Widget")
 
-  var body: some View {
-	HStack {
-      Spacer()
-      Image(uiImage: UIImage(named: "pizza-live") ?? UIImage())
-      Spacer()
-      Text("\\(driver) is on \\(driver == "Sally" ? "her" : "his") way!")
-      Spacer()
-    }.frame(maxWidth: .infinity, maxHeight: .infinity)
-  }
+	var body: some View {
+		ZStack {
+			LinearGradient(
+				gradient: Gradient(colors: [Color.gray.opacity(0.3), Color.black]),
+				startPoint: .top,
+				endPoint: .bottom
+			)
+			VStack {
+				Spacer()
+				Image(systemName: deliveryTime >= 0 ? "car.side.arrowtriangle.up.fill" : "face.smiling.inverse")
+					.resizable()
+					.scaledToFit()
+					.frame(width: 50, height: 50)
+					.foregroundColor(deliveryTime >= 0 ? .green : .blue)
+				Spacer()
+				Text("\\(message)")
+					.foregroundStyle(.white)
+				Spacer()
+			}
+		}.frame(maxWidth: .infinity, maxHeight: .infinity)		
+	}
+
+	init(message: String = "", deliveryTime: Double = 0) {
+        _message = State(initialValue: message)
+        _deliveryTime = State(initialValue: deliveryTime)
+
+        // Logs the deliveryTime at init for debugging purposes if needed
+        logger.log("deliveryTime: \\(deliveryTime)")
+    }
 }${os_1.EOL}`;
                 fs.writeFileSync(widgetLiveActivityPath, content);
             }
@@ -396,129 +380,179 @@ struct ContentView: View {
                 content = `import SwiftUI
 import WidgetKit
 
-struct Provider: AppIntentTimelineProvider {
+/**
+ * Widget data shared between the app and the widget extension.
+ */
+struct WidgetData: Codable {
+    let pizzas: [String]
+    let orderTime: Double
+    let delivered: Bool
+}
+
+struct Provider: TimelineProvider {
+    
     func placeholder(in context: Context) -> SimpleEntry {
-        SimpleEntry(date: Date(), random: "Starting", configuration: ConfigurationAppIntent())
+        SimpleEntry(date: Date(), pizza: "Pepperoni", delivered: false, orderTime: Date())
     }
-    
-    func snapshot(for configuration: ConfigurationAppIntent, in context: Context) async -> SimpleEntry
-    {
-        SimpleEntry(date: Date(), random: configuration.random, configuration: configuration)
+
+    func getSnapshot(in context: Context, completion: @escaping (SimpleEntry) -> ()) {
+        let entry = SimpleEntry(date: Date(), pizza: "Pepperoni", delivered: false, orderTime: Date())
+        completion(entry)
     }
-    
-    func timeline(for configuration: ConfigurationAppIntent, in context: Context) async -> Timeline<
-        SimpleEntry
-    > {
+
+    func getTimeline(in context: Context, completion: @escaping @Sendable (Timeline<Entry>) -> ()) {
         var entries: [SimpleEntry] = []
-        
-        // Generate a timeline consisting of five entries a second apart, starting from the current time.
-        let currentDate = Date()
-        for secondOffset in 0..<5 {
-            let entryDate = Calendar.current.date(
-                byAdding: .second, value: secondOffset, to: currentDate)!
-            var config = configuration
-            switch (secondOffset) {
-            case 1:
-                config = .pepperoni
-            case 2:
-                config = .supreme
-            case 3:
-                config = .cowboy
-            case 4:
-                config = .pineswine
-            default:
-                break;
+
+        if let sharedDefaults = UserDefaults(suiteName: "group.${bundleId}") {
+            let currentDate = Date()
+            if let jsonString = sharedDefaults.string(forKey: "widgetData") {
+                if let jsonData = jsonString.data(using: .utf8) {
+                    do {
+                        let widgetData = try JSONDecoder().decode(WidgetData.self, from: jsonData)
+                        let pizzas = widgetData.pizzas
+                        let orderTime = Date(timeIntervalSince1970: widgetData.orderTime/1000)
+                        let delivered = widgetData.delivered
+                        
+                        // Generate a timeline of entries 1 second apart, starting from the current date.
+                        for secondOffset in 0..<pizzas.count {
+                            let entryDate = Calendar.current.date(
+                                byAdding: .second, value: secondOffset, to: currentDate)!
+                            let entry = SimpleEntry(date: entryDate, pizza: secondOffset < pizzas.count ? pizzas[secondOffset] : pizzas[0], delivered: delivered, orderTime: orderTime)
+                            entries.append(entry)
+                        }
+                    } catch {
+                        print("Failed to decode JSON: (error)")
+                    }
+                }
+            } else {
+                let entry = SimpleEntry(date: currentDate, pizza: "", delivered: false, orderTime: nil)
+                entries.append(entry)
             }
-            let entry = SimpleEntry(date: entryDate, random: config.random, configuration: config)
-            entries.append(entry)
         }
-        
-        return Timeline(entries: entries, policy: .atEnd)
+
+        let timeline = Timeline(entries: entries, policy: .atEnd)
+        completion(timeline)
     }
+
+//    func relevances() async -> WidgetRelevances<Void> {
+//        // Generate a list containing the contexts this widget is relevant in.
+//    }
 }
 
 struct SimpleEntry: TimelineEntry {
     let date: Date
-    let random: String
-    let configuration: ConfigurationAppIntent
+    let pizza: String
+    let delivered: Bool
+    let orderTime: Date?
 }
 
 struct WidgetView: View {
+    @Environment(\\.widgetFamily) var widgetFamily
     var entry: Provider.Entry
     
     var body: some View {
-        ZStack {
-            Image(uiImage: UIImage(named: "pizza") ?? UIImage()).frame(
-                maxWidth: .infinity, maxHeight: .infinity)
-            VStack {
-                Text("Time:")
-                    .foregroundStyle(.white)
-                Text(entry.date, style: .time)
-                    .foregroundStyle(.white)
-                Text("Random City:")
-                    .foregroundStyle(.white)
-                Text(entry.configuration.random)
-                    .foregroundStyle(.white)
-                Text("Favorite Pizza:")
-                    .foregroundStyle(.white)
-                Text(entry.configuration.favoritePizza)
+        VStack {
+            if (entry.pizza != "") {
+                Spacer()
+                Image(systemName: entry.delivered ? "face.smiling.inverse" : "car.side")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: iconSize(for: widgetFamily), height: iconSize(for: widgetFamily))
+                    .foregroundColor(entry.delivered ? .blue : .green)
+                Spacer()
+                if (entry.delivered) {
+                    Text("Pizza Delivered!")
+                        .font(.system(size: fontSize(for: widgetFamily), weight: .bold))
+                        .foregroundStyle(.white)
+                } else {
+                    HStack(spacing: 4) {
+                        Text("Ordered:")
+                            .font(.system(size: fontSize(for: widgetFamily)))
+                            .foregroundStyle(.white)
+                        Text(entry.orderTime!, style: .time)
+                            .font(.system(size: fontSize(for: widgetFamily), weight: .bold))
+                            .foregroundStyle(.white)
+                    }
+                    HStack(spacing: 4) {
+                        Text("Pizza:")
+                            .font(.system(size: fontSize(for: widgetFamily)))
+                            .foregroundStyle(.white)
+                        Text(entry.pizza)
+                            .font(.system(size: fontSize(for: widgetFamily), weight: .bold))
+                            .foregroundStyle(.white)
+                    } 
+                }
+                Spacer() 
+            } else {
+                Spacer()
+                Image(systemName: "car.side.rear.open")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: iconSize(for: widgetFamily), height: iconSize(for: widgetFamily))
+                    .foregroundColor(.gray)
+                Spacer()
+                Text("Awaiting orders...")
                     .foregroundStyle(.white)
+                Spacer()
             }
         }.frame(maxWidth: .infinity, maxHeight: .infinity)
     }
+
+    private func iconSize(for family: WidgetFamily) -> CGFloat {
+        switch family {
+        case .systemSmall:
+            return 65
+        case .systemMedium:
+            return 85
+        case .systemLarge:
+            return 150
+        default:
+            return 65 
+        }
+    }
+
+    private func fontSize(for family: WidgetFamily) -> CGFloat {
+        switch family {
+        case .systemSmall:
+            return 12
+        case .systemMedium:
+            return 14
+        case .systemLarge:
+            return 18
+        default:
+            return 14 
+        }
+    }
 }
 
 @available(iOSApplicationExtension 17.0, *)
 struct ${capitalName}HomeScreenWidget: Widget {
     let kind: String = "widget"
-    
+
     var body: some WidgetConfiguration {
-        AppIntentConfiguration(kind: kind, intent: ConfigurationAppIntent.self, provider: Provider()) {
-            entry in
+        StaticConfiguration(kind: kind, provider: Provider()) { entry in
             WidgetView(entry: entry)
-                .containerBackground(.fill.tertiary, for: .widget)
+                .containerBackground(for: .widget) {
+                    LinearGradient(
+                        gradient: Gradient(colors: [Color.black.opacity(0.6), Color.black]),
+                        startPoint: .top,
+                        endPoint: .bottom
+                    )
+                }
         }
-    }
-}
-
-extension ConfigurationAppIntent {
-    fileprivate static var pepperoni: ConfigurationAppIntent {
-        let intent = ConfigurationAppIntent()
-        intent.favoritePizza = "Pepperoni"
-        intent.random = "Georgia"
-        return intent
-    }
-    fileprivate static var supreme: ConfigurationAppIntent {
-        let intent = ConfigurationAppIntent()
-        intent.favoritePizza = "Supreme"
-        intent.random = "Kansas City"
-        return intent
-    }
-    
-    fileprivate static var cowboy: ConfigurationAppIntent {
-        let intent = ConfigurationAppIntent()
-        intent.favoritePizza = "Cowboy"
-        intent.random = "Nashville"
-        return intent
-    }
-    
-    fileprivate static var pineswine: ConfigurationAppIntent {
-        let intent = ConfigurationAppIntent()
-        intent.favoritePizza = "Pine & Swine"
-        intent.random = "Portland"
-        return intent
+        .configurationDisplayName("${capitalName} Widget")
+        .description("${capitalName} delivery service.")
     }
 }
 
 #Preview(as: .systemSmall) {
     ${capitalName}HomeScreenWidget()
 } timeline: {
-    SimpleEntry(date: .now, random: "Atlanta", configuration: .pepperoni)
-    SimpleEntry(date: .now, random: "Austin", configuration: .supreme)
+    SimpleEntry(date: .now, pizza: "Pepperoni", delivered: false, orderTime: Date())
+    SimpleEntry(date: .now, pizza: "Hawaiian", delivered: false, orderTime: Date())
 }${os_1.EOL}`;
                 fs.writeFileSync(widgetHomeScreenPath, content);
             }
-            const bundleId = this.$projectConfigService.getValue(`id`, "");
             content = `{
     "${bundleId}.${name}": "{set-your-provision-profile-id}"
 }`;
@@ -624,18 +658,22 @@ extension ConfigurationAppIntent {
 }${os_1.EOL}`;
             fs.writeFileSync(extensionsConfigPath, content);
             console.log(`🚀 Your widget is now ready to develop: App_Resources/iOS/extensions/${name}.\n`);
-            console.log(`Followup steps:\n
-- Update	App_Resources/iOS/extensions/provisioning.json with your profile id.
-- Customize	App_Resources/iOS/extensions/${name}/${(0, utils_1.capitalizeFirstLetter)(name)}LiveActivity.swift for your display.
-- Customize	Shared_Resources/iOS/SharedWidget/Sources/SharedWidget/${(0, utils_1.capitalizeFirstLetter)(name)}Model.swift for your data.
-`);
+            const steps = ["Followup steps:"];
+            steps.push("- Check		App_Resources/iOS/build.xcconfig uses IPHONEOS_DEPLOYMENT_TARGET = 17 or higher.");
+            steps.push("- Update	App_Resources/iOS/extensions/provisioning.json with your profile id.");
+            if ([0, 1].includes(type)) {
+                steps.push(`- Customize	App_Resources/iOS/extensions/${name}/${(0, utils_1.capitalizeFirstLetter)(name)}LiveActivity.swift for your display.`);
+                steps.push(`- Customize	Shared_Resources/iOS/SharedWidget/Sources/SharedWidget/${(0, utils_1.capitalizeFirstLetter)(name)}Model.swift for your data.`);
+            }
+            console.log(steps.join("\n"));
         }
         // if (fs.existsSync(filePath)) {
         // 	this.$errors.failWithHelp(`Error: File '${filePath}' already exists.`);
         // 	return;
         // }
     }
-    generateAppleUtility(projectDir, name) {
+    generateAppleUtility(projectDir, name, bundleId, type) {
+        const capitalName = (0, utils_1.capitalizeFirstLetter)(name);
         const appResourcePath = this.$projectData.appResourcesDirectoryPath;
         const appResourceSrcPath = path.join(appResourcePath, "iOS", "src");
         const appleUtilityPath = path.join(appResourceSrcPath, `AppleWidgetUtils.swift`);
@@ -645,30 +683,21 @@ extension ConfigurationAppIntent {
         }
         if (!fs.existsSync(appleUtilityPath)) {
         }
-        let content = `import Foundation
-import UIKit
-import ActivityKit
-import WidgetKit
-import SharedWidget
-
-@objcMembers
-public class AppleWidgetUtils: NSObject {
-    
-    // Live Activity Handling
+        const liveActivityUtilities = `// Live Activity Handling
     public static func startActivity(_ data: NSDictionary) {
         if ActivityAuthorizationInfo().areActivitiesEnabled {
 			let numberOfPizzas = data.object(forKey: "numberOfPizzas") as! Int
             let totalAmount = data.object(forKey: "totalAmount") as! String
-            let attrs = ${(0, utils_1.capitalizeFirstLetter)(name)}Model(numberOfPizzas: numberOfPizzas, totalAmount: totalAmount)
+            let attrs = ${capitalName}Model(numberOfPizzas: numberOfPizzas, totalAmount: totalAmount)
             
-			let driverName = data.object(forKey: "driverName") as! String
-            let deliveryTime = data.object(forKey: "deliveryTime") as! CGFloat
-            let initialStatus = ${(0, utils_1.capitalizeFirstLetter)(name)}Model.DeliveryStatus(
-                driverName: driverName, estimatedDeliveryTime: Date()...Date().addingTimeInterval(deliveryTime * 60))
+			let message = data.object(forKey: "message") as! String
+            let deliveryTime = data.object(forKey: "deliveryTime") as! Double
+            let initialStatus = ${capitalName}Model.DeliveryStatus(
+                message: message, deliveryTime: deliveryTime)
             let content = ActivityContent(state: initialStatus, staleDate: nil)
             
             do {
-                let activity = try Activity<${(0, utils_1.capitalizeFirstLetter)(name)}Model>.request(
+                let activity = try Activity<${capitalName}Model>.request(
                     attributes: attrs,
                     content: content,
                     pushType: nil)
@@ -681,13 +710,13 @@ public class AppleWidgetUtils: NSObject {
     public static func updateActivity(_ data: NSDictionary) {
         if ActivityAuthorizationInfo().areActivitiesEnabled {
             Task {
-				let driverName = data.object(forKey: "driverName") as! String
-                let deliveryTime = data.object(forKey: "deliveryTime") as! CGFloat
-                let status = ${(0, utils_1.capitalizeFirstLetter)(name)}Model.DeliveryStatus(
-                    driverName: driverName, estimatedDeliveryTime: Date()...Date().addingTimeInterval(deliveryTime * 60))
+				let message = data.object(forKey: "message") as! String
+                let deliveryTime = data.object(forKey: "deliveryTime") as! Double
+                let status = ${capitalName}Model.DeliveryStatus(
+                    message: message, deliveryTime: deliveryTime)
                 let content = ActivityContent(state: status, staleDate: nil)
                 
-                for activity in Activity<${(0, utils_1.capitalizeFirstLetter)(name)}Model>.activities {
+                for activity in Activity<${capitalName}Model>.activities {
                     await activity.update(content)
                 }
             }
@@ -696,27 +725,47 @@ public class AppleWidgetUtils: NSObject {
     public static func cancelActivity(_ data: NSDictionary) {
         if ActivityAuthorizationInfo().areActivitiesEnabled {
             Task {
-				let driverName = data.object(forKey: "driverName") as! String
-                let status = ${(0, utils_1.capitalizeFirstLetter)(name)}Model.DeliveryStatus(
-                    driverName: driverName, estimatedDeliveryTime: Date()...Date())
+				let message = data.object(forKey: "message") as! String
+                let status = ${capitalName}Model.DeliveryStatus(
+                    message: message, deliveryTime: 0)
                 let content = ActivityContent(state: status, staleDate: nil)
                 
-                for activity in Activity<${(0, utils_1.capitalizeFirstLetter)(name)}Model>.activities {
+                for activity in Activity<${capitalName}Model>.activities {
                     await activity.end(content, dismissalPolicy: .immediate)
                 }
             }
         }
-    }
-    public static func showAllActivities() {
-        if ActivityAuthorizationInfo().areActivitiesEnabled {
-            Task {
-                for activity in Activity<${(0, utils_1.capitalizeFirstLetter)(name)}Model>.activities {
-                    print("Activity Details: \\(activity.id) -> \\(activity.attributes)")
-                }
-            }
-        }
-    }
-    
+    }`;
+        let content = `import Foundation
+import UIKit
+import ActivityKit
+import WidgetKit
+${[0, 1].includes(type) ? "import SharedWidget" : ""}
+
+@objcMembers
+public class AppleWidgetUtils: NSObject {
+	${[0, 1].includes(type) ? liveActivityUtilities : ""}
+	// Shared App Group Data
+    public static func getData(key: String) -> String? {
+		guard let sharedDefaults = UserDefaults(suiteName: "group.${bundleId}") else {
+			return nil
+		}
+		return sharedDefaults.object(forKey: key) as? String
+	}
+    public static func updateData(key: String, _ data: String) {
+		guard let sharedDefaults = UserDefaults(suiteName: "group.${bundleId}") else {
+			return
+		}
+		sharedDefaults.set(data, forKey: key)
+    	sharedDefaults.synchronize()
+	}
+	public static func removeData(key: String) {
+		guard let sharedDefaults = UserDefaults(suiteName: "group.${bundleId}") else {
+			return
+		}
+		sharedDefaults.removeObject(forKey: key)
+        sharedDefaults.synchronize()
+	}
     // Home Screen Widget Handling
     public static func updateWidget() {
         if #available(iOS 14.0, *) {
@@ -733,17 +782,19 @@ public class AppleWidgetUtils: NSObject {
 declare interface AppleWidgetModelData {
   numberOfPizzas: number;
   totalAmount: string;
-  driverName: string;
+  message: string;
   deliveryTime: number;
 }
 declare class AppleWidgetUtils extends NSObject {
   static startActivity(data: AppleWidgetModelData): void;
   static updateActivity(
-    data: Pick<AppleWidgetModelData, "driverName" | "deliveryTime">
+    data: Pick<AppleWidgetModelData, "message" | "deliveryTime">
   ): void;
-  static cancelActivity(data: Pick<AppleWidgetModelData, "driverName">): void;
-  static showAllActivities(): void;
+  static cancelActivity(data: Pick<AppleWidgetModelData, "message">): void;
   static updateWidget(): void;
+  static updateDataWithKey(key: string, data: string): void;
+  static getDataWithKey(key: string): string;
+  static removeDataWithKey(key: string): void;
 }${os_1.EOL}`;
         if (!fs.existsSync(referenceTypesPath)) {
             const references = `/// <reference path="./node_modules/@nativescript/types-android/index.d.ts" />