From 3898edc8b1c6b94ea276ff00d7a997bacaf6c341 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuartb@hey.com>
Date: Wed, 23 Dec 2020 21:16:32 +0800
Subject: [PATCH] widget text spacing

---
 Widget/Widget Views/StarredWidget.swift |  2 +-
 Widget/Widget Views/TodayWidget.swift   |  2 +-
 Widget/Widget Views/UnreadWidget.swift  |  2 +-
 iOS/AppDelegate.swift                   | 27 +++++++++++++++----------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Widget/Widget Views/StarredWidget.swift b/Widget/Widget Views/StarredWidget.swift
index 919d2819e..945fc041e 100644
--- a/Widget/Widget Views/StarredWidget.swift	
+++ b/Widget/Widget Views/StarredWidget.swift	
@@ -23,7 +23,7 @@ struct StarredWidgetView : View {
 		else {
 			GeometryReader { metrics in
 				HStack(alignment: .top, spacing: 4) {
-					VStack(alignment: .leading) {
+					VStack(alignment: .leading, spacing: -4) {
 						starredImage
 						Spacer()
 						Text(L10n.localizedCount(entry.widgetData.currentStarredCount)).bold().font(.callout).minimumScaleFactor(0.5).lineLimit(1)
diff --git a/Widget/Widget Views/TodayWidget.swift b/Widget/Widget Views/TodayWidget.swift
index 653c35d14..5e1fdd9ab 100644
--- a/Widget/Widget Views/TodayWidget.swift	
+++ b/Widget/Widget Views/TodayWidget.swift	
@@ -23,7 +23,7 @@ struct TodayWidgetView : View {
 		else {
 			GeometryReader { metrics in
 				HStack(alignment: .top, spacing: 4) {
-					VStack(alignment: .leading) {
+					VStack(alignment: .leading, spacing: -4) {
 						todayImage
 						Spacer()
 						Text(L10n.localizedCount(entry.widgetData.currentTodayCount)).bold().font(.callout).minimumScaleFactor(0.5).lineLimit(1)
diff --git a/Widget/Widget Views/UnreadWidget.swift b/Widget/Widget Views/UnreadWidget.swift
index 21f42319d..924be016e 100644
--- a/Widget/Widget Views/UnreadWidget.swift	
+++ b/Widget/Widget Views/UnreadWidget.swift	
@@ -23,7 +23,7 @@ struct UnreadWidgetView : View {
 		else {
 			GeometryReader { metrics in
 				HStack(alignment: .top, spacing: 4) {
-					VStack(alignment: .leading) {
+					VStack(alignment: .leading, spacing: -4) {
 						unreadImage
 						Spacer()
 						Text(L10n.localizedCount(entry.widgetData.currentUnreadCount)).bold().font(.callout).minimumScaleFactor(0.5).lineLimit(1)
diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index c5d751a06..da8c4dafd 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -430,12 +430,15 @@ private extension AppDelegate {
 		}
 		account!.markArticles(article!, statusKey: .read, flag: true)
 		self.prepareAccountsForBackground()
-		if !AccountManager.shared.isSuspended {
-			if #available(iOS 14, *) {
-				try? WidgetDataEncoder.shared.encodeWidgetData()
+		account!.syncArticleStatus(completion: { [weak self] _ in
+			if !AccountManager.shared.isSuspended {
+				if #available(iOS 14, *) {
+					try? WidgetDataEncoder.shared.encodeWidgetData()
+				}
+				self?.prepareAccountsForBackground()
+				self?.suspendApplication()
 			}
-			self.suspendApplication()
-		}
+		})
 	}
 	
 	func handleMarkAsStarred(userInfo: [AnyHashable: Any]) {
@@ -456,12 +459,14 @@ private extension AppDelegate {
 			return
 		}
 		account!.markArticles(article!, statusKey: .starred, flag: true)
-		self.prepareAccountsForBackground()
-		if !AccountManager.shared.isSuspended {
-			if #available(iOS 14, *) {
-				try? WidgetDataEncoder.shared.encodeWidgetData()
+		account!.syncArticleStatus(completion: { [weak self] _ in
+			if !AccountManager.shared.isSuspended {
+				if #available(iOS 14, *) {
+					try? WidgetDataEncoder.shared.encodeWidgetData()
+				}
+				self?.prepareAccountsForBackground()
+				self?.suspendApplication()
 			}
-			self.suspendApplication()
-		}
+		})
 	}
 }