jenkins-bot has submitted this change and it was merged.
Change subject: Don't hide search bar when ToC is pulled out.
......................................................................
Don't hide search bar when ToC is pulled out.
Change-Id: Ic14fa3c8ddd5de0554b870076d90823bce9c3f46
---
M wikipedia/res/layout/fragment_page.xml
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/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
6 files changed, 32 insertions(+), 20 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/res/layout/fragment_page.xml
b/wikipedia/res/layout/fragment_page.xml
index d6b3716..4bdfda2 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -44,12 +44,13 @@
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical"
+ android:background="?attr/toc_background_color"
>
<ListView
android:id="@+id/page_toc_list"
+ android:layout_marginTop="48dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/toc_background_color"
android:visibility="gone"
android:choiceMode="singleChoice"
/>
diff --git a/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
b/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
index 2e45b94..275e8c1 100644
--- a/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
+++ b/wikipedia/src/main/java/org/wikipedia/events/ShowToCEvent.java
@@ -1,14 +1,17 @@
package org.wikipedia.events;
public class ShowToCEvent {
- private final boolean show;
+ public static final int ACTION_SHOW = 0;
+ public static final int ACTION_HIDE = 1;
+ public static final int ACTION_TOGGLE = 2;
+ private int action;
- public ShowToCEvent(boolean show) {
- this.show = show;
+ public ShowToCEvent(int action) {
+ this.action = action;
}
- public boolean getShow() {
- return show;
+ public int getAction() {
+ return action;
}
}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 827694d..c236f21 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -302,7 +302,7 @@
if (curPageFragment == null) {
return;
}
- curPageFragment.toggleToC(event.getShow());
+ curPageFragment.toggleToC(event.getAction());
}
@Subscribe
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index ec60cee..5db54ee 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -19,6 +19,7 @@
import org.wikipedia.NightModeHandler;
import org.wikipedia.analytics.ConnectionIssueFunnel;
import org.wikipedia.editing.EditSectionActivity;
+import org.wikipedia.events.ShowToCEvent;
import org.wikipedia.pageimages.PageImage;
import org.wikipedia.views.ObservableWebView;
import org.wikipedia.PageTitle;
@@ -783,15 +784,27 @@
}
private ToCHandler tocHandler;
- public void toggleToC(boolean show) {
+ public void toggleToC(int action) {
// tocHandler could still be null while the page is loading
if (tocHandler == null) {
return;
}
- if (show) {
- tocHandler.show();
- } else {
- tocHandler.hide();
+ switch (action) {
+ case ShowToCEvent.ACTION_SHOW:
+ tocHandler.show();
+ break;
+ case ShowToCEvent.ACTION_HIDE:
+ tocHandler.hide();
+ break;
+ case ShowToCEvent.ACTION_TOGGLE:
+ if (tocHandler.isVisible()) {
+ tocHandler.hide();
+ } else {
+ tocHandler.show();
+ }
+ break;
+ default:
+ throw new RuntimeException("Unknown action!");
}
}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index 948dde0..e48716f 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -55,7 +55,6 @@
this.tocButton = (ImageView)
quickReturnBar.findViewById(R.id.search_bar_show_toc);
slidingPane.setDrawerListener(new DrawerLayout.SimpleDrawerListener() {
- private float prevTranslateY;
@Override
public void onDrawerOpened(View drawerView) {
@@ -63,8 +62,7 @@
tocButton.setImageResource(R.drawable.toc_expanded);
bridge.sendMessage("requestCurrentSection", new JSONObject());
if (quickReturnBar != null) {
- prevTranslateY =
ViewHelper.getTranslationY(quickReturnBar);
- ViewAnimations.ensureTranslationY(quickReturnBar,
-quickReturnBar.getHeight());
+ ViewAnimations.ensureTranslationY(quickReturnBar, 0);
}
funnel.logOpen();
wasClicked = false;
@@ -74,9 +72,6 @@
public void onDrawerClosed(View drawerView) {
super.onDrawerClosed(drawerView);
tocButton.setImageResource(R.drawable.toc_collapsed);
- if (quickReturnBar != null) {
- ViewAnimations.ensureTranslationY(quickReturnBar, (int)
prevTranslateY);
- }
if (!wasClicked) {
funnel.logClose();
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 9cfd3e8..f8e4c6e 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(true));
+ app.getBus().post(new
ShowToCEvent(ShowToCEvent.ACTION_TOGGLE));
}
});
@@ -335,7 +335,7 @@
if (!hideKeyboardCalled) {
Utils.hideSoftKeyboard(getActivity());
//also make sure ToC is hidden
- app.getBus().post(new ShowToCEvent(false));
+ app.getBus().post(new
ShowToCEvent(ShowToCEvent.ACTION_HIDE));
hideKeyboardCalled = true;
}
// Make sure that the entire search bar is visible
--
To view, visit https://gerrit.wikimedia.org/r/159072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic14fa3c8ddd5de0554b870076d90823bce9c3f46
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
