Widget Updates

• Can now read data written by main app • Has preview capability in widget gallery • Still to solve using ORGANIZATION_IDENTIFIER
2025-01-28 01:39:47 +01:00 · 2020-07-11 17:01:09 +08:00 · 2020-07-11 17:01:09 +08:00 · 1cc5f3cc30
commit 1cc5f3cc30
parent a45ba35b24
11 changed files with 350 additions and 31 deletions
--- a/Multiplatform/Shared/MainApp.swift
+++ b/Multiplatform/Shared/MainApp.swift
@ -89,9 +89,8 @@ struct MainApp: App {
 				.modifier(PreferredColorSchemeModifier(preferredColorScheme: defaults.userInterfaceColorPalette))
 				.onReceive(NotificationCenter.default.publisher(for: UIApplication.didEnterBackgroundNotification)) { _ in
 					print("didEnterBackgroundNotification")
-					appDelegate.refreshWidgetData()
+					WidgetDataEncoder.encodeWidgetData()
 				}
-				
 		}
 		.commands {
 			CommandGroup(after: .newItem, addition: {
--- a/Data/WidgetDataDecoder.swift
+++ b/Data/WidgetDataDecoder.swift
@ -0,0 +1,40 @@
+//
+//  WidgetDataDecoder.swift
+//  NetNewsWire
+//
+//  Created by Stuart Breckenridge on 11/7/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+
+struct WidgetDataDecoder {
+	
+	static func decodeWidgetData() throws -> WidgetData {
+		let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String
+		print(appGroup)
+		let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup)
+		let dataURL = containerURL?.appendingPathComponent("widget-data.json")
+		print("decoder path: \(dataURL!.path)")
+		
+		if FileManager.default.fileExists(atPath: dataURL!.path) {
+			let decodedWidgetData = try JSONDecoder().decode(WidgetData.self, from: Data(contentsOf: dataURL!))
+			return decodedWidgetData
+		} else {
+			print("No data at location")
+			return WidgetData(currentUnreadCount: 0, currentTodayCount: 0, latestArticles: [], lastUpdateTime: Date())
+		}
+	}
+	
+	static func sampleData() -> WidgetData {
+		let pathToSample = Bundle.main.url(forResource: "widget-data-sample", withExtension: "json")
+		do {
+			let data = try Data(contentsOf: pathToSample!)
+			let decoded = try JSONDecoder().decode(WidgetData.self, from: data)
+			return decoded
+		} catch {
+			return WidgetData(currentUnreadCount: 12, currentTodayCount: 12, latestArticles: [], lastUpdateTime: Date())
+		}
+	}
+	
+}
--- a/Data/WidgetDataEncoder.swift
+++ b/Data/WidgetDataEncoder.swift
@ -0,0 +1,54 @@
+//
+//  WidgetDataEncoder.swift
+//  Multiplatform iOS
+//
+//  Created by Stuart Breckenridge on 11/7/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+import WidgetKit
+import os.log
+
+struct WidgetDataEncoder {
+	
+	static func encodeWidgetData() {
+		os_log(.info, "Starting Widget data refresh")
+		do {
+			let articles = try SmartFeedsController.shared.unreadFeed.fetchArticles().sorted(by: { $0.datePublished! > $1.datePublished!  })
+			var latest = [LatestArticle]()
+			for article in articles {
+				let latestArticle = LatestArticle(feedTitle: article.sortableName,
+												  articleTitle: article.title,
+												  articleSummary: article.summary,
+												  feedIcon: article.iconImage()?.image.dataRepresentation(),
+												  pubDate: article.datePublished!.description)
+				latest.append(latestArticle)
+				if latest.count == 5 { break }
+			}
+			
+			let latestData = WidgetData(currentUnreadCount: SmartFeedsController.shared.unreadFeed.unreadCount,
+										currentTodayCount: SmartFeedsController.shared.todayFeed.unreadCount,
+										latestArticles: latest,
+										lastUpdateTime: Date())
+			
+			let encodedData = try JSONEncoder().encode(latestData)
+			let appGroup = Bundle.main.object(forInfoDictionaryKey: "AppGroup") as! String
+			print(appGroup)
+			let containerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroup)
+			let dataURL = containerURL?.appendingPathComponent("widget-data.json")
+			print("Encoder path: \(dataURL!.path)")
+			if FileManager.default.fileExists(atPath: dataURL!.path) {
+				try FileManager.default.removeItem(at: dataURL!)
+			}
+			try encodedData.write(to: dataURL!)
+			
+			WidgetCenter.shared.reloadAllTimelines()
+			os_log(.info, "Finished data refresh")
+		} catch {
+			os_log(.error, "%@", error.localizedDescription)
+		}
+	}
+	
+	
+}
--- a/Multiplatform/iOS/AppDelegate.swift
+++ b/Multiplatform/iOS/AppDelegate.swift
@ -179,7 +179,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 	@objc func unreadCountDidChange(_ note: Notification) {
 		if note.object is AccountManager {
 			unreadCount = AccountManager.shared.unreadCount
-			refreshWidgetData()
+			WidgetDataEncoder.encodeWidgetData()
 		}
 	}
 	
@ -415,7 +415,7 @@ private extension AppDelegate {
 			}
 			AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log) { [unowned self] in
 				if !AccountManager.shared.isSuspended {
-					self.refreshWidgetData()
+					WidgetDataEncoder.encodeWidgetData()
 					self.suspendApplication()
 					os_log("Account refresh operation completed.", log: self.log, type: .info)
 					task.setTaskCompleted(success: true)
--- a/Multiplatform/iOS/Widget/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/Multiplatform/iOS/Widget/Assets.xcassets/AccentColor.colorset/Contents.json
@ -1,6 +1,33 @@
 {
  "colors" : [
    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.933",
+          "green" : "0.416",
+          "red" : "0.031"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.957",
+          "green" : "0.620",
+          "red" : "0.369"
+        }
+      },
      "idiom" : "universal"
    }
  ],
--- a/Multiplatform/iOS/Widget/Assets.xcassets/WidgetBackground.colorset/Contents.json
+++ b/Multiplatform/iOS/Widget/Assets.xcassets/WidgetBackground.colorset/Contents.json
@ -1,6 +1,28 @@
 {
  "colors" : [
    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "platform" : "ios",
+        "reference" : "systemGray6Color"
+      },
      "idiom" : "universal"
    }
  ],
--- a/Multiplatform/iOS/Widget/Info.plist
+++ b/Multiplatform/iOS/Widget/Info.plist
@ -2,6 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>OrganizationIdentifier</key>
+	<string>$(ORGANIZATION_IDENTIFIER)</string>
+	<key>AppGroup</key>
+	<string>group.$(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS</string>
+	<key>AppIdentifierPrefix</key>
+	<string>$(AppIdentifierPrefix)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
--- a/Multiplatform/iOS/Widget/LatestWidget.swift
+++ b/Multiplatform/iOS/Widget/LatestWidget.swift
@ -10,59 +10,192 @@ import WidgetKit
 import SwiftUI

 struct Provider: TimelineProvider {
-    public typealias Entry = SimpleEntry
+    public typealias Entry = SummaryEntry
+	

-    public func snapshot(with context: Context, completion: @escaping (SimpleEntry) -> ()) {
-        let entry = SimpleEntry(date: Date())
-        completion(entry)
+    public func snapshot(with context: Context, completion: @escaping (SummaryEntry) -> ()) {
+		
+		if context.isPreview {
+			let entry = SummaryEntry(date: Date(),
+									 widgetData: WidgetDataDecoder.sampleData())
+			completion(entry)
+		} else {
+			do {
+				let widgetData = try WidgetDataDecoder.decodeWidgetData()
+				let entry = SummaryEntry(date: Date(), widgetData: widgetData)
+				completion(entry)
+			} catch {
+				let entry = SummaryEntry(date: Date(),
+										 widgetData: WidgetData(currentUnreadCount: 42, currentTodayCount: 42, latestArticles: [], lastUpdateTime: Date()))
+				completion(entry)
+			}
+		}
    }

    public func timeline(with context: Context, completion: @escaping (Timeline<Entry>) -> ()) {
-        var entries: [SimpleEntry] = []
+        
+		// Create current timeline entry for now.
+		let date = Date()
+		var entry: SummaryEntry
+		
+		do {
+			let widgetData = try WidgetDataDecoder.decodeWidgetData()
+			entry = SummaryEntry(date: date, widgetData: widgetData)
+		} catch {
+			entry = SummaryEntry(date: date, widgetData: WidgetData(currentUnreadCount: 42, currentTodayCount: 42, latestArticles: [], lastUpdateTime: Date()))
+		}

-        // Generate a timeline consisting of five entries an hour apart, starting from the current date.
-        let currentDate = Date()
-        for hourOffset in 0 ..< 5 {
-            let entryDate = Calendar.current.date(byAdding: .hour, value: hourOffset, to: currentDate)!
-            let entry = SimpleEntry(date: entryDate)
-            entries.append(entry)
-        }
-
-        let timeline = Timeline(entries: entries, policy: .atEnd)
+		// Configure next update in 1 hour.
+		let nextUpdateDate = Calendar.current.date(byAdding: .hour, value: 1, to: date)!
+		
+		let timeline = Timeline(
+					entries:[entry],
+					policy: .after(nextUpdateDate))
+        
        completion(timeline)
    }
 }

-struct SimpleEntry: TimelineEntry {
+struct SummaryEntry: TimelineEntry {
    public let date: Date
+	public let widgetData: WidgetData
 }

 struct PlaceholderView : View {
+	
+	@Environment(\.widgetFamily) var family: WidgetFamily
+	
    var body: some View {
        Text("Placeholder View")
    }
 }

-struct WidgetEntryView : View {
-    var entry: Provider.Entry
+struct NetNewsWireWidgetView : View {
+    
+	@Environment(\.widgetFamily) var family: WidgetFamily
+	var entry: Provider.Entry

-    var body: some View {
-        Text(entry.date, style: .time)
+    @ViewBuilder var body: some View {
+		switch family {
+		case .systemSmall:
+			compactWidget
+		case .systemMedium:
+			mediumWidget
+		case .systemLarge:
+			compactWidget
+		@unknown default:
+			compactWidget
+		}
    }
+	
+	var compactWidget: some View {
+		VStack(alignment: .leading) {
+			Spacer()
+			// Today
+			HStack(alignment: .firstTextBaseline)  {
+				Image(systemName: "sun.max.fill")
+					.foregroundColor(.orange)
+					.font(.title3)
+				VStack(alignment: .leading) {
+					Text("Today")
+						.font(.title3)
+						.bold()
+						.foregroundColor(.white)
+					Text(String(entry.widgetData.currentTodayCount))
+						.font(.body)
+						.bold()
+						.foregroundColor(.white)
+				}
+				Spacer()
+			}
+			// Unread
+			HStack(alignment: .firstTextBaseline) {
+				Image(systemName: "largecircle.fill.circle")
+					.foregroundColor(.accentColor)
+					.font(.title3)
+				VStack(alignment: .leading) {
+					Text("Unread")
+						.font(.title3)
+						.bold()
+						.foregroundColor(.white)
+						
+					Text(String(entry.widgetData.currentUnreadCount))
+						.font(.body)
+						.bold()
+						.foregroundColor(.white)
+				}
+				Spacer()
+			}
+			Spacer()
+		}
+		.padding()
+		.background(Color("WidgetBackground"))
+	}
+	
+	var mediumWidget: some View {
+		VStack(alignment: .leading) {
+			HStack {
+				Text("LATEST UNREAD ARTICLES")
+					.font(.headline)
+					.foregroundColor(.white)
+				Spacer()
+			}
+			if entry.widgetData.latestArticles.count > 2 {
+					VStack(alignment: .leading) {
+						ForEach(0..<2, content: { i in
+						HStack(alignment: .top) {
+							Image(uiImage: thumbnail(entry.widgetData.latestArticles[i].feedIcon))
+								.resizable()
+								.frame(width: 20, height: 20)
+							VStack(alignment: .leading) {
+								Text(entry.widgetData.latestArticles[i].articleTitle ?? "")
+									.font(.headline)
+									.foregroundColor(.white)
+								Text(entry.widgetData.latestArticles[i].feedTitle)
+									.font(.footnote)
+									.foregroundColor(.gray)
+								Spacer()
+							}
+							Spacer()
+						}
+						})
+					}
+					
+				
+			} else {
+				ForEach(0..<entry.widgetData.latestArticles.count, content: { i in
+					Text(entry.widgetData.latestArticles[i].articleTitle ?? "").font(.headline)
+					Text(entry.widgetData.latestArticles[i].feedTitle)
+						.font(.footnote)
+				})
+			}
+			Spacer()
+		}.padding()
+		.background(Color("WidgetBackground"))
+	}
+	
+	func thumbnail(_ data: Data?) -> UIImage {
+		if data == nil {
+			return UIImage(systemName: "globe")!
+		} else {
+			return UIImage(data: data!)!
+		}
+	}
+	
 }

@main
 struct LatestWidget: Widget {
-    private let kind: String = "Widget"
+    private let kind: String = "com.ranchero.NetNewsWire.widget"

    public var body: some WidgetConfiguration {
        StaticConfiguration(kind: kind,
 							provider: Provider(),
 							placeholder: PlaceholderView()) { entry in
-            WidgetEntryView(entry: entry)
+            NetNewsWireWidgetView(entry: entry)
        }
-        .configurationDisplayName("NetNewsWire Now")
-        .description("This is NetNewsWire.")
+        .configurationDisplayName("NetNewsWire")
+        .description("NetNewsWire")
 		.supportedFamilies([.systemSmall, .systemMedium])
 		
    }
@ -70,7 +203,7 @@ struct LatestWidget: Widget {

 struct Widget_Previews: PreviewProvider {
    static var previews: some View {
-        WidgetEntryView(entry: SimpleEntry(date: Date()))
-            .previewContext(WidgetPreviewContext(family: .systemSmall))
+		NetNewsWireWidgetView(entry: SummaryEntry(date: Date(), widgetData: WidgetDataDecoder.sampleData()))
+            .previewContext(WidgetPreviewContext(family: .systemMedium))
    }
 }
--- a/Multiplatform/iOS/Widget/WidgetExtension.entitlements
+++ b/Multiplatform/iOS/Widget/WidgetExtension.entitlements
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.$(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS</string>
+	</array>
+</dict>
+</plist>
--- a/Multiplatform/iOS/Widget/widget-data-sample.json
+++ b/Multiplatform/iOS/Widget/widget-data-sample.json
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@ -17,6 +17,9 @@
 		1729529B24AA1FD200D65E66 /* MacSearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529A24AA1FD200D65E66 /* MacSearchField.swift */; };
 		175942AA24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
 		175942AB24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
+		1772066324B946EC00970353 /* WidgetDataEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1772066224B946EC00970353 /* WidgetDataEncoder.swift */; };
+		1772068624B9480800970353 /* WidgetDataDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1772068524B9480800970353 /* WidgetDataDecoder.swift */; };
+		1772068724B9480800970353 /* WidgetDataDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1772068524B9480800970353 /* WidgetDataDecoder.swift */; };
 		1776E88E24AC5F8A00E78166 /* AppDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1776E88D24AC5F8A00E78166 /* AppDefaults.swift */; };
 		1776E88F24AC5F8A00E78166 /* AppDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1776E88D24AC5F8A00E78166 /* AppDefaults.swift */; };
 		17930ED424AF10EE00A9BA52 /* AddWebFeedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17930ED324AF10EE00A9BA52 /* AddWebFeedView.swift */; };
@ -28,6 +31,7 @@
 		17D5F17124B0BC6700375168 /* SidebarToolbarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D5F17024B0BC6700375168 /* SidebarToolbarModel.swift */; };
 		17D5F17224B0BC6700375168 /* SidebarToolbarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D5F17024B0BC6700375168 /* SidebarToolbarModel.swift */; };
 		17D5F19524B0C1DD00375168 /* SidebarToolbarModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 172199F024AB716900A31D04 /* SidebarToolbarModifier.swift */; };
+		17E1AFE824B99D20009DD525 /* widget-data-sample.json in Resources */ = {isa = PBXBuildFile; fileRef = 17E1AFC624B99D20009DD525 /* widget-data-sample.json */; };
 		17EEA7F524B8926700AAD8BF /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17EEA7F424B8926700AAD8BF /* WidgetKit.framework */; };
 		17EEA7F724B8926700AAD8BF /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17EEA7F624B8926700AAD8BF /* SwiftUI.framework */; };
 		17EEA7FA24B8926700AAD8BF /* LatestWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17EEA7F924B8926700AAD8BF /* LatestWidget.swift */; };
@ -1811,12 +1815,16 @@
 		1729529224AA1CAA00D65E66 /* GeneralPreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPreferencesView.swift; sourceTree = "<group>"; };
 		1729529624AA1CD000D65E66 /* MacPreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MacPreferencesView.swift; sourceTree = "<group>"; };
 		1729529A24AA1FD200D65E66 /* MacSearchField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacSearchField.swift; sourceTree = "<group>"; };
+		1772066224B946EC00970353 /* WidgetDataEncoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDataEncoder.swift; sourceTree = "<group>"; };
+		1772068524B9480800970353 /* WidgetDataDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDataDecoder.swift; sourceTree = "<group>"; };
+		1772068824B94F6700970353 /* WidgetExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WidgetExtension.entitlements; sourceTree = "<group>"; };
 		1776E88D24AC5F8A00E78166 /* AppDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDefaults.swift; sourceTree = "<group>"; };
 		17930ED324AF10EE00A9BA52 /* AddWebFeedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWebFeedView.swift; sourceTree = "<group>"; };
 		179DBBA2B22A659F81EED6F9 /* AccountsNewsBlurWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsNewsBlurWindowController.swift; sourceTree = "<group>"; };
 		17B223DB24AC24D2001E4592 /* TimelineLayoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineLayoutView.swift; sourceTree = "<group>"; };
 		17D232A724AFF10A0005F075 /* AddWebFeedModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWebFeedModel.swift; sourceTree = "<group>"; };
 		17D5F17024B0BC6700375168 /* SidebarToolbarModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarToolbarModel.swift; sourceTree = "<group>"; };
+		17E1AFC624B99D20009DD525 /* widget-data-sample.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "widget-data-sample.json"; sourceTree = "<group>"; };
 		17EEA7F324B8926700AAD8BF /* WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		17EEA7F424B8926700AAD8BF /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
 		17EEA7F624B8926700AAD8BF /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
@ -2575,7 +2583,9 @@
 		17EEA7F824B8926700AAD8BF /* Widget */ = {
 			isa = PBXGroup;
 			children = (
+				1772068824B94F6700970353 /* WidgetExtension.entitlements */,
 				17EEA7F924B8926700AAD8BF /* LatestWidget.swift */,
+				17E1AFC624B99D20009DD525 /* widget-data-sample.json */,
 				17EEA7FB24B8926700AAD8BF /* Assets.xcassets */,
 				17EEA7FD24B8926700AAD8BF /* Info.plist */,
 			);
@ -2586,6 +2596,8 @@
 			isa = PBXGroup;
 			children = (
 				17EEA80524B8996100AAD8BF /* WidgetData.swift */,
+				1772066224B946EC00970353 /* WidgetDataEncoder.swift */,
+				1772068524B9480800970353 /* WidgetDataDecoder.swift */,
 			);
 			path = "Widget Data";
 			sourceTree = "<group>";
@ -4230,6 +4242,7 @@
 				TargetAttributes = {
 					17EEA7F224B8926700AAD8BF = {
 						CreatedOnToolsVersion = 12.0;
+						DevelopmentTeam = FQLBNX3GP7;
 						ProvisioningStyle = Automatic;
 					};
 					51314636235A7BBE00387FDC = {
@ -4696,6 +4709,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				17EEA7FC24B8926700AAD8BF /* Assets.xcassets in Resources */,
+				17E1AFE824B99D20009DD525 /* widget-data-sample.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -5038,6 +5052,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1772068724B9480800970353 /* WidgetDataDecoder.swift in Sources */,
 				17EEA7FA24B8926700AAD8BF /* LatestWidget.swift in Sources */,
 				17EEA80724B8996100AAD8BF /* WidgetData.swift in Sources */,
 			);
@ -5121,6 +5136,7 @@
 				65ACE48A24B4C2D8003AE06A /* SettingsFeedbinAccountView.swift in Sources */,
 				51E4993624A867E800B667CB /* UserInfoKey.swift in Sources */,
 				51E4990924A808C500B667CB /* WebFeedIconDownloader.swift in Sources */,
+				1772066324B946EC00970353 /* WidgetDataEncoder.swift in Sources */,
 				51E498F524A8085D00B667CB /* TodayFeedDelegate.swift in Sources */,
 				172199F124AB716900A31D04 /* SidebarToolbarModifier.swift in Sources */,
 				65CBAD5A24AE03C20006DD91 /* ColorPaletteContainerView.swift in Sources */,
@ -5175,6 +5191,7 @@
 				51E4996824A8760C00B667CB /* ArticleStyle.swift in Sources */,
 				51E4990024A808BB00B667CB /* FaviconGenerator.swift in Sources */,
 				51E4997124A8764C00B667CB /* ActivityType.swift in Sources */,
+				1772068624B9480800970353 /* WidgetDataDecoder.swift in Sources */,
 				51E4991E24A8094300B667CB /* RSImage-AppIcons.swift in Sources */,
 				51E499D824A912C200B667CB /* SceneModel.swift in Sources */,
 				5177470E24B2FF6F00EB0F74 /* ArticleView.swift in Sources */,
@ -6198,9 +6215,12 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = Multiplatform/iOS/Widget/WidgetExtension.entitlements;
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = FQLBNX3GP7;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@ -6223,7 +6243,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.stuartbreckenridge.NetNewsWire.iOS.Widget;
+				PRODUCT_BUNDLE_IDENTIFIER = com.stuartbreckenridge.opensource.NetNewsWire.iOS.Widget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@ -6269,9 +6289,12 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = Multiplatform/iOS/Widget/WidgetExtension.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = FQLBNX3GP7;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@ -6287,8 +6310,9 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.stuartbreckenridge.NetNewsWire.iOS.Widget;
+				PRODUCT_BUNDLE_IDENTIFIER = com.stuartbreckenridge.opensource.NetNewsWire.iOS.Widget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";