Dbrant has submitted this change and it was merged.
Change subject: Clear Network error. Tap to try again. bar
..
Clear Network error. Tap to try again. bar
Fade out the bar when the search test field loses focus.
Hide it when navigate back or open the nav drawer.
Bug: 64773
Change-Id: Ie56aefc7cb44ee6819f1805e5b534283d9fd030d
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
2 files changed, 16 insertions(+), 0 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
Objections:
Yuvipanda: There's a problem with this change, please improve
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 10f8ba8..a7636d6 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -172,6 +172,7 @@
String tag =
getSupportFragmentManager().getBackStackEntryAt(getSupportFragmentManager().getBackStackEntryCount()
- 1).getName();
curPageFragment = (PageViewFragment)
getSupportFragmentManager().findFragmentByTag(tag);
curPageFragment.show();
+searchAriclesFragment.clearErrors();
searchAriclesFragment.ensureVisible();
}
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e21b0b5..535bcd1 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -217,6 +217,16 @@
}
});
+searchTermText.setOnFocusChangeListener(new
View.OnFocusChangeListener() {
+@Override
+public void onFocusChange(View v, boolean hasFocus) {
+if (!hasFocus searchNetworkError.isShown()) {
+ViewAnimations.fadeOut(searchNetworkError);
+}
+
+}
+});
+
adapter = new SearchResultAdapter(inflater);
searchResultsList.setAdapter(adapter);
@@ -227,6 +237,7 @@
drawerLayout.closeDrawer(Gravity.START);
} else {
hideSearchResults();
+clearErrors();
drawerLayout.openDrawer(Gravity.START);
}
}
@@ -315,6 +326,10 @@
outState.putBoolean(pausedStateOfZero, pausedStateOfZero);
}
+public void clearErrors() {
+searchNetworkError.setVisibility(View.GONE);
+}
+
private final class SearchResultAdapter extends BaseAdapter {
private ListPageTitle results;
private final LayoutInflater inflater;
--
To view, visit https://gerrit.wikimedia.org/r/134297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie56aefc7cb44ee6819f1805e5b534283d9fd030d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits