[MediaWiki-commits] [Gerrit] Fix issue with ToC onboarding when visiting subsequent pages. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/202245

Change subject: Fix issue with ToC onboarding when visiting subsequent pages.
......................................................................

Fix issue with ToC onboarding when visiting subsequent pages.

Bug: T95201
Change-Id: I53c354e955745193145ea0caac1ae6b722bb0c1c
---
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
1 file changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/45/202245/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index 2df4878..951468d 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -34,6 +34,7 @@
     private static final int MAX_LEVELS = 3;
     private static final int INDENTATION_WIDTH_DP = 16;
     private static final int READ_MORE_SECTION_ID = -1;
+    private final View knowToCContainer;
     private final ListView tocList;
     private final ProgressBar tocProgress;
     private final CommunicationBridge bridge;
@@ -58,7 +59,7 @@
 
         this.tocList = (ListView) slidingPane.findViewById(R.id.page_toc_list);
         this.tocProgress = (ProgressBar) 
slidingPane.findViewById(R.id.page_toc_in_progress);
-        final View knowToCContainer = 
slidingPane.findViewById(R.id.know_toc_intro_container);
+        knowToCContainer = 
slidingPane.findViewById(R.id.know_toc_intro_container);
 
         bridge.addListener("currentSectionResponse", new 
CommunicationBridge.JSEventListener() {
             @Override
@@ -102,7 +103,7 @@
                 final SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(parentActivity);
                 final boolean knowsToC = 
prefs.getBoolean(PrefKeys.getKnowTocDrawer(), false);
                 if (!knowsToC) {
-                    showToCIntro(prefs, slidingPane, knowToCContainer);
+                    showToCIntro(prefs, slidingPane);
                 }
             }
 
@@ -133,9 +134,9 @@
         });
     }
 
-    private void showToCIntro(final SharedPreferences prefs, 
DisableableDrawerLayout slidingPane, final View knowToCContainer) {
+    private void showToCIntro(final SharedPreferences prefs, 
DisableableDrawerLayout slidingPane) {
         if (openedViaSwipe) {
-            knowSwipe(prefs, 
slidingPane.findViewById(R.id.know_toc_intro_container));
+            knowSwipe(prefs);
         } else {
             final View gotItButton = 
slidingPane.findViewById(R.id.know_toc_drawer_button);
             if (!knowToCContainer.isShown()) {
@@ -149,13 +150,13 @@
             gotItButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    knowSwipe(prefs, knowToCContainer);
+                    knowSwipe(prefs);
                 }
             });
         }
     }
 
-    private void knowSwipe(SharedPreferences prefs, View knowToCContainer) {
+    private void knowSwipe(SharedPreferences prefs) {
         prefs.edit().putBoolean(PrefKeys.getKnowTocDrawer(), true).apply();
         if (knowToCContainer.isShown()) {
             ViewAnimations.crossFade(knowToCContainer, tocList);
@@ -220,6 +221,7 @@
             if (!knowsToC) {
                 openedViaSwipe = false;
                 slidingPane.openDrawer(Gravity.END);
+                showToCIntro(prefs, slidingPane);
             }
         }
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/202245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53c354e955745193145ea0caac1ae6b722bb0c1c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits