Deskana has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160217
Change subject: Improve layout and searching of History and Saved Pages.
......................................................................
Improve layout and searching of History and Saved Pages.
* Add small left and right margins to the empty text so that the text
presented when there are no search results wraps more cleanly.
* Change empty message to not include search query so that the text wraps more
consistently and cleanly.
* Tweak empty messages for History and Saved Pages to be more consistent with
each other.
Bug: 70102
Change-Id: I7adebfb1c0a06dde7f2dedd3cead8cc983d4b968
---
M wikipedia/res/layout/activity_history.xml
M wikipedia/res/layout/activity_saved_pages.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
5 files changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/17/160217/1
diff --git a/wikipedia/res/layout/activity_history.xml
b/wikipedia/res/layout/activity_history.xml
index f8f9634..4c73f41 100644
--- a/wikipedia/res/layout/activity_history.xml
+++ b/wikipedia/res/layout/activity_history.xml
@@ -25,6 +25,8 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="-32dp"
android:layout_marginBottom="16dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
android:text="@string/history_empty_title"
/>
<TextView
diff --git a/wikipedia/res/layout/activity_saved_pages.xml
b/wikipedia/res/layout/activity_saved_pages.xml
index f107ab2..e140d2d 100644
--- a/wikipedia/res/layout/activity_saved_pages.xml
+++ b/wikipedia/res/layout/activity_saved_pages.xml
@@ -24,6 +24,8 @@
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginBottom="16dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
android:text="@string/saved_pages_empty_title"
/>
<TextView
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 0617723..190fb74 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -43,7 +43,7 @@
<string name="delete_selected_saved_pages">Delete</string>
<string name="toast_saved_page_deleted">Saved page(s) deleted</string>
<string name="saved_pages_search_list_hint">Search</string>
- <string name="saved_pages_search_empty_message">No pages found matching
\"%s\"</string>
+ <string name="saved_pages_search_empty_message">No pages found matching
your query.</string>
<string name="last_updated_text">Last updated %s</string>
<string name="content_license_html"><![CDATA[Content is available under <a
href=\"//creativecommons.org/licenses/by-sa/3.0/\">CC BY-SA 3.0</a> unless
otherwise noted]]></string>
@@ -92,9 +92,9 @@
<string name="preference_summary_logout">Log out of your Wikipedia
account</string>
<string name="preference_summary_notloggedin">Not logged in.</string>
<string name="toast_logout_complete">Logged out</string>
- <string name="saved_pages_empty_title">No saved pages yet.</string>
+ <string name="saved_pages_empty_title">No saved pages here!</string>
<string name="saved_pages_empty_message">Saved pages are pretty awesome.
Think of them as bookmarks that you can read even when you are offline.</string>
- <string name="history_empty_title">No recent pages here.</string>
+ <string name="history_empty_title">No recent pages here!</string>
<string name="history_empty_message">You probably deleted all of them.
Next time you go to a page you can get back to it from here.</string>
<string
name="wp_stylized"><![CDATA[<big>W</big>IKIPEDI<big>A</big>]]></string>
<string name="wp_tag_line">The Free Encyclopedia</string>
@@ -164,7 +164,7 @@
<string name="preference_summary_eventlogging_opt_in">Allow Wikimedia to
collect information about how you use the app to make the app better</string>
<string name="editing_error_spamblacklist">Links to blocked domains (%s)
detected. Please remove them and try again.</string>
<string name="history_search_list_hint">Search</string>
- <string name="history_search_empty_message">No pages found matching
\"%s\"</string>
+ <string name="history_search_empty_message">No pages found matching your
query.</string>
<string name="error_can_not_process_link">Could not display this
link</string>
<string name="page_protected_autoconfirmed">This page has been
semi-protected.</string>
<string name="page_protected_sysop">This page has been fully
protected.</string>
diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
index e2b7485..afefd3d 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
@@ -79,7 +79,7 @@
historyEmptyTitle.setText(R.string.history_empty_title);
historyEmptyMessage.setVisibility(View.VISIBLE);
} else {
-
historyEmptyTitle.setText(getString(R.string.history_search_empty_message,
editable.toString()));
+
historyEmptyTitle.setText(R.string.history_search_empty_message);
historyEmptyMessage.setVisibility(View.GONE);
}
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
index df835ca..caacd2a 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
@@ -149,7 +149,7 @@
savedPagesEmptyImage.setVisibility(View.VISIBLE);
savedPagesEmptyMessage.setVisibility(View.VISIBLE);
} else {
-
savedPagesEmptyTitle.setText(getString(R.string.saved_pages_search_empty_message,
editable.toString()));
+
savedPagesEmptyTitle.setText(R.string.saved_pages_search_empty_message);
savedPagesEmptyImage.setVisibility(View.GONE);
savedPagesEmptyMessage.setVisibility(View.GONE);
}
--
To view, visit https://gerrit.wikimedia.org/r/160217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7adebfb1c0a06dde7f2dedd3cead8cc983d4b968
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
