From 6765206a1b3a818130adbb62b30a6576f4e6f156 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 20 Jun 2019 07:33:17 -0500
Subject: [PATCH] Update iOS to use FreshRSS branding

---
 .../accountFreshRSS.imageset/Contents.json       |  15 +++++++++++++++
 .../accountFreshRSS.imageset/accountFreshRSS.pdf | Bin 0 -> 4206 bytes
 iOS/Settings/SettingsReaderAPIAccountView.swift  |  15 +++++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
 create mode 100644 iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf

diff --git a/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
new file mode 100644
index 000000000..b2c62a136
--- /dev/null
+++ b/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "accountFreshRSS.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf b/iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/accountFreshRSS.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1ff98e115ed9096d447af7849c78bbd5906f8b00
GIT binary patch
literal 4206
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
VcQS3}I|D(;%E^Nv5Dly*_&-;M5vl+H

literal 0
HcmV?d00001

diff --git a/iOS/Settings/SettingsReaderAPIAccountView.swift b/iOS/Settings/SettingsReaderAPIAccountView.swift
index 68322d7ab..6880518c3 100644
--- a/iOS/Settings/SettingsReaderAPIAccountView.swift
+++ b/iOS/Settings/SettingsReaderAPIAccountView.swift
@@ -21,7 +21,7 @@ struct SettingsReaderAPIAccountView : View {
 		NavigationView {
 			List {
 				Section(header:
-					SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: "Google Reader Compatible").padding()
+					SettingsAccountLabelView(accountImage: "accountFreshRSS", accountLabel: "FreshRSS").padding()
 				)  {
 					HStack {
 						Text("Email:")
@@ -83,7 +83,7 @@ struct SettingsReaderAPIAccountView : View {
 			return
 		}
 
-		Account.validateCredentials(type: .readerAPI, credentials: credentials, endpoint: apiURL) { result in
+		Account.validateCredentials(type: viewModel.accountType, credentials: credentials, endpoint: apiURL) { result in
 			
 			self.busy = false
 			
@@ -95,7 +95,7 @@ struct SettingsReaderAPIAccountView : View {
 					var newAccount = false
 					let workAccount: Account
 					if self.viewModel.account == nil {
-						workAccount = AccountManager.shared.createAccount(type: .readerAPI)
+						workAccount = AccountManager.shared.createAccount(type: self.viewModel.accountType)
 						newAccount = true
 					} else {
 						workAccount = self.viewModel.account!
@@ -139,13 +139,16 @@ struct SettingsReaderAPIAccountView : View {
 	
 	class ViewModel: BindableObject {
 		let didChange = PassthroughSubject<ViewModel, Never>()
+		var accountType: AccountType
 		var account: Account? = nil
 		
-		init() {
+		init(accountType: AccountType) {
+			self.accountType = accountType
 		}
 		
-		init(account: Account) {
+		init(accountType: AccountType, account: Account) {
 			self.account = account
+			self.accountType = accountType
 			if case .basic(let username, let password) = try? account.retrieveBasicCredentials() {
 				self.email = username
 				self.password = password
@@ -181,7 +184,7 @@ struct SettingsReaderAPIAccountView : View {
 #if DEBUG
 struct SettingsReaderAPIAccountView_Previews : PreviewProvider {
     static var previews: some View {
-		SettingsReaderAPIAccountView(viewModel: SettingsReaderAPIAccountView.ViewModel())
+		SettingsReaderAPIAccountView(viewModel: SettingsReaderAPIAccountView.ViewModel(accountType: .freshRSS))
     }
 }
 #endif