diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift index 5fa2a4e11..4e21a994a 100644 --- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift +++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift @@ -69,7 +69,7 @@ struct AddFeedWranglerAccountView: View { }, label: { HStack { Spacer() - Text("Sign In") + Text("Add Account") Spacer() } }).disabled(model.username.isEmpty || model.password.isEmpty) diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift index 7b037c968..032898816 100644 --- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift +++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift @@ -65,7 +65,11 @@ struct AddFeedbinAccountView: View { Button(action: { model.authenticateFeedbin() }, label: { - Text("Sign In") + HStack { + Spacer() + Text("Add Account") + Spacer() + } }).disabled(model.username.isEmpty || model.password.isEmpty) }) diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift index 9dbd38a39..0fc0f7e90 100644 --- a/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift +++ b/Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift @@ -24,8 +24,6 @@ struct AddFeedlyAccountView: View { NavigationView { iosBody } - - #endif } diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift index 7f2123fb0..dc6783589 100644 --- a/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift +++ b/Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift @@ -67,7 +67,7 @@ struct AddNewsBlurAccountView: View { }, label: { HStack { Spacer() - Text("Sign In") + Text("Add Account") Spacer() } }).disabled(model.username.isEmpty || model.password.isEmpty) diff --git a/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift b/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift index bb5c545ea..53359633a 100644 --- a/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift +++ b/Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift @@ -71,7 +71,7 @@ struct AddReaderAPIAccountView: View { }, label: { HStack { Spacer() - Text("Sign In") + Text("Add Account") Spacer() } }).disabled(createDisabled()) diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/Contents.json b/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/Contents.json index d9272e8cb..e072222a1 100644 --- a/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/Contents.json +++ b/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/Contents.json @@ -1,7 +1,17 @@ { "images" : [ { - "filename" : "ipad.pdf", + "filename" : "ipad-any-slice.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "ipad-dark-slice.pdf", "idiom" : "universal" } ], @@ -11,6 +21,6 @@ }, "properties" : { "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad-any-slice.pdf b/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad-any-slice.pdf new file mode 100644 index 000000000..91665fa1b Binary files /dev/null and b/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad-any-slice.pdf differ diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad-dark-slice.pdf b/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad-dark-slice.pdf new file mode 100644 index 000000000..9091a096b Binary files /dev/null and b/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad-dark-slice.pdf differ diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad.pdf b/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad.pdf deleted file mode 100644 index a74725c7d..000000000 Binary files a/Multiplatform/Shared/Assets.xcassets/AccountLocalPad.imageset/ipad.pdf and /dev/null differ diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/Contents.json b/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/Contents.json index b5a4070e5..04d21c05f 100644 --- a/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/Contents.json +++ b/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/Contents.json @@ -1,7 +1,17 @@ { "images" : [ { - "filename" : "phone.pdf", + "filename" : "iphone-any-slice.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "iphone-dark-slice.pdf", "idiom" : "universal" } ], @@ -11,6 +21,6 @@ }, "properties" : { "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/iphone-any-slice.pdf b/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/iphone-any-slice.pdf new file mode 100644 index 000000000..f36056970 Binary files /dev/null and b/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/iphone-any-slice.pdf differ diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/iphone-dark-slice.pdf b/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/iphone-dark-slice.pdf new file mode 100644 index 000000000..cf2247077 Binary files /dev/null and b/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/iphone-dark-slice.pdf differ diff --git a/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/phone.pdf b/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/phone.pdf deleted file mode 100644 index f068353d1..000000000 Binary files a/Multiplatform/Shared/Assets.xcassets/AccountLocalPhone.imageset/phone.pdf and /dev/null differ diff --git a/Shared/AccountType+Helpers.swift b/Shared/AccountType+Helpers.swift index 67c262978..4b7ccb3cc 100644 --- a/Shared/AccountType+Helpers.swift +++ b/Shared/AccountType+Helpers.swift @@ -60,9 +60,15 @@ extension AccountType { switch self { case .onMyMac: // If it's the multiplatform app, the asset catalog contains assets for - - + #if os(macOS) return Image("accountLocal") + #else + if UIDevice.current.userInterfaceIdiom == .pad { + return Image("accountLocalPad") + } else { + return Image("accountLocalPhone") + } + #endif case .bazQux: return Image("accountBazQux") case .cloudKit: