diff --git a/Signal/Images.xcassets/actionsheet_camera_black.imageset/Contents.json b/Signal/Images.xcassets/actionsheet_camera_black.imageset/Contents.json new file mode 100644 index 000000000..663a585ba --- /dev/null +++ b/Signal/Images.xcassets/actionsheet_camera_black.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "actionsheet_camera_black@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "actionsheet_camera_black@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "actionsheet_camera_black@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@1x.png b/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@1x.png new file mode 100644 index 000000000..326c472e7 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@1x.png differ diff --git a/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@2x.png b/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@2x.png new file mode 100644 index 000000000..008e0dd08 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@2x.png differ diff --git a/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@3x.png b/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@3x.png new file mode 100644 index 000000000..eec3bfd90 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_camera_black.imageset/actionsheet_camera_black@3x.png differ diff --git a/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/Contents.json b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/Contents.json new file mode 100644 index 000000000..ae8acb405 --- /dev/null +++ b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "actionsheet_camera_roll_black@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "actionsheet_camera_roll_black@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "actionsheet_camera_roll_black@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@1x.png b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@1x.png new file mode 100644 index 000000000..c111fd328 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@1x.png differ diff --git a/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@2x.png b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@2x.png new file mode 100644 index 000000000..4cb088a2a Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@2x.png differ diff --git a/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@3x.png b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@3x.png new file mode 100644 index 000000000..fc053de47 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_camera_roll_black.imageset/actionsheet_camera_roll_black@3x.png differ diff --git a/Signal/Images.xcassets/actionsheet_document_black.imageset/Contents.json b/Signal/Images.xcassets/actionsheet_document_black.imageset/Contents.json new file mode 100644 index 000000000..d7e57508b --- /dev/null +++ b/Signal/Images.xcassets/actionsheet_document_black.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "actionsheet_document_black@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "actionsheet_document_black@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "actionsheet_document_black@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@1x.png b/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@1x.png new file mode 100644 index 000000000..1f9e53779 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@1x.png differ diff --git a/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@2x.png b/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@2x.png new file mode 100644 index 000000000..b63745f24 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@2x.png differ diff --git a/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@3x.png b/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@3x.png new file mode 100644 index 000000000..52826cbc2 Binary files /dev/null and b/Signal/Images.xcassets/actionsheet_document_black.imageset/actionsheet_document_black@3x.png differ diff --git a/Signal/src/ViewControllers/MessagesViewController.m b/Signal/src/ViewControllers/MessagesViewController.m index d866571f8..902e0d293 100644 --- a/Signal/src/ViewControllers/MessagesViewController.m +++ b/Signal/src/ViewControllers/MessagesViewController.m @@ -2763,6 +2763,9 @@ typedef enum : NSUInteger { handler:^(UIAlertAction * _Nonnull action) { [self takePictureOrVideo]; }]; + UIImage *takeMediaImage = [UIImage imageNamed:@"actionsheet_camera_black"]; + OWSAssert(takeMediaImage); + [takeMediaAction setValue:takeMediaImage forKey:@"image"]; [actionSheetController addAction:takeMediaAction]; UIAlertAction *chooseMediaAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"MEDIA_FROM_LIBRARY_BUTTON", @"media picker option to choose from library") @@ -2770,6 +2773,9 @@ typedef enum : NSUInteger { handler:^(UIAlertAction * _Nonnull action) { [self chooseFromLibrary]; }]; + UIImage *chooseMediaImage = [UIImage imageNamed:@"actionsheet_camera_roll_black"]; + OWSAssert(chooseMediaImage); + [chooseMediaAction setValue:chooseMediaImage forKey:@"image"]; [actionSheetController addAction:chooseMediaAction]; UIAlertAction *chooseDocumentAction = @@ -2779,6 +2785,9 @@ typedef enum : NSUInteger { handler:^(UIAlertAction *_Nonnull action) { [self showAttachmentDocumentPicker]; }]; + UIImage *chooseDocumentImage = [UIImage imageNamed:@"actionsheet_document_black"]; + OWSAssert(chooseDocumentImage); + [chooseDocumentAction setValue:chooseDocumentImage forKey:@"image"]; [actionSheetController addAction:chooseDocumentAction]; [self presentViewController:actionSheetController animated:true completion:nil];