From 3d1c0d3e2818c4743768a3f7cf3d0a12673f05b5 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 28 Apr 2019 17:22:54 -0500 Subject: [PATCH 1/3] Changed default feed favicon to a globe so that it matches the desktop default feed favicon --- iOS/AppAssets.swift | 11 +++++----- .../feedColor.colorset/Contents.json | 20 ++++++++++++++++++ .../feedImage.imageset/Contents.json | 12 +++++++++++ .../feedImage.imageset/globe.pdf | Bin 0 -> 5940 bytes 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 iOS/Resources/Assets.xcassets/feedColor.colorset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/feedImage.imageset/globe.pdf diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 54a07593c..2edcde6ee 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -32,12 +32,13 @@ struct AppAssets { return image.maskWithColor(color: AppAssets.chevronDisclosureColor)! }() - static var feedImage: RSImage = { - return RSImage(named: "rssImage")! + static var feedColor: UIColor = { + return UIColor(named: "feedColor")! }() - - static var folderImage: RSImage = { - return RSImage(named: "folderImage")! + + static var feedImage: RSImage = { + let image = RSImage(named: "feedImage")! + return image.maskWithColor(color: AppAssets.feedColor)! }() static var masterFolderColor: UIColor = { diff --git a/iOS/Resources/Assets.xcassets/feedColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/feedColor.colorset/Contents.json new file mode 100644 index 000000000..54b47afc7 --- /dev/null +++ b/iOS/Resources/Assets.xcassets/feedColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "20", + "alpha" : "1.000", + "blue" : "243", + "green" : "140" + } + } + } + ] +} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json new file mode 100644 index 000000000..aa4ae543d --- /dev/null +++ b/iOS/Resources/Assets.xcassets/feedImage.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "globe.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/feedImage.imageset/globe.pdf b/iOS/Resources/Assets.xcassets/feedImage.imageset/globe.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f870a17d93dc5656dbc966530eb54c305e0a6369 GIT binary patch literal 5940 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 bCb$yrS6>^K8oz!B91g`b$=T%*3Z(xBFlvKv literal 0 HcmV?d00001 From 5cdbaafc8efac35f5d24647ba6188202021b05fb Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 28 Apr 2019 17:33:38 -0500 Subject: [PATCH 2/3] Use a higher resolution folder graphic --- .../folderImage.imageset/folder.pdf | Bin 4061 -> 3994 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/iOS/Resources/Assets.xcassets/folderImage.imageset/folder.pdf b/iOS/Resources/Assets.xcassets/folderImage.imageset/folder.pdf index 67097520c9cbdf2808ee57bf979961fcfd011495..720de3b6ce53df66e24e4c8476b66ae88a749b08 100644 GIT binary patch delta 554 zcmcaBKTCc>Kz(VycNU8wkIVPku3Ziyr+-z=6+WZIp1~pef~9Szz00>J&SK36S7|B# zeA&glF5^XW)fa)9DS^vGz8|sd6*}GF(3&PA`)Y;H(bAW)cQxB*=YB16nlWpIn#zf# zeyM3wtlIvb-qe=yc>fvcBN{fzvx7WhCvRMQNB==eRZ8Dau_GtrZoZ!_u-oH$ZrN2P zJ>^o)Ya4dT7G7T#R1`lY@$hMpqKAaZ%o95Tf=X1YqwEWQJZ&I}9 z@z1AW(s#3RZcF7^&*M49`g--e&0!_yvad4d@2FuskQmB1xqwlc$;fzfFXLox7Bd3{ zlgTQ)TRDs@jEsyd4Gktg zi6Iu{*wk5=q3bm^w8Sva*x1+vmEGnreN=@T3HZ?crQdM>JcjE#8 DD(Sqw delta 622 zcmbOwe^-7&Kz(RnblwpIjz8x$cQ|MyG@mW^-wC~|5`jyVx{9TJAB-#${ zyV#nyWb$r{%w*xE-w#dOTTr4ZYZJgCx2DpqJ7kCN6)V{(Hn}+*laFd2_f_}hJJ00I zrt8q@_9~$43r`>8s^T+#2aTIe1h(W!H@Wtv_MMVVd2?3FM67=H)hB$K=NJw~F8RUb zSYiAj(SAbk?Q=iQXR*h6PPWd7>gM|0vS5+t4XdgtWd}vBupVR1bX>QM_r6%dwm#zr z+pC1U7pOgWoTKuCf6fQvoevKChVeC@{^xn0%jM*Bp&KVH3!|UQnB24%Ucq<#@8J{u zKU+iNUMv>bW?ogbPkXKPGNmi!@mtEzU3ush)_qG{hvjSjmg~WPg36Eg#=e}YH(%{@ zrtD;0MrkHXgUw!ylet-p3=|9}KjhiUVPI}(YG7_^G z2Bzp@#>Pg5lRf#=>MhLBr3_3gFqIo&QD Date: Sun, 28 Apr 2019 18:53:57 -0500 Subject: [PATCH 3/3] Update the nav controller title so that the back bar button item in iPad portrait has a valid title --- iOS/Base.lproj/Main.storyboard | 34 ++++--------------- iOS/MasterFeed/MasterFeedViewController.swift | 1 + .../MasterTimelineViewController.swift | 1 + 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index 0f14abe71..a72b987e5 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -10,10 +10,10 @@ - + - + @@ -140,7 +140,7 @@ - + @@ -190,27 +190,7 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -226,10 +206,10 @@ - + - + @@ -304,7 +284,7 @@ - + diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 07646ca6d..5a32a3969 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -49,6 +49,7 @@ class MasterFeedViewController: ProgressTableViewController, UndoableCommandRunn override func viewWillAppear(_ animated: Bool) { clearsSelectionOnViewWillAppear = splitViewController!.isCollapsed + navigationController?.title = NSLocalizedString("Feeds", comment: "Feeds") super.viewWillAppear(animated) } diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index 0191ac964..b831b5c63 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -348,6 +348,7 @@ private extension MasterTimelineViewController { updateTableViewRowHeight() title = navState?.timelineName + navigationController?.title = navState?.timelineName if navState?.articles.count ?? 0 > 0 { tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)