Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151660
Change subject: Hide ToC when Nav drawer pulled out.
......................................................................
Hide ToC when Nav drawer pulled out.
Bug: 64664
Change-Id: Ia8779b98eba90315c307f2e8f597523f90342ef4
---
M wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
4 files changed, 18 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/60/151660/1
diff --git a/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
b/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
index 938384e..2e45b94 100644
--- a/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
+++ b/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
@@ -1,4 +1,14 @@
package org.wikipedia.events;
public class ShowToCEvent {
+ private final boolean show;
+
+ public ShowToCEvent(boolean show) {
+ this.show = show;
+ }
+
+ public boolean getShow() {
+ return show;
+ }
+
}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 88be648..139dca6 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -300,7 +300,7 @@
if (curPageFragment == null) {
return;
}
- curPageFragment.toggleToC();
+ curPageFragment.toggleToC(event.getShow());
}
@Subscribe
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 1ed16e3..780f9d0 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -749,15 +749,15 @@
}
private ToCHandler tocHandler;
- public void toggleToC() {
+ public void toggleToC(boolean show) {
// tocHandler could still be null while the page is loading
if (tocHandler == null) {
return;
}
- if (tocHandler.isVisible()) {
- tocHandler.hide();
- } else {
+ if (show) {
tocHandler.show();
+ } else {
+ tocHandler.hide();
}
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 6270b39..f68dbec 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -267,7 +267,7 @@
drawerLayout.closeDrawer(Gravity.START);
}
Utils.hideSoftKeyboard(getActivity());
- app.getBus().post(new ShowToCEvent());
+ app.getBus().post(new ShowToCEvent(true));
}
});
@@ -329,6 +329,8 @@
// Hide the keyboard when the drawer is opened
if (!hideKeyboardCalled) {
Utils.hideSoftKeyboard(getActivity());
+ //also make sure ToC is hidden
+ app.getBus().post(new ShowToCEvent(false));
hideKeyboardCalled = true;
}
// Make sure that the entire search bar is visible
--
To view, visit https://gerrit.wikimedia.org/r/151660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8779b98eba90315c307f2e8f597523f90342ef4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
