From 1c5233aaa373d9aa8ffda4e411f3acc6b9c19503 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 24 Apr 2019 17:28:57 -0700 Subject: [PATCH] Use correct icon for "Add Caption" vs. "Has Caption" --- .../Contents.json | 23 ++++++++++++++++++ .../add-caption-28@1x.png | Bin .../add-caption-28@2x.png | Bin .../add-caption-28@3x.png | Bin .../Contents.json | 6 ++--- .../caption-24@1x.png | Bin 0 -> 153 bytes .../caption-24@2x.png | Bin 0 -> 190 bytes .../caption-24@3x.png | Bin 0 -> 297 bytes .../AttachmentApprovalViewController.swift | 6 ++--- 9 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 Signal/Images.xcassets/image_editor_add_caption.imageset/Contents.json rename Signal/Images.xcassets/{image_editor_caption.imageset => image_editor_add_caption.imageset}/add-caption-28@1x.png (100%) rename Signal/Images.xcassets/{image_editor_caption.imageset => image_editor_add_caption.imageset}/add-caption-28@2x.png (100%) rename Signal/Images.xcassets/{image_editor_caption.imageset => image_editor_add_caption.imageset}/add-caption-28@3x.png (100%) create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png create mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png diff --git a/Signal/Images.xcassets/image_editor_add_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_add_caption.imageset/Contents.json new file mode 100644 index 0000000000..15de683ae7 --- /dev/null +++ b/Signal/Images.xcassets/image_editor_add_caption.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "add-caption-28@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "add-caption-28@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "add-caption-28@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@1x.png b/Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@1x.png similarity index 100% rename from Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@1x.png rename to Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@1x.png diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@2x.png b/Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@2x.png similarity index 100% rename from Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@2x.png rename to Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@2x.png diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@3x.png b/Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@3x.png similarity index 100% rename from Signal/Images.xcassets/image_editor_caption.imageset/add-caption-28@3x.png rename to Signal/Images.xcassets/image_editor_add_caption.imageset/add-caption-28@3x.png diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json index 15de683ae7..80c4669a0b 100644 --- a/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json +++ b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "add-caption-28@1x.png", + "filename" : "caption-24@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "add-caption-28@2x.png", + "filename" : "caption-24@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "add-caption-28@3x.png", + "filename" : "caption-24@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..5d651236768083334bf6ccb785a39e82294035c4 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0prE&> zi(`mK=iAAKTnq|4%)%cZ@3Zlfb#Y;LJ$UDeW7XkMuS1@fF1{7BQ9NNd;ZBv`q#GOz xQ{G)=`@_G?;?tCVW%nbgjmrHS9&BQ8U~QWvxxr|$?PZ{`44$rjF6*2UngE>_GK2sC literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c444e83a99a0a984d6949d80443e13be7bcbe588 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36fE#` zaSX|5e0$B1tHD5k^$ XpOFZkBlp=GXg7nWtDnm{r-UW|Bq&9U literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png b/Signal/Images.xcassets/image_editor_caption.imageset/caption-24@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..740abdfffba21be0280854b96d43cbfb764a47a8 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KHND0th` z#WAE}&fA-gTug=n3| zg#ZB!4iPl&yUWk_evj{!I&b+q_aa{wQ0bux_O)B(^0n(ve*}6O;1S)JpLJ? Q1oS3@r>mdKI;Vst0JFkk=Kufz literal 0 HcmV?d00001 diff --git a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift index ac511390fd..07babf5ef9 100644 --- a/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApproval/AttachmentApprovalViewController.swift @@ -278,9 +278,9 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC shouldShowCaptionUI = true } if shouldShowCaptionUI { - let captionButton = navigationBarButton(imageName: "image_editor_caption", - selector: #selector(didTapCaption(sender:))) - navigationBarItems.append(captionButton) + let addCaptionButton = navigationBarButton(imageName: "image_editor_add_caption", + selector: #selector(didTapCaption(sender:))) + navigationBarItems.append(addCaptionButton) } }