Merge pull request #2619 from stuartbreckenridge/widget-layout-fix

timeline refresh can now be controlled

Shared/Widget/WidgetDataEncoder.swift

@@ -18,7 +18,7 @@ struct WidgetDataEncoder {
 	
 	private static var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Application")
 	
-	static func encodeWidgetData() {
+	static func encodeWidgetData(refreshTimeline: Bool = true) {
 		os_log(.debug, log: log, "Starting encoding widget data.")
 		do {
 			// Unread Articles
@@ -32,6 +32,7 @@ struct WidgetDataEncoder {
 												  feedIcon: article.iconImage()?.image.dataRepresentation(),
 												  pubDate: article.datePublished!.description)
 				unread.append(latestArticle)
+				
 				if unread.count == 7 { break }
 			}
 			
@@ -82,8 +83,10 @@ struct WidgetDataEncoder {
 			}
 			if FileManager.default.createFile(atPath: dataURL!.path, contents: encodedData, attributes: nil) {
 				os_log(.debug, log: log, "Wrote widget data to container.")
+				if refreshTimeline == true {
 					WidgetCenter.shared.reloadAllTimelines()
 				}
+			}
 		} catch {
 			os_log(.error, "%@", error.localizedDescription)
 		}

Widget/Widget Views/SmartFeedSummaryWidget.swift

@@ -17,16 +17,8 @@ struct SmartFeedSummaryWidgetView: View {
 	var entry: Provider.Entry
 	
 	var body: some View {
-		switch family {
-		case .systemSmall:
 		smallWidget
-		case .systemMedium:
+			.widgetURL(WidgetDeepLink.icon.url)
-			smallWidget
-		case .systemLarge:
-			smallWidget
-		@unknown default:
-			smallWidget
-		}
 	}
 	
 	@ViewBuilder

Widget/Widget Views/StarredWidget.swift

@@ -18,6 +18,7 @@ struct StarredWidgetView : View {
 	var body: some View {
 		if entry.widgetData.starredArticles.count == 0 {
 			inboxZero
+				.widgetURL(WidgetDeepLink.starred.url)
 		}
 		else {
 			GeometryReader { metrics in
@@ -49,7 +50,7 @@ struct StarredWidgetView : View {
 						Spacer()
 					}.padding(.leading, 4)
 				}.padding()
-			}
+			}.widgetURL(WidgetDeepLink.starred.url)
 			
 		}
 	}

Widget/Widget Views/TodayWidget.swift

@@ -18,6 +18,7 @@ struct TodayWidgetView : View {
 	var body: some View {
 		if entry.widgetData.todayArticles.count == 0 {
 			inboxZero
+				.widgetURL(WidgetDeepLink.today.url)
 		}
 		else {
 			GeometryReader { metrics in
@@ -50,7 +51,7 @@ struct TodayWidgetView : View {
 						Spacer()
 					}.padding(.leading, 4)
 				}.padding()
-			}
+			}.widgetURL(WidgetDeepLink.today.url)
 		}
 	}
 	

Widget/Widget Views/UnreadWidget.swift

@@ -18,6 +18,7 @@ struct UnreadWidgetView : View {
 	var body: some View {
 		if entry.widgetData.currentUnreadCount == 0 {
 			inboxZero
+				.widgetURL(WidgetDeepLink.unread.url)
 		}
 		else {
 			GeometryReader { metrics in
@@ -49,7 +50,7 @@ struct UnreadWidgetView : View {
 						Spacer()
 					}.padding(.leading, 4)
 				}.padding()
-			}
+			}.widgetURL(WidgetDeepLink.unread.url)
 		}
 	}
 	

iOS/AppDelegate.swift

@@ -116,7 +116,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		#endif
 		
 		if #available(iOS 14, *) {
-			WidgetDataEncoder.encodeWidgetData()
+			WidgetDataEncoder.encodeWidgetData(refreshTimeline: false)
 		}