From 5b1df3631e584473a4db5af1b0bd5f86ff5b0967 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Fri, 30 Oct 2020 09:44:44 +0800
Subject: [PATCH] Alignment consistency

---
 .../Accounts/AddAccountsView.swift            |  13 ++++++-------
 .../accountFreshRSS.imageset/Contents.json    |   2 +-
 .../{freshrss-any.pdf => FreshRSS.pdf}        | Bin 3974 -> 3974 bytes
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/{freshrss-any.pdf => FreshRSS.pdf} (95%)

diff --git a/Mac/Preferences/Accounts/AddAccountsView.swift b/Mac/Preferences/Accounts/AddAccountsView.swift
index cdfc56cf1..61ccaf3f1 100644
--- a/Mac/Preferences/Accounts/AddAccountsView.swift
+++ b/Mac/Preferences/Accounts/AddAccountsView.swift
@@ -117,7 +117,9 @@ struct AddAccountsView: View {
 							.frame(width: 80)
 					})
 				}
-			}.padding(.vertical, 8)
+			}
+			.padding(.top, 12)
+			.padding(.bottom, 4)
 		}
 		.pickerStyle(RadioGroupPickerStyle())
 		.fixedSize(horizontal: false, vertical: true)
@@ -133,12 +135,11 @@ struct AddAccountsView: View {
 			
 			Picker(selection: $selectedAccount, label: Text(""), content: {
 				ForEach(AddAccountSections.local.sectionContent, id: \.self, content: { account in
-					HStack(alignment: .top) {
+					HStack(alignment: .center) {
 						account.image()
 							.resizable()
 							.aspectRatio(contentMode: .fit)
 							.frame(width: 25, height: 25, alignment: .center)
-							.offset(CGSize(width: 0, height: -3.5))
 							.padding(.leading, 4)
 						
 							
@@ -167,12 +168,11 @@ struct AddAccountsView: View {
 			
 			Picker(selection: $selectedAccount, label: Text(""), content: {
 				ForEach(AddAccountSections.icloud.sectionContent, id: \.self, content: { account in
-					HStack(alignment: .top) {
+					HStack(alignment: .center) {
 						account.image()
 							.resizable()
 							.aspectRatio(contentMode: .fit)
 							.frame(width: 25, height: 25, alignment: .center)
-							.offset(CGSize(width: 0, height: -3.5))
 							.padding(.leading, 4)
 						
 						Text(account.localizedAccountName())
@@ -229,12 +229,11 @@ struct AddAccountsView: View {
 			
 			Picker(selection: $selectedAccount, label: Text(""), content: {
 				ForEach(AddAccountSections.selfhosted.sectionContent, id: \.self, content: { account in
-					HStack(alignment: .top) {
+					HStack(alignment: .center) {
 						account.image()
 							.resizable()
 							.aspectRatio(contentMode: .fit)
 							.frame(width: 25, height: 25, alignment: .center)
-							.offset(CGSize(width: 0, height: -4))
 							.padding(.leading, 4)
 			
 						Text(account.localizedAccountName())
diff --git a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
index 974a47751..99d210221 100644
--- a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
+++ b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "freshrss-any.pdf",
+      "filename" : "FreshRSS.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf b/Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/FreshRSS.pdf
similarity index 95%
rename from Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/freshrss-any.pdf
rename to Mac/Resources/Assets.xcassets/accountFreshRSS.imageset/FreshRSS.pdf
index 066de5aa370c429a1f93dcdf60a8d3b205a81e81..d9ba3f3ead38ccbe005d084d0f21445e2babde77 100644
GIT binary patch
delta 127
zcmZpZZ<F8fi&xv&z`)Sh)X+G}z(5^{G!^uH^HW?BOHvgyT&#=?j0_A7U`jTt@-Z<w
unV1-x85yTpSSF?!TbQLKrkbWCnx<K#7$m0}C7T<h*m2nqP%=4_Ulsr|)ggTV

delta 127
zcmZpZZ<F8fi&xvo(!kun(!eCjz(5^{G!^uH^HW?BOHvgyT&#=?j0_A7U`jTt@-Z<w
u85t%U8JQ)S8Cj;7SSFboCZ!}>T9_J`7^j&f8(E~K*m2nqP%=4_UlsruO(1aq