Merge branch 'charlesmchen/contactShareAssets2'

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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];

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];

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