[Fix] when reBuldAllRoute re-create ViewAnimator

rh-id · Nov 4, 2021 · 90ae79e · 90ae79e
1 parent 50c25ef
commit 90ae79e
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/navigator/src/main/java/m/co/rh/id/anavigator/Navigator.java b/navigator/src/main/java/m/co/rh/id/anavigator/Navigator.java
@@ -348,9 +348,24 @@ public void reBuildRoute(int routeIndex) {
 
     @Override
     public void reBuildAllRoute() {
-        getViewAnimator().postInvalidate();
-        for (int i = 0; i < mNavRouteStack.size(); i++) {
-            reBuildRoute(i);
+        if (mIsNavigating) {
+            mPendingNavigatorRoute.add(() -> reBuildAllRoute());
+            return;
+        }
+        mIsNavigating = true;
+        ViewAnimator newViewAnimator = createViewAnimator(mActivity, mViewAnimatorId, mNavConfiguration);
+        for (int i = mNavRouteStack.size() - 1; i >= 0; i--) {
+            NavRoute navRoute = mNavRouteStack.get(i);
+            View view = navRoute.getStatefulView().buildView(mActivity, newViewAnimator);
+            newViewAnimator.addView(view);
+        }
+        newViewAnimator.setDisplayedChild(mNavRouteStack.size() - 1);
+        getViewAnimator().removeAllViews();
+        setViewAnimator(mActivity, newViewAnimator);
+        initViewNavigator();
+        mIsNavigating = false;
+        if (!mPendingNavigatorRoute.isEmpty()) {
+            mPendingNavigatorRoute.pop().run();
         }
     }