From 7521b3a145bb599eb81c1cbf988da26bc567039d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 12 Mar 2019 12:46:24 -0400 Subject: [PATCH] Update "attachment has caption" indicator. --- .../image_editor_caption.imageset/Contents.json | 6 +++--- .../add-caption-32@1x.png | Bin 326 -> 0 bytes .../add-caption-32@2x.png | Bin 559 -> 0 bytes .../add-caption-32@3x.png | Bin 866 -> 0 bytes .../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 | 7 ++++--- .../AttachmentCaptionViewController.swift | 2 +- .../ImageEditor/ImageEditorPaletteView.swift | 3 ++- 10 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png delete mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png delete mode 100644 Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@3x.png 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_caption.imageset/Contents.json b/Signal/Images.xcassets/image_editor_caption.imageset/Contents.json index 22defce50..80c4669a0 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-32@1x.png", + "filename" : "caption-24@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "add-caption-32@2x.png", + "filename" : "caption-24@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "add-caption-32@3x.png", + "filename" : "caption-24@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@1x.png deleted file mode 100644 index 2d1325e014eecf410f1d981026df1a85d07607f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1FMR zi(^Pc>)UA$d7B(~TK7x+Kg^M{K-pqe-T{uj2OND3(guet9eI~YJZRCdv=FNB{J+Kh z_qy*pR-H4!?nAY%;sK`+^w|cR!ECpp6guM%u8S1 z@14pf$XVsOYE{KKMWzEsKl?PqF|DflHb*#NH>bV3f>NZh!ETPwts^$?fdBV}+)3w=0nR-&rsm)XTV>ZcE-YXesK)4@61>=R4 WEb`8ktgnG#z~JfX=d#Wzp$P!D(}NrU diff --git a/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png b/Signal/Images.xcassets/image_editor_caption.imageset/add-caption-32@2x.png deleted file mode 100644 index ba403c8b3fc8b64806371d50524e5d886ef121b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9E$svykh8Km-ofr0U% zr;B4q#hka%7jq982-L3o6>pZ|c7mhl0Ec8_phTmf5tFh3Q;vgrL8{;t<@DJuSuZD+ z`)^9Io%`T!x3K(2!K9vqW74JH@*1QcuzTuvO>4AKm`4QvO} zEq|@FV76eiV0w|<(|$63p4UV7WDm32jGBoPx0p>XIz6$R@%rl8%7stzl{52-El&pi zH575mXiNR7_(GqddgBwF2W8%6l50=41P3Oc6D|CD{Is3wzEek|Bs^~~2+Xp(vPIKL zWxt&I{BGl{BR5(~_4ImgneC9&UAnewL-*SSmeWtmX0dHanz!zstE@f qy95KI&fq_}X z)5S5QV$R#S7YlDW2(*1Ss^phFBHI!oF#Um00lTK+%LB44LP1Tjjvnk~>;VVU^e%bl zeZS!4@yGFdy|KBRpHS1^lBk~!-a(;?7WWLlMQAYaur@4YFc4vAV>%GPAi>4p%$R^8 zxMzO$cg>}1J8U{U{_Qr@E~%aG^Zx(Id_haA^*Y~WU7jpoC3ohM=9BZxdYMX_gePAA z6Vki&&%AQ+yjz&eslNM2-L0Ev-tdCp)KY* zS#Nzdoo&2-Wm|Og>-8_b`N{lKd+u6vVCLt4N5h%6-+I>3`Ete9Qy2HIUweN7OTJ2r zyQ2ns$hp5i=hQD>b*=SsSC(5mLGjQ zIkI_*p=RPNo&8d!`GW`x_OQNu zQF!OK5|hXdM@G%17xtLVJhp%#wAOU4ip&4G3pW>7RXHl%pZ%!BL_#eQdwi{)+cz(J zS4E};G%AJ9GA@5)7xA9&z_sOzPtVvh(^O`Wd6xZjQI|Z`ld;^-m7chUzHcu(A1nZg z_eD%+(r4E)@(1;|cFuGUX($hWa_-BPZgFn?G`4B0cTQM6W%bMXEB35AYh7ccz5V!P z;Xm68429QsO}-wn>5Q4+&sRs1XHH6u(vLp2sP_N1=Iy>~H|9L$n5GfEv+dB@;~9lZ z1Y_0~WS3^l$xi>o=q=vgyY#x`lmn0M#_q2B_|A#t^!4})X}@g~|1}&o`O$nX!9tn~ hdq5$l)Xt7SjO@lPMcrQ|#DSTH!PC{xWt~$(69E1JZeIWZ 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/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 784828584..40e681eda 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1460,7 +1460,7 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { // Add shadow in case overlayed on white content lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor - lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0) + lengthLimitLabel.layer.shadowOffset = .zero lengthLimitLabel.layer.shadowOpacity = 0.8 lengthLimitLabel.isHidden = true @@ -1694,6 +1694,7 @@ public class ApprovalRailCellView: GalleryRailCellView { imageView.layer.shadowColor = UIColor.black.cgColor imageView.layer.shadowRadius = 2 imageView.layer.shadowOpacity = 0.66 + imageView.layer.shadowOffset = .zero return imageView }() @@ -1725,8 +1726,8 @@ public class ApprovalRailCellView: GalleryRailCellView { if hasCaption { addSubview(captionIndicator) - captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 0) - captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 4) + captionIndicator.autoPinEdge(toSuperviewEdge: .top, withInset: 2) + captionIndicator.autoPinEdge(toSuperviewEdge: .leading, withInset: 6) } else { captionIndicator.removeFromSuperview() } diff --git a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift index 7b57106b6..e33fe9363 100644 --- a/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentCaptionViewController.swift @@ -177,7 +177,7 @@ class AttachmentCaptionViewController: OWSViewController { // Add shadow in case overlayed on white content lengthLimitLabel.layer.shadowColor = UIColor.black.cgColor - lengthLimitLabel.layer.shadowOffset = CGSize(width: 0.0, height: 0.0) + lengthLimitLabel.layer.shadowOffset = .zero lengthLimitLabel.layer.shadowOpacity = 0.8 lengthLimitLabel.isHidden = true diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift index 0ba7170a6..e1c78ff24 100644 --- a/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift +++ b/SignalMessaging/Views/ImageEditor/ImageEditorPaletteView.swift @@ -103,8 +103,9 @@ public class ImageEditorPaletteView: UIView { imageView.layer.borderColor = UIColor.white.cgColor imageView.layer.borderWidth = CGHairlineWidth() imageView.layer.shadowColor = UIColor.black.cgColor - imageView.layer.shadowOpacity = 2.0 + imageView.layer.shadowRadius = 2.0 imageView.layer.shadowOpacity = 0.33 + imageView.layer.shadowOffset = .zero selectionWrapper.layoutCallback = { [weak self] (view) in guard let strongSelf = self else { return