Skip to content

GitLab

T
tangled
Commit 4eccb972 authored by Kurt Horimoto's avatar Kurt Horimoto Committed by Commit Bot
Browse files
Options

[iOS] Move Reading List attributed text logic to utility functions. 

This will allow the icon insertion logic to be shared across different
implementations of the Reading List empty state.

Bug: 851962
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ibd4abe71be34ae019786620ba88ba6f226b75456
Reviewed-on: https://chromium-review.googlesource.com/1135983
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575017}
parent 899d4811
Expand all Show whitespace changes
Inline Side-by-side
Showing with 386 additions and 198 deletions
ios/chrome/app/strings/ios_strings.grd
View file @ 4eccb972
......@@ -1160,6 +1160,9 @@ Handoff must also be enabled in the General section of Settings, and your device
Edit
</message>
<message name="IDS_IOS_READING_LIST_EMPTY_MESSAGE" desc="Message to explain to the user how to add entries to the reading list" meaning="[Length: unlimited]">
Your reading list is available offline. To add a page to your reading list, tap <ph name="SHARE_OPENING_ICON">SHARE_OPENING_ICON<ex>(menu icon)</ex></ph> then <ph name="READ_LATER_TEXT">READ_LATER_TEXT<ex>Read Later</ex></ph>.
</message>
<message name="IDS_IOS_READING_LIST_EMPTY_MESSAGE_LEGACY" desc="Message to explain to the user how to add entries to the reading list" meaning="[Length: unlimited]">
Your reading list is available offline. To add a page to your reading list, tap <ph name="SHARE_OPENING_ICON">SHARE_OPENING_ICON<ex>Menu > Share > Read Later</ex></ph>.
</message>
<message name="IDS_IOS_READING_LIST_JUST_NOW" desc="String indicating that an event (adding item, distillation) happened less than one minute ago. [Length: 25em]">
......
ios/chrome/browser/ui/reading_list/BUILD.gn
View file @ 4eccb972
......@@ -77,6 +77,8 @@ source_set("reading_list_ui") {
sources = [
"empty_reading_list_background_view.h",
"empty_reading_list_background_view.mm",
"empty_reading_list_message_util.h",
"empty_reading_list_message_util.mm",
"legacy_reading_list_toolbar.h",
"legacy_reading_list_toolbar.mm",
"legacy_reading_list_toolbar_button.h",
......@@ -108,9 +110,11 @@ source_set("reading_list_ui") {
"resources:distillation_fail",
"resources:distillation_success",
"resources:reading_list_empty_state",
"resources:reading_list_empty_state_new",
"resources:reading_list_share_icon",
"resources:reading_list_side_swipe",
"resources:reading_list_toolbar_icon",
"resources:reading_list_tools_icon",
"//base",
"//base:i18n",
"//components/strings",
......
ios/chrome/browser/ui/reading_list/empty_reading_list_message_util.h 0 → 100644
View file @ 4eccb972
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_READING_LIST_EMPTY_READING_LIST_MESSAGE_UTIL_H_
#define IOS_CHROME_BROWSER_UI_READING_LIST_EMPTY_READING_LIST_MESSAGE_UTIL_H_
#import <UIKit/UIKit.h>
// Returns the attributed message to use for the empty Reading List background
// view.
NSAttributedString* GetReadingListEmptyMessage();
// Returns the accessibility label to use for the label displaying the text
// returned by GetReadingListEmptyMessage().
NSString* GetReadingListEmptyMessageA11yLabel();
#endif // IOS_CHROME_BROWSER_UI_READING_LIST_EMPTY_READING_LIST_MESSAGE_UTIL_H_
ios/chrome/browser/ui/reading_list/resources/BUILD.gn
View file @ 4eccb972
......@@ -4,24 +4,6 @@
import("//build/config/ios/asset_catalog.gni")
imageset("reading_list_share_icon") {
sources = [
"reading_list_share_icon.imageset/Contents.json",
"reading_list_share_icon.imageset/reading_list_share_icon.png",
"reading_list_share_icon.imageset/reading_list_share_icon@2x.png",
"reading_list_share_icon.imageset/reading_list_share_icon@3x.png",
]
}
imageset("reading_list_toolbar_icon") {
sources = [
"reading_list_toolbar_icon.imageset/Contents.json",
"reading_list_toolbar_icon.imageset/reading_list_toolbar_icon.png",
"reading_list_toolbar_icon.imageset/reading_list_toolbar_icon@2x.png",
"reading_list_toolbar_icon.imageset/reading_list_toolbar_icon@3x.png",
]
}
imageset("distillation_fail") {
sources = [
"distillation_fail.imageset/Contents.json",
......@@ -40,12 +22,12 @@ imageset("distillation_fail_new") {
]
}
imageset("reading_list_side_swipe") {
imageset("distillation_success") {
sources = [
"reading_list_side_swipe.imageset/Contents.json",
"reading_list_side_swipe.imageset/reading_list_side_swipe.png",
"reading_list_side_swipe.imageset/reading_list_side_swipe@2x.png",
"reading_list_side_swipe.imageset/reading_list_side_swipe@3x.png",
"distillation_success.imageset/Contents.json",
"distillation_success.imageset/distillation_success.png",
"distillation_success.imageset/distillation_success@2x.png",
"distillation_success.imageset/distillation_success@3x.png",
]
}
......@@ -58,11 +40,47 @@ imageset("reading_list_empty_state") {
]
}
imageset("distillation_success") {
imageset("reading_list_empty_state_new") {
sources = [
"distillation_success.imageset/Contents.json",
"distillation_success.imageset/distillation_success.png",
"distillation_success.imageset/distillation_success@2x.png",
"distillation_success.imageset/distillation_success@3x.png",
"reading_list_empty_state_new.imageset/Contents.json",
"reading_list_empty_state_new.imageset/reading_list_empty_state_new.png",
"reading_list_empty_state_new.imageset/reading_list_empty_state_new@2x.png",
"reading_list_empty_state_new.imageset/reading_list_empty_state_new@3x.png",
]
}
imageset("reading_list_share_icon") {
sources = [
"reading_list_share_icon.imageset/Contents.json",
"reading_list_share_icon.imageset/reading_list_share_icon.png",
"reading_list_share_icon.imageset/reading_list_share_icon@2x.png",
"reading_list_share_icon.imageset/reading_list_share_icon@3x.png",
]
}
imageset("reading_list_side_swipe") {
sources = [
"reading_list_side_swipe.imageset/Contents.json",
"reading_list_side_swipe.imageset/reading_list_side_swipe.png",
"reading_list_side_swipe.imageset/reading_list_side_swipe@2x.png",
"reading_list_side_swipe.imageset/reading_list_side_swipe@3x.png",
]
}
imageset("reading_list_toolbar_icon") {
sources = [
"reading_list_toolbar_icon.imageset/Contents.json",
"reading_list_toolbar_icon.imageset/reading_list_toolbar_icon.png",
"reading_list_toolbar_icon.imageset/reading_list_toolbar_icon@2x.png",
"reading_list_toolbar_icon.imageset/reading_list_toolbar_icon@3x.png",
]
}
imageset("reading_list_tools_icon") {
sources = [
"reading_list_tools_icon.imageset/Contents.json",
"reading_list_tools_icon.imageset/reading_list_tools_icon.png",
"reading_list_tools_icon.imageset/reading_list_tools_icon@2x.png",
"reading_list_tools_icon.imageset/reading_list_tools_icon@3x.png",
]
}
ios/chrome/browser/ui/reading_list/resources/reading_list_empty_state_new.imageset/Contents.json 0 → 100644
View file @ 4eccb972
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "reading_list_empty_state_new.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "reading_list_empty_state_new@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "reading_list_empty_state_new@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/reading_list/resources/reading_list_tools_icon.imageset/Contents.json 0 → 100644
View file @ 4eccb972
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "reading_list_tools_icon.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "reading_list_tools_icon@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "reading_list_tools_icon@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