diff --git a/Signal/Images.xcassets/album_add_more.imageset/Contents.json b/Signal/Images.xcassets/album_add_more.imageset/Contents.json index b4dcc1357..3b4a85bc9 100644 --- a/Signal/Images.xcassets/album_add_more.imageset/Contents.json +++ b/Signal/Images.xcassets/album_add_more.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "album_add_more@1x.png", + "filename" : "add-photo-24@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "album_add_more@2x.png", + "filename" : "add-photo-24@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "album_add_more@3x.png", + "filename" : "add-photo-24@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@1x.png b/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@1x.png new file mode 100644 index 000000000..1f653a075 Binary files /dev/null and b/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@1x.png differ diff --git a/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@2x.png b/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@2x.png new file mode 100644 index 000000000..157ece7ef Binary files /dev/null and b/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@2x.png differ diff --git a/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@3x.png b/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@3x.png new file mode 100644 index 000000000..a6080e078 Binary files /dev/null and b/Signal/Images.xcassets/album_add_more.imageset/add-photo-24@3x.png differ diff --git a/Signal/Images.xcassets/album_add_more.imageset/album_add_more@1x.png b/Signal/Images.xcassets/album_add_more.imageset/album_add_more@1x.png deleted file mode 100644 index bc89e5a4f..000000000 Binary files a/Signal/Images.xcassets/album_add_more.imageset/album_add_more@1x.png and /dev/null differ diff --git a/Signal/Images.xcassets/album_add_more.imageset/album_add_more@2x.png b/Signal/Images.xcassets/album_add_more.imageset/album_add_more@2x.png deleted file mode 100644 index b5102c674..000000000 Binary files a/Signal/Images.xcassets/album_add_more.imageset/album_add_more@2x.png and /dev/null differ diff --git a/Signal/Images.xcassets/album_add_more.imageset/album_add_more@3x.png b/Signal/Images.xcassets/album_add_more.imageset/album_add_more@3x.png deleted file mode 100644 index 87e6bf6f2..000000000 Binary files a/Signal/Images.xcassets/album_add_more.imageset/album_add_more@3x.png and /dev/null differ diff --git a/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@1x.png b/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@1x.png index 7cd37f5fe..99e23b113 100644 Binary files a/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@1x.png and b/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@1x.png differ diff --git a/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@2x.png b/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@2x.png index c1a2af037..7f4edb311 100644 Binary files a/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@2x.png and b/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@2x.png differ diff --git a/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@3x.png b/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@3x.png index fe9d82af6..018ac849d 100644 Binary files a/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@3x.png and b/Signal/Images.xcassets/ic_small_x.imageset/x-shadow-12@3x.png differ diff --git a/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@1x.png b/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@1x.png index bc2a88f74..4f51b4eda 100644 Binary files a/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@1x.png and b/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@1x.png differ diff --git a/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@2x.png b/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@2x.png index 48d0d69c5..ddef4cf6a 100644 Binary files a/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@2x.png and b/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@2x.png differ diff --git a/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@3x.png b/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@3x.png index 6892ef867..e00c5d828 100644 Binary files a/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@3x.png and b/Signal/Images.xcassets/media_album_caption.imageset/caption-shadow-24@3x.png differ diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift index 2c43e3c6e..4cb4f52fa 100644 --- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift @@ -1419,7 +1419,9 @@ class MediaMessageTextToolbar: UIView, UITextViewDelegate { textView.textContainerInset = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7) textView.scrollIndicatorInsets = UIEdgeInsets(top: 5, left: 0, bottom: 5, right: 3) - addMoreButton.setImage(UIImage(named: "album_add_more"), for: .normal) + let addMoreIcon = #imageLiteral(resourceName: "album_add_more").withRenderingMode(.alwaysTemplate) + addMoreButton.setImage(addMoreIcon, for: .normal) + addMoreButton.tintColor = Theme.darkThemePrimaryColor addMoreButton.addTarget(self, action: #selector(didTapAddMore), for: .touchUpInside) let sendTitle = NSLocalizedString("ATTACHMENT_APPROVAL_SEND_BUTTON", comment: "Label for 'send' button in the 'attachment approval' dialog.")