diff --git a/Signal/Images.xcassets/actionsheet_contact.imageset/Contents.json b/Signal/Images.xcassets/actionsheet_contact.imageset/Contents.json new file mode 100644 index 000000000..1ccdcb815 --- /dev/null +++ b/Signal/Images.xcassets/actionsheet_contact.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "person_outline_24@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "person_outline_24@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "person_outline_24@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@1x.png b/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@1x.png new file mode 100644 index 000000000..ac1c22b84 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@1x.png differ diff --git a/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@2x.png b/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@2x.png new file mode 100644 index 000000000..d7cf8563a Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@2x.png differ diff --git a/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@3x.png b/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@3x.png new file mode 100644 index 000000000..1e2987d82 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_contact.imageset/person_outline_24@3x.png differ diff --git a/Signal/Images.xcassets/contact_checkbox_checked.imageset/Contents.json b/Signal/Images.xcassets/contact_checkbox_checked.imageset/Contents.json new file mode 100644 index 000000000..85597a4b4 --- /dev/null +++ b/Signal/Images.xcassets/contact_checkbox_checked.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "checkbox_checked@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "checkbox_checked@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "checkbox_checked@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@1x.png b/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@1x.png new file mode 100644 index 000000000..c5595df57 Binary files /dev/null and b/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@1x.png differ diff --git a/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@2x.png b/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@2x.png new file mode 100644 index 000000000..3ab0f1d4d Binary files /dev/null and b/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@2x.png differ diff --git a/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@3x.png b/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@3x.png new file mode 100644 index 000000000..07f377b59 Binary files /dev/null and b/Signal/Images.xcassets/contact_checkbox_checked.imageset/checkbox_checked@3x.png differ diff --git a/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/Contents.json b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/Contents.json new file mode 100644 index 000000000..eee527b20 --- /dev/null +++ b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "checkbox_unchecked@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "checkbox_unchecked@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "checkbox_unchecked@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@1x.png b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@1x.png new file mode 100644 index 000000000..587e41bab Binary files /dev/null and b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@1x.png differ diff --git a/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@2x.png b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@2x.png new file mode 100644 index 000000000..b3278bcee Binary files /dev/null and b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@2x.png differ diff --git a/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@3x.png b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@3x.png new file mode 100644 index 000000000..db856f91d Binary files /dev/null and b/Signal/Images.xcassets/contact_checkbox_unchecked.imageset/checkbox_unchecked@3x.png differ diff --git a/Signal/Images.xcassets/small_chevron_left.imageset/Contents.json b/Signal/Images.xcassets/small_chevron_left.imageset/Contents.json new file mode 100644 index 000000000..fc8158261 --- /dev/null +++ b/Signal/Images.xcassets/small_chevron_left.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "chevron_left_16@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "chevron_left_16@3x-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "chevron_left_16@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@1x.png b/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@1x.png new file mode 100644 index 000000000..b45c2bb10 Binary files /dev/null and b/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@1x.png differ diff --git a/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@3x-1.png b/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@3x-1.png new file mode 100644 index 000000000..dea5b2742 Binary files /dev/null and b/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@3x-1.png differ diff --git a/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@3x.png b/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@3x.png new file mode 100644 index 000000000..dea5b2742 Binary files /dev/null and b/Signal/Images.xcassets/small_chevron_left.imageset/chevron_left_16@3x.png differ diff --git a/Signal/Images.xcassets/small_chevron_right.imageset/Contents.json b/Signal/Images.xcassets/small_chevron_right.imageset/Contents.json new file mode 100644 index 000000000..3ce44ccf8 --- /dev/null +++ b/Signal/Images.xcassets/small_chevron_right.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "chevron_right_16@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "chevron_right_16@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "chevron_right_16@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@1x.png b/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@1x.png new file mode 100644 index 000000000..034ff4883 Binary files /dev/null and b/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@1x.png differ diff --git a/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@2x.png b/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@2x.png new file mode 100644 index 000000000..a6e663c60 Binary files /dev/null and b/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@2x.png differ diff --git a/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@3x.png b/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@3x.png new file mode 100644 index 000000000..88e1675df Binary files /dev/null and b/Signal/Images.xcassets/small_chevron_right.imageset/chevron_right_16@3x.png differ diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m index b55d28df0..6b23a2ec7 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m @@ -218,8 +218,7 @@ NS_ASSUME_NONNULL_BEGIN [labelsView addArrangedSubview:bottomLabel]; } - UIImage *disclosureImage = - [UIImage imageNamed:(self.isRTL ? @"system_disclosure_indicator_rtl" : @"system_disclosure_indicator")]; + UIImage *disclosureImage = [UIImage imageNamed:(self.isRTL ? @"small_chevron_left" : @"small_chevron_right")]; OWSAssert(disclosureImage); UIImageView *disclosureImageView = [UIImageView new]; disclosureImageView.image = [disclosureImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index f8fcac9f6..2c6a3ed96 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -3696,8 +3696,7 @@ typedef enum : NSUInteger { handler:^(UIAlertAction *_Nonnull action) { [self chooseContactForSending]; }]; - // TODO - proper image - UIImage *chooseContactImage = [UIImage imageNamed:@"actionsheet_camera_black"]; + UIImage *chooseContactImage = [UIImage imageNamed:@"actionsheet_contact"]; OWSAssert(takeMediaImage); [chooseContactAction setValue:chooseContactImage forKey:@"image"]; [actionSheetController addAction:chooseContactAction]; diff --git a/SignalMessaging/attachments/ApproveContactShareViewController.swift b/SignalMessaging/attachments/ApproveContactShareViewController.swift index 2a014978b..793efd220 100644 --- a/SignalMessaging/attachments/ApproveContactShareViewController.swift +++ b/SignalMessaging/attachments/ApproveContactShareViewController.swift @@ -145,12 +145,11 @@ class ContactShareFieldView: UIStackView { let checkbox = UIButton(type: .custom) self.checkbox = checkbox - // TODO: Use real assets. - checkbox.setTitle("☐", for: .normal) - checkbox.setTitle("☒", for: .selected) - checkbox.setTitleColor(UIColor.black, for: .normal) - checkbox.setTitleColor(UIColor.black, for: .selected) - checkbox.titleLabel?.font = UIFont.ows_dynamicTypeBody + + let checkedIcon = #imageLiteral(resourceName: "contact_checkbox_checked") + let uncheckedIcon = #imageLiteral(resourceName: "contact_checkbox_unchecked") + checkbox.setImage(uncheckedIcon, for: .normal) + checkbox.setImage(checkedIcon, for: .selected) checkbox.isSelected = field.isIncluded() // Disable the checkbox; the entire row is hot. checkbox.isUserInteractionEnabled = false