diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index dcb1c9227..8f60395dd 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -11,8 +11,12 @@ import Account struct AppAssets { - static var accountLocalImage: UIImage = { - return UIImage(named: "accountLocal")! + static var accountLocalPadImage: UIImage = { + return UIImage(named: "accountLocalPad")! + }() + + static var accountLocalPhoneImage: UIImage = { + return UIImage(named: "accountLocalPhone")! }() static var accountFeedbinImage: UIImage = { @@ -177,7 +181,11 @@ struct AppAssets { static func image(for accountType: AccountType) -> UIImage? { switch accountType { case .onMyMac: - return AppAssets.accountLocalImage + if UIDevice.current.userInterfaceIdiom == .pad { + return AppAssets.accountLocalPadImage + } else { + return AppAssets.accountLocalPhoneImage + } case .feedbin: return AppAssets.accountFeedbinImage case .freshRSS: diff --git a/iOS/Resources/Assets.xcassets/accountLocal.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json similarity index 84% rename from iOS/Resources/Assets.xcassets/accountLocal.imageset/Contents.json rename to iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json index c48efa3f2..7fe4e483c 100644 --- a/iOS/Resources/Assets.xcassets/accountLocal.imageset/Contents.json +++ b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "accountLocal.pdf" + "filename" : "localAccountPad.pdf" } ], "info" : { diff --git a/iOS/Resources/Assets.xcassets/accountLocal.imageset/accountLocal.pdf b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/localAccountPad.pdf similarity index 75% rename from iOS/Resources/Assets.xcassets/accountLocal.imageset/accountLocal.pdf rename to iOS/Resources/Assets.xcassets/accountLocalPad.imageset/localAccountPad.pdf index c32cc3b89..cfc6ca9f0 100644 Binary files a/iOS/Resources/Assets.xcassets/accountLocal.imageset/accountLocal.pdf and b/iOS/Resources/Assets.xcassets/accountLocalPad.imageset/localAccountPad.pdf differ diff --git a/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json new file mode 100644 index 000000000..05bb5e471 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "localAccountPhone.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template", + "preserves-vector-representation" : true + } +} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/localAccountPhone.pdf b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/localAccountPhone.pdf new file mode 100644 index 000000000..c807edece Binary files /dev/null and b/iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/localAccountPhone.pdf differ diff --git a/iOS/Settings/AddAccountViewController.swift b/iOS/Settings/AddAccountViewController.swift index d1587758a..e0a18a590 100644 --- a/iOS/Settings/AddAccountViewController.swift +++ b/iOS/Settings/AddAccountViewController.swift @@ -15,11 +15,12 @@ protocol AddAccountDismissDelegate: UIViewController { class AddAccountViewController: UITableViewController, AddAccountDismissDelegate { + @IBOutlet private weak var localAccountImageView: UIImageView! @IBOutlet private weak var localAccountNameLabel: UILabel! override func viewDidLoad() { super.viewDidLoad() - + localAccountImageView.image = AppAssets.image(for: .onMyMac) localAccountNameLabel.text = Account.defaultLocalAccountName } diff --git a/iOS/Settings/Settings.storyboard b/iOS/Settings/Settings.storyboard index 617b76467..5aa060786 100644 --- a/iOS/Settings/Settings.storyboard +++ b/iOS/Settings/Settings.storyboard @@ -595,6 +595,7 @@ +