[MediaWiki-commits] [Gerrit] Add tooltips to UI buttons - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Add tooltips to UI buttons
..
Add tooltips to UI buttons
Change-Id: I67a8804db9c206e6146274266e85e45c37168579
Task: T104094
---
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
M app/src/main/res/layout/fragment_search_recent.xml
5 files changed, 56 insertions(+), 24 deletions(-)
Approvals:
Niedzielski: 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 1ab0d2d..92430ea 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -124,7 +124,7 @@
String[] selectionArgs = null;
historyEmptyContainer.setVisibility(View.GONE);
String searchStr = entryFilter.getText().toString();
-if (searchStr.length() != 0) {
+if (!searchStr.isEmpty()) {
searchStr = searchStr.replace("\\", "").replace("%",
"\\%").replace("_", "\\_");
selection = "UPPER(" + tblName + "." + titleCol + ") LIKE UPPER(?)
ESCAPE '\\'";
selectionArgs = new String[]{"%" + searchStr + "%"};
@@ -205,7 +205,7 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-if (!isAdded() || ((PageActivity)getActivity()).isSearching()) {
+if (!isMenuToBeSetUp()) {
return;
}
inflater.inflate(R.menu.menu_history, menu);
@@ -214,12 +214,13 @@
@Override
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
-if (!isAdded() || ((PageActivity)getActivity()).isSearching()) {
+if (!isMenuToBeSetUp()) {
return;
}
+boolean isHistoryAvailable = historyEntryList.getCount() > 0;
menu.findItem(R.id.menu_clear_all_history)
-.setVisible(historyEntryList.getCount() > 0)
-.setEnabled(historyEntryList.getCount() > 0);
+.setVisible(isHistoryAvailable)
+.setEnabled(isHistoryAvailable);
}
@Override
@@ -261,6 +262,10 @@
}
}
+private boolean isMenuToBeSetUp() {
+return isAdded() && !((PageActivity)getActivity()).isSearching();
+}
+
private class HistoryItemLongClickListener implements
AdapterView.OnItemLongClickListener {
@Override
public boolean onItemLongClick(AdapterView parent, View view, int
position, long id) {
diff --git a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
index 39c4d13..7992d6b 100644
--- a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
@@ -65,8 +65,9 @@
}
});
-
getActivity().getSupportLoaderManager().initLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
-
getActivity().getSupportLoaderManager().restartLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
+LoaderManager supportLoaderManager =
getActivity().getSupportLoaderManager();
+supportLoaderManager.initLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
+supportLoaderManager.restartLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
}
@Override
@@ -81,7 +82,7 @@
String[] projection = null;
String selection = null;
String[] selectionArgs = null;
-String order = "timestamp DESC";
+String order = RecentSearchDatabaseTable.Col.TIMESTAMP.getName() + "
DESC";
return new CursorLoader(getContext(), uri, projection, selection,
selectionArgs, order);
}
diff --git a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 047d52f..52543ed 100644
--- a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -4,6 +4,7 @@
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.SearchView;
import android.text.TextUtils;
@@ -15,6 +16,7 @@
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.FrameLayout;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -31,6 +33,7 @@
import
[MediaWiki-commits] [Gerrit] Add tooltips to UI buttons - change (apps...wikipedia)
Maroloccio has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276682
Change subject: Add tooltips to UI buttons
..
Add tooltips to UI buttons
Change-Id: I67a8804db9c206e6146274266e85e45c37168579
Task: T104094
---
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
M app/src/main/res/layout/fragment_search_recent.xml
5 files changed, 56 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/82/276682/1
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index 1ab0d2d..a9affca 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -124,7 +124,7 @@
String[] selectionArgs = null;
historyEmptyContainer.setVisibility(View.GONE);
String searchStr = entryFilter.getText().toString();
-if (searchStr.length() != 0) {
+if (!searchStr.isEmpty()) {
searchStr = searchStr.replace("\\", "").replace("%",
"\\%").replace("_", "\\_");
selection = "UPPER(" + tblName + "." + titleCol + ") LIKE UPPER(?)
ESCAPE '\\'";
selectionArgs = new String[]{"%" + searchStr + "%"};
@@ -139,7 +139,7 @@
@Override
public void onLoadFinished(Loader cursorLoader, Cursor cursor) {
-if (!isAdded() || cursor == null) {
+if (!isMenuToBeSetUp()) {
return;
}
@@ -214,12 +214,13 @@
@Override
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
-if (!isAdded() || ((PageActivity)getActivity()).isSearching()) {
+if (!isMenuToBeSetUp()) {
return;
}
+boolean isHistoryAvailable = historyEntryList.getCount() > 0;
menu.findItem(R.id.menu_clear_all_history)
-.setVisible(historyEntryList.getCount() > 0)
-.setEnabled(historyEntryList.getCount() > 0);
+.setVisible(isHistoryAvailable)
+.setEnabled(isHistoryAvailable);
}
@Override
@@ -261,6 +262,10 @@
}
}
+private boolean isMenuToBeSetUp() {
+return isAdded() && !((PageActivity)getActivity()).isSearching();
+}
+
private class HistoryItemLongClickListener implements
AdapterView.OnItemLongClickListener {
@Override
public boolean onItemLongClick(AdapterView parent, View view, int
position, long id) {
diff --git a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
index 39c4d13..7992d6b 100644
--- a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
@@ -65,8 +65,9 @@
}
});
-
getActivity().getSupportLoaderManager().initLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
-
getActivity().getSupportLoaderManager().restartLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
+LoaderManager supportLoaderManager =
getActivity().getSupportLoaderManager();
+supportLoaderManager.initLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
+supportLoaderManager.restartLoader(RECENT_SEARCHES_FRAGMENT_LOADER_ID,
null, this);
}
@Override
@@ -81,7 +82,7 @@
String[] projection = null;
String selection = null;
String[] selectionArgs = null;
-String order = "timestamp DESC";
+String order = RecentSearchDatabaseTable.Col.TIMESTAMP.getName() + "
DESC";
return new CursorLoader(getContext(), uri, projection, selection,
selectionArgs, order);
}
diff --git a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 047d52f..52543ed 100644
--- a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -4,6 +4,7 @@
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.SearchView;
import android.text.TextUtils;
@@ -15,6 +16,7 @@
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.FrameLayout;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -31,6 +33,7 @@
import org.wikipedia.page.PageActivity;
import
