jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337758 )
Change subject: Update visual treatment of Search on Reading lists and History
screens
......................................................................
Update visual treatment of Search on Reading lists and History screens
Bug: T156071
Change-Id: Ifc0140ec1be69641792dacb3f804c5a0d455fd70
---
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/history/SearchActionModeCallback.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/res/menu/menu_action_mode_search.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles.xml
8 files changed, 34 insertions(+), 9 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index 3993d25..56c74e7 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -393,6 +393,11 @@
historyEmptyMessage.setVisibility(View.VISIBLE);
actionMode = null;
}
+
+ @Override
+ protected String getSearchHintString() {
+ return
getContext().getResources().getString(R.string.search_hint_search_history);
+ }
}
@Nullable private Callback callback() {
diff --git
a/app/src/main/java/org/wikipedia/history/SearchActionModeCallback.java
b/app/src/main/java/org/wikipedia/history/SearchActionModeCallback.java
index b579c96..9387425 100644
--- a/app/src/main/java/org/wikipedia/history/SearchActionModeCallback.java
+++ b/app/src/main/java/org/wikipedia/history/SearchActionModeCallback.java
@@ -18,7 +18,8 @@
mode.setTag(ACTION_MODE_TAG);
mode.getMenuInflater().inflate(R.menu.menu_action_mode_search, menu);
searchView = (SearchView)
MenuItemCompat.getActionView(menu.findItem(R.id.menu_search_view));
- searchView.setIconifiedByDefault(false);
+ searchView.setIconified(false);
+ searchView.setQueryHint(getSearchHintString());
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
{
@Override
public boolean onQueryTextSubmit(String s) {
@@ -34,6 +35,8 @@
return true;
}
+ protected abstract String getSearchHintString();
+
protected abstract void onQueryChange(String s);
@Override
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index 5fec00f..fb0cbeb 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -445,5 +445,17 @@
listDetailView.setSearchQuery(null);
}
}
+
+ @Override
+ protected String getSearchHintString() {
+ switch (pager.getCurrentItem()) {
+ case PAGE_READING_LISTS:
+ return
getContext().getResources().getString(R.string.search_hint_search_my_lists);
+ case PAGE_LIST_DETAIL:
+ return
getContext().getResources().getString(R.string.search_hint_search_reading_list);
+ default:
+ throw new IllegalArgumentException("Received unknown page
ID " + pager.getCurrentItem());
+ }
+ }
}
}
diff --git a/app/src/main/res/menu/menu_action_mode_search.xml
b/app/src/main/res/menu/menu_action_mode_search.xml
index 94eaa8f..d718d6b 100644
--- a/app/src/main/res/menu/menu_action_mode_search.xml
+++ b/app/src/main/res/menu/menu_action_mode_search.xml
@@ -3,7 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:app="http://schemas.android.com/apk/res-auto";>
<item android:id="@+id/menu_search_view"
- android:icon="@drawable/ic_search_white_24dp"
android:title="@string/search_hint"
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index e4eaeff..90c4b8e 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -11,7 +11,10 @@
{{Identical|Yes}}</string>
<string name="no">Negative answer to a dialog box.
{{Identical|No}}</string>
- <string name="search_hint">Placeholder text for the search textbox</string>
+ <string name="search_hint">Hint text for the search box</string>
+ <string name="search_hint_search_history">Hint text for the search box when
searching browsing history</string>
+ <string name="search_hint_search_my_lists">Hint text for the search box when
searching the set of reading lists</string>
+ <string name="search_hint_search_reading_list">Hint text for the search box
when searching for pages in a single reading list</string>
<string name="nav_item_history">Text in navigation sidebar that when tapped
leads to the History screen.
{{Identical|History}}</string>
<string name="error_network_error">Error message shown when network cannot
be reached when loading a page</string>
@@ -274,9 +277,9 @@
Followed by {{msg-wm|Wikipedia-android-strings-alpha update notification
text}}.</string>
<string name="wiktionary_no_definitions_found">Message shown when a user
requests a definition from Wiktionary but no definition is found.</string>
<string name="alpha_update_notification_title">Title for notification when
new alpha update is available.
-
-
-
+
+
+
Followed by {{msg-wm|Wikipedia-android-strings-alpha update notification
text}}.</string>
<string name="alpha_update_notification_text">Text for notification when new
alpha update is available.
diff --git a/app/src/main/res/values/colors.xml
b/app/src/main/res/values/colors.xml
index c0260c4..f6684b9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -68,7 +68,7 @@
<color name="page_info_heading">#555</color>
<color name="actionbar_background">@color/darkest_gray</color>
<color name="actionbar_highlight">#808080</color>
- <color name="search_text_hint">#808080</color>
+ <color name="search_text_hint">#32ffffff</color>
<color name="lead_gradient_start">#b8000000</color>
<color name="new_lead_gradient_start">#50000000</color>
<color name="main_toolbar_background">@color/actionbar_background</color>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 1c51d7d..e85cb07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,9 @@
<string name="no">No</string>
<string name="search_hint">Search Wikipedia</string>
+ <string name="search_hint_search_history">Search history</string>
+ <string name="search_hint_search_my_lists">Search my lists</string>
+ <string name="search_hint_search_reading_list">Search reading list</string>
<string name="nav_item_history">History</string>
<string name="error_network_error">Cannot connect to the Internet.</string>
<string name="page_error_retry">Retry</string>
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index 70bc807..212b286 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,8 +42,8 @@
</style>
<style name="AppTheme.ActionModeStyle"
parent="@style/Widget.AppCompat.ActionMode">
- <item name="background">@color/actionbar_background</item>
- <item name="backgroundSplit">@color/actionbar_background</item>
+ <item name="background">@color/foundation_blue</item>
+ <item name="backgroundSplit">@color/foundation_blue</item>
<item name="titleTextStyle">@style/AppTheme.ActionModeTitleStyle</item>
<item
name="subtitleTextStyle">@style/AppTheme.ActionModeSubtitleStyle</item>
</style>
--
To view, visit https://gerrit.wikimedia.org/r/337758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc0140ec1be69641792dacb3f804c5a0d455fd70
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
