From 74c9290e6afd17a0d52817b20dedbdd12b42b468 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 25 Oct 2019 14:57:01 -0500 Subject: [PATCH] Change disclosure image to be a filled triangle. Issue #1175 --- iOS/AppAssets.swift | 8 ++------ .../Cell/MasterFeedTableViewCell.swift | 2 +- .../MasterFeedTableViewSectionHeader.swift | 2 +- .../chevronSmall.imageset/Contents.json | 15 --------------- .../chevronSmall.imageset/chevron-small.pdf | Bin 4031 -> 0 bytes .../Contents.json | 2 +- .../disclosure.pdf} | Bin 4029 -> 3981 bytes 7 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 iOS/Resources/Assets.xcassets/chevronSmall.imageset/Contents.json delete mode 100644 iOS/Resources/Assets.xcassets/chevronSmall.imageset/chevron-small.pdf rename iOS/Resources/Assets.xcassets/{chevronBase.imageset => disclosure.imageset}/Contents.json (83%) rename iOS/Resources/Assets.xcassets/{chevronBase.imageset/chevron-base.pdf => disclosure.imageset/disclosure.pdf} (78%) diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index ca3806fd9..e054ec245 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -65,12 +65,8 @@ struct AppAssets { return UIImage(systemName: "circle")! }() - static var chevronSmallImage: UIImage = { - return UIImage(named: "chevronSmall")! - }() - - static var chevronBaseImage: UIImage = { - return UIImage(named: "chevronBase")! + static var disclosureImage: UIImage = { + return UIImage(named: "disclosure")! }() static var copyImage: UIImage = { diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift index 5dc3e3c3f..ea38faf93 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift @@ -178,7 +178,7 @@ private extension MasterFeedTableViewCell { func addDisclosureView() { disclosureButton = NonIntrinsicButton(type: .roundedRect) disclosureButton!.addTarget(self, action: #selector(buttonPressed(_:)), for: UIControl.Event.touchUpInside) - disclosureButton?.setImage(AppAssets.chevronBaseImage, for: .normal) + disclosureButton?.setImage(AppAssets.disclosureImage, for: .normal) addSubviewAtInit(disclosureButton!) } diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift index 07d6ab35c..6307efb8b 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift @@ -68,7 +68,7 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView { private var disclosureView: UIImageView = { let iView = NonIntrinsicImageView() iView.tintColor = UIColor.tertiaryLabel - iView.image = AppAssets.chevronSmallImage + iView.image = AppAssets.disclosureImage iView.contentMode = .center return iView }() diff --git a/iOS/Resources/Assets.xcassets/chevronSmall.imageset/Contents.json b/iOS/Resources/Assets.xcassets/chevronSmall.imageset/Contents.json deleted file mode 100644 index 6ffaf1016..000000000 --- a/iOS/Resources/Assets.xcassets/chevronSmall.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "chevron-small.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/chevronSmall.imageset/chevron-small.pdf b/iOS/Resources/Assets.xcassets/chevronSmall.imageset/chevron-small.pdf deleted file mode 100644 index 7f9873a86ea8c6f5ec2d4baa9b856e8672bdd3fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4031 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 delta 666 zcmeB`-zz^Mpgwm}tltp>o|gO7T=5M8|Bux@W3ef0;9|Md#8O?~=~=!#R^^IU?*6{H zA64#u@wxxxtg`FWs>ex!{J&Uy#GmbGzPO{`oI<6PZ`WYLMJEJ$A~d|uH%W~50BBU znx?02kS02V$vcc^H$O+v3sHAI>&TN)y@ou~)~`A`t9#ck6*Co?S<)w`X~ujgIKSxn zGA?gp#dFK7A}(ldJ>TJYV-5e6joaqseW*PBuqDo1_Kd`~2DRO#*~->7_kKDZndE;-51Sr^UwLbuKa!X<(^B- zeMdOBpSx~2B=$jFYrXXT&6f|#8D#h`>HXPPwCnI`>%A90>+kLBV&_WDODQfXN=?iK zvGS9$xJ(rc6hO4Gkr_1tECQI@5u$Y<~Cr)0;tIcI#X=H9_ zU~Fk(F!>&@Br=zg&r-|6Lcst86!H|fzzhQe6B9#pF=Jy>^T{cEs_7<1M(A<|rbbxQ zV^e2giLTe!*Z{*kV-sVG$shRaoXri*42+Y^EsPD!3{8?#jg!q%EYlJ#&COF%3=Iv8 Z%gw;t1pvaC@GAfS