Initialize click listeners after presenter / viewmodel is set (#481)

mapbox · Nov 10, 2017 · 3d4de96 · 3d4de96
1 parent c701d44
commit 3d4de96
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 41 deletions.
diff --git a/...igation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java b/...igation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java
@@ -174,6 +174,8 @@ public void onStyleLoaded(String style) {
         initLocationLayer();
         initLifecycleObservers();
         initNavigationPresenter();
+        initClickListeners();
+        initSummaryBottomSheet();
         subscribeViews();
         navigationListener.onNavigationReady();
       }
@@ -292,8 +294,6 @@ private void init() {
     inflate(getContext(), R.layout.navigation_view_layout, this);
     bind();
     initViewModels();
-    initClickListeners();
-    initSummaryBottomSheet();
   }
 
   /**
@@ -317,44 +317,6 @@ private void initViewModels() {
     }
   }
 
-  /**
-   * Sets click listeners to all views that need them.
-   */
-  private void initClickListeners() {
-    cancelBtn.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        navigationPresenter.onCancelBtnClick();
-      }
-    });
-    recenterBtn.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        navigationPresenter.onRecenterClick();
-      }
-    });
-  }
-
-  /**
-   * Initializes the {@link BottomSheetBehavior} for {@link SummaryBottomSheet}.
-   */
-  private void initSummaryBottomSheet() {
-    summaryBehavior = BottomSheetBehavior.from(summaryBottomSheet);
-    summaryBehavior.setHideable(false);
-    summaryBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
-      @Override
-      public void onStateChanged(@NonNull View bottomSheet, int newState) {
-        if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-          navigationPresenter.onSummaryBottomSheetHidden();
-        }
-      }
-
-      @Override
-      public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-      }
-    });
-  }
-
   /**
    * Sets the {@link BottomSheetBehavior} based on the last state stored
    * in {@link Bundle} savedInstanceState.
@@ -414,6 +376,44 @@ private void initNavigationPresenter() {
     navigationPresenter = new NavigationPresenter(this);
   }
 
+  /**
+   * Sets click listeners to all views that need them.
+   */
+  private void initClickListeners() {
+    cancelBtn.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View view) {
+        navigationPresenter.onCancelBtnClick();
+      }
+    });
+    recenterBtn.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View view) {
+        navigationPresenter.onRecenterClick();
+      }
+    });
+  }
+
+  /**
+   * Initializes the {@link BottomSheetBehavior} for {@link SummaryBottomSheet}.
+   */
+  private void initSummaryBottomSheet() {
+    summaryBehavior = BottomSheetBehavior.from(summaryBottomSheet);
+    summaryBehavior.setHideable(false);
+    summaryBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+      @Override
+      public void onStateChanged(@NonNull View bottomSheet, int newState) {
+        if (newState == BottomSheetBehavior.STATE_HIDDEN) {
+          navigationPresenter.onSummaryBottomSheetHidden();
+        }
+      }
+
+      @Override
+      public void onSlide(@NonNull View bottomSheet, float slideOffset) {
+      }
+    });
+  }
+
   /**
    * Initiate observing of ViewModels by Views.
    */

diff --git a/...c/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java b/...c/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
@@ -124,7 +124,6 @@ protected void onFinishInflate() {
     initDirectionsRecyclerView();
     initDecimalFormat();
     initAnimations();
-    initClickListeners();
   }
 
   @Override
@@ -179,6 +178,9 @@ public void onChanged(@Nullable Boolean isOffRoute) {
         }
       }
     });
+
+    // ViewModel set - click listeners can be set now
+    initClickListeners();
   }
 
   /**