From 4fcd134c6a5859db53cd76e860956c501f725570 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 23 Oct 2019 13:52:07 -0500 Subject: [PATCH] Change the local account icon. --- iOS/AppAssets.swift | 14 +++++++++++--- .../Contents.json | 2 +- .../localAccountPad.pdf} | Bin 4205 -> 3897 bytes .../accountLocalPhone.imageset/Contents.json | 16 ++++++++++++++++ .../localAccountPhone.pdf | Bin 0 -> 3904 bytes iOS/Settings/AddAccountViewController.swift | 3 ++- iOS/Settings/Settings.storyboard | 1 + 7 files changed, 31 insertions(+), 5 deletions(-) rename iOS/Resources/Assets.xcassets/{accountLocal.imageset => accountLocalPad.imageset}/Contents.json (84%) rename iOS/Resources/Assets.xcassets/{accountLocal.imageset/accountLocal.pdf => accountLocalPad.imageset/localAccountPad.pdf} (75%) create mode 100644 iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/localAccountPhone.pdf 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 c32cc3b897b33e9b26438b96b792ab7b5afd15c7..cfc6ca9f04b3b9098564f21f56debec0ee8ff7ca 100644 GIT binary patch delta 647 zcmaE>uv2bAKz*)%G}mDRp5Ny+OByRZFYnn`-cc3e`cq7GHdV8mHosbx85|NF9R!NsS2=4)JR3irk6QEFldP>)MuNh+6yi0#Y;iAfK>@A(sIhD43a=8k;JlDL}=H zjZMuJz_JQ?FfjvTLj!a%VjS?+Qj1v>hOpJ|F679Hb2r5yC dRj{+;DlP$rbwyEX8ke!DkpY*gs;j>n7XT`t%bEZH delta 966 zcmdlf_f}y-Kz(YkW8NJDo;|-s|2RZ=PVsm(NBqeZb_tEB1H1xn{x|YGHQk%B_dt@x zvJ($G{w?DFr4;;5E!LxD=}gPNs;hIBg{|b>X4rNqz@TqU*p5&e72}WFf>+;(lAR`_ z$&tCPy!X`Nhj*@~EoVwHJFfZC=4fr6YQn||j2d@jbQGs9DU5flUwCcDs#T4?5}I3$ zx)k{c~EBD#j2uHTlBaxJA4bnt~G_Oh0l!TYGCXhlEBw z@3;MD4c?Y-aJK3Rv#|4fp04|$l1Fd)XFHP_hfHm{0)_OSXHQRzE;@DeckF^9`O6EQ zzS)?g@1_-Vy;S_tu}@oUibU#zon?P?^%=%2e8+Qq`cuy9Yb}0TRYm#*RrFn`XsY#I z?XTo>Sg~H}M-Xqm5!1PM>ibe$OJ4HMzWczJ?{ojchlWeeM7#>=SaG36_hZ6i8R^W3 z$y?Jj3fSBw65eFr{H)XV@hS5vwSCt$+idT*pLuOkFfF!vl5GEth2E$3P6^N`Ha=Yc z;=kwo8$nC$zdZiiSX$!{@kh>jFYhW>gW0E<+#9y{`Ip{3Daa|A$KLgKQGdRx)UmUZ z1sSE7O^i)8>oHE@X0(`mm?yg4P{BYUKPih#BR4VGKUg6wwWv5VKTpBXK+n)b&qN_c z!>KegCq==~!qv#gEJjlyur#r#q)H*c#mzZCuOzjiM3XBuF9l?Rp%Kg|7b_zJLrViw z14BbYBLgFgC<6m^AVR2wDzvdt@YD||%1qSQ1l0|i6l$tQVbw9O5T6%0T?Ay0t|%rG!8HL*k&Gd3|Zoh-no zT5oD>fG%fXW`spOHg%Tf=z5J!3^B|zHZ?KBP-kih785{rsIi&3;p91dGK|KPck(I5 zC#4!$rkWd=CtDgD8l@T=Cs`O6nHd`!CmWk4CmWfi*>TwrRH6{801T<(5@3{p!^zm( N!h%ax)z#mP3jhURQ_uha 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 0000000000000000000000000000000000000000..c807edece1d482cc068b120a49f95922cf54ad6a GIT binary patch literal 3904 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 literal 0 HcmV?d00001 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 @@ +