diff --git a/Mac/Preferences/Accounts/AddAccountsView.swift b/Mac/Preferences/Accounts/AddAccountsView.swift index c52843f02..71f1ea150 100644 --- a/Mac/Preferences/Accounts/AddAccountsView.swift +++ b/Mac/Preferences/Accounts/AddAccountsView.swift @@ -75,22 +75,26 @@ struct AddAccountsView: View { webAccounts selfhostedAccounts - HStack { + HStack(spacing: 12) { Spacer() if #available(OSX 11.0, *) { Button(action: { parent?.dismiss(nil) }, label: { Text("Cancel") - .accessibility(label: Text("Add Account")) - }).keyboardShortcut(.cancelAction) + .frame(width: 80) + }) + .help("Cancel") + .keyboardShortcut(.cancelAction) + } else { Button(action: { parent?.dismiss(nil) }, label: { Text("Cancel") - .accessibility(label: Text("Add Account")) + .frame(width: 80) }) + .accessibility(label: Text("Add Account")) } if #available(OSX 11.0, *) { Button(action: { @@ -98,21 +102,26 @@ struct AddAccountsView: View { parent?.dismiss(nil) }, label: { Text("Continue") - }).keyboardShortcut(.defaultAction) + .frame(width: 80) + }) + .help("Add Account") + .keyboardShortcut(.defaultAction) + } else { Button(action: { addAccountDelegate?.presentSheetForAccount(selectedAccount) parent?.dismiss(nil) }, label: { Text("Continue") + .frame(width: 80) }) } }.padding([.top, .bottom], 4) } .pickerStyle(RadioGroupPickerStyle()) .fixedSize(horizontal: false, vertical: true) - .frame(width: 400) - .padding(12) + .frame(width: 420) + .padding() } var localAccount: some View { @@ -123,11 +132,13 @@ struct AddAccountsView: View { Picker(selection: $selectedAccount, label: Text(""), content: { ForEach(AddAccountSections.local.sectionContent, id: \.self, content: { account in HStack(alignment: .top) { - Image(nsImage: AppAssets.image(for: account)!) + account.image() .resizable() .aspectRatio(contentMode: .fit) .frame(width: 25, height: 25, alignment: .center) .offset(CGSize(width: 0, height: -2.5)) + .padding(.leading, 4) + VStack(alignment: .leading, spacing: 4) { Text(account.localizedAccountName()) @@ -139,6 +150,7 @@ struct AddAccountsView: View { }) }) .pickerStyle(RadioGroupPickerStyle()) + .offset(x: 7.5, y: 0) } } @@ -151,12 +163,13 @@ struct AddAccountsView: View { Picker(selection: $selectedAccount, label: Text(""), content: { ForEach(AddAccountSections.icloud.sectionContent, id: \.self, content: { account in HStack(alignment: .top) { - Image(nsImage: AppAssets.image(for: account)!) + account.image() .resizable() .aspectRatio(contentMode: .fit) .frame(width: 25, height: 25, alignment: .center) .offset(CGSize(width: 0, height: -5)) - + .padding(.leading, 4) + VStack(alignment: .leading, spacing: 4) { Text(account.localizedAccountName()) Text(AddAccountSections.icloud.sectionFooter).foregroundColor(.gray) @@ -166,6 +179,7 @@ struct AddAccountsView: View { .tag(account) }) }) + .offset(x: 7.5, y: 0) .disabled(isCloudInUse()) } } @@ -179,10 +193,11 @@ struct AddAccountsView: View { ForEach(AddAccountSections.web.sectionContent.filter({ isRestricted($0) != true }), id: \.self, content: { account in HStack(alignment: .center) { - Image(nsImage: AppAssets.image(for: account)!) + account.image() .resizable() .aspectRatio(contentMode: .fit) .frame(width: 25, height: 25, alignment: .center) + .padding(.leading, 4) VStack(alignment: .leading) { Text(account.localizedAccountName()) @@ -192,6 +207,7 @@ struct AddAccountsView: View { }) }) + .offset(x: 7.5, y: 0) } } @@ -203,20 +219,23 @@ struct AddAccountsView: View { Picker(selection: $selectedAccount, label: Text(""), content: { ForEach(AddAccountSections.selfhosted.sectionContent, id: \.self, content: { account in HStack { - Image(nsImage: AppAssets.image(for: account)!) + account.image() .resizable() .aspectRatio(contentMode: .fit) .frame(width: 25, height: 25, alignment: .center) + .padding(.leading, 4) Text(account.localizedAccountName()) }.tag(account) }) }) + .offset(x: 7.5, y: 0) Text("Web and self-hosted accounts sync across all signed-in devices.") .font(.caption) - .padding(.leading, 62) .foregroundColor(.gray) + .padding(.horizontal) + .offset(x: 57) } } diff --git a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json index abd37acbd..70ac3e6b7 100644 --- a/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json @@ -20,6 +20,7 @@ "version" : 1 }, "properties" : { + "preserves-vector-representation" : true, "template-rendering-intent" : "original" } } diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf index a68d754ae..2cd0a9ce0 100644 Binary files a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf and b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled-1.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf index a68d754ae..2cd0a9ce0 100644 Binary files a/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf and b/Mac/Resources/Assets.xcassets/accountFeedbin.imageset/feedbin-logo-filled.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json index f560c64f3..a73c591f6 100644 --- a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "NewsBlur.pdf", + "filename" : "Newsblur-any.pdf", "idiom" : "universal" } ], diff --git a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Newsblur-any.pdf similarity index 70% rename from Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf rename to Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Newsblur-any.pdf index d2b62c6eb..8b07ac745 100644 Binary files a/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/NewsBlur.pdf and b/Mac/Resources/Assets.xcassets/accountNewsBlur.imageset/Newsblur-any.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json index 31c201dd0..231c33ab0 100644 --- a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "theOldReaderAny.pdf", + "filename" : "oldreader-icon-any.pdf", "idiom" : "universal" }, { @@ -11,7 +11,7 @@ "value" : "dark" } ], - "filename" : "theOldReaderDark.pdf", + "filename" : "oldreader-icon-dark.pdf", "idiom" : "universal" } ], diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-any.pdf similarity index 64% rename from Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf rename to Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-any.pdf index 2c1511bf2..0e7e1ac48 100644 Binary files a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderAny.pdf and b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-any.pdf differ diff --git a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-dark.pdf similarity index 64% rename from Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf rename to Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-dark.pdf index 1f3dac415..258facd07 100644 Binary files a/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/theOldReaderDark.pdf and b/Mac/Resources/Assets.xcassets/accountTheOldReader.imageset/oldreader-icon-dark.pdf differ diff --git a/Shared/AccountType+Helpers.swift b/Shared/AccountType+Helpers.swift index fc1a5d221..ac40239bc 100644 --- a/Shared/AccountType+Helpers.swift +++ b/Shared/AccountType+Helpers.swift @@ -13,6 +13,7 @@ import AppKit #else import UIKit #endif +import SwiftUI extension AccountType { @@ -54,11 +55,32 @@ extension AccountType { default: return "" } - - - - - + } + + // MARK: - SwiftUI Images + func image() -> Image { + switch self { + case .onMyMac: + return Image("accountLocal") + case .bazQux: + return Image("accountBazQux") + case .cloudKit: + return Image("accountCloudKit") + case .feedWrangler: + return Image("accountFeedWrangler") + case .feedbin: + return Image("accountFeedbin") + case .feedly: + return Image("accountFeedly") + case .freshRSS: + return Image("accountFreshRSS") + case .inoreader: + return Image("accountInoreader") + case .newsBlur: + return Image("accountNewsBlur") + case .theOldReader: + return Image("accountTheOldReader") + } } }