Commit 9360348e authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot

Add images for the activity service

This CL adds the images for the activity service, the add/edit bookmarks
and the ReadLater images.

Bug: 834299, 829718
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I03b9d19f04f7cfd2558ecf8ac468a14c14984b13
Reviewed-on: https://chromium-review.googlesource.com/1052107Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557174}
parent 6f0f7ec0
...@@ -30,8 +30,10 @@ source_set("activity_services") { ...@@ -30,8 +30,10 @@ source_set("activity_services") {
"share_to_data_builder.mm", "share_to_data_builder.mm",
] ]
deps = [ deps = [
"resources:activity_services_add_bookmark",
"resources:activity_services_edit_bookmark",
"resources:activity_services_print", "resources:activity_services_print",
"resources:activity_services_reading_list", "resources:activity_services_read_later",
"//base", "//base",
"//components/bookmarks/browser", "//components/bookmarks/browser",
"//components/ui_metrics", "//components/ui_metrics",
......
...@@ -64,7 +64,9 @@ NSString* const kBookmarkActivityType = @"com.google.chrome.bookmarkActivity"; ...@@ -64,7 +64,9 @@ NSString* const kBookmarkActivityType = @"com.google.chrome.bookmarkActivity";
} }
- (UIImage*)activityImage { - (UIImage*)activityImage {
return [UIImage imageNamed:@"popup_menu_bookmarks"]; if (self.bookmarked)
return [UIImage imageNamed:@"activity_services_edit_bookmark"];
return [UIImage imageNamed:@"activity_services_add_bookmark"];
} }
- (BOOL)canPerformWithActivityItems:(NSArray*)activityItems { - (BOOL)canPerformWithActivityItems:(NSArray*)activityItems {
......
...@@ -61,7 +61,7 @@ NSString* const kReadingListActivityType = ...@@ -61,7 +61,7 @@ NSString* const kReadingListActivityType =
} }
- (UIImage*)activityImage { - (UIImage*)activityImage {
return [UIImage imageNamed:@"activity_services_reading_list"]; return [UIImage imageNamed:@"activity_services_read_later"];
} }
- (BOOL)canPerformWithActivityItems:(NSArray*)activityItems { - (BOOL)canPerformWithActivityItems:(NSArray*)activityItems {
......
...@@ -14,11 +14,29 @@ imageset("activity_services_print") { ...@@ -14,11 +14,29 @@ imageset("activity_services_print") {
] ]
} }
imageset("activity_services_reading_list") { imageset("activity_services_add_bookmark") {
sources = [ sources = [
"activity_services_reading_list.imageset/Contents.json", "activity_services_add_bookmark.imageset/Contents.json",
"activity_services_reading_list.imageset/activity_services_reading_list.png", "activity_services_add_bookmark.imageset/activity_services_add_bookmark_60@2x.png",
"activity_services_reading_list.imageset/activity_services_reading_list@2x.png", "activity_services_add_bookmark.imageset/activity_services_add_bookmark_60@3x.png",
"activity_services_reading_list.imageset/activity_services_reading_list@3x.png", "activity_services_add_bookmark.imageset/activity_services_add_bookmark_76@2x.png",
]
}
imageset("activity_services_edit_bookmark") {
sources = [
"activity_services_edit_bookmark.imageset/Contents.json",
"activity_services_edit_bookmark.imageset/activity_services_edit_bookmark_60@2x.png",
"activity_services_edit_bookmark.imageset/activity_services_edit_bookmark_60@3x.png",
"activity_services_edit_bookmark.imageset/activity_services_edit_bookmark_76@2x.png",
]
}
imageset("activity_services_read_later") {
sources = [
"activity_services_read_later.imageset/Contents.json",
"activity_services_read_later.imageset/activity_services_read_later_60@2x.png",
"activity_services_read_later.imageset/activity_services_read_later_60@3x.png",
"activity_services_read_later.imageset/activity_services_read_later_76@2x.png",
] ]
} }
{
"images" : [
{
"idiom" : "iphone",
"scale" : "1x"
},
{
"idiom" : "iphone",
"filename" : "activity_services_add_bookmark_60@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"filename" : "activity_services_add_bookmark_60@3x.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"scale" : "1x"
},
{
"idiom" : "ipad",
"filename" : "activity_services_add_bookmark_76@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
{
"images" : [
{
"idiom" : "iphone",
"scale" : "1x"
},
{
"idiom" : "iphone",
"filename" : "activity_services_edit_bookmark_60@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"filename" : "activity_services_edit_bookmark_60@3x.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"scale" : "1x"
},
{
"idiom" : "ipad",
"filename" : "activity_services_edit_bookmark_76@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
{
"images" : [
{
"idiom" : "iphone",
"scale" : "1x"
},
{
"idiom" : "iphone",
"filename" : "activity_services_read_later_60@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"filename" : "activity_services_read_later_60@3x.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"scale" : "1x"
},
{
"idiom" : "ipad",
"filename" : "activity_services_read_later_76@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "activity_services_reading_list.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "activity_services_reading_list@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "activity_services_reading_list@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment