Fix right buttons not getting applied after push and pop (#5353)

lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackPresenter.java

@@ -23,6 +23,7 @@ import com.reactnativenavigation.parse.TopTabsOptions;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.utils.ButtonPresenter;
+import com.reactnativenavigation.utils.CollectionUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ObjectUtils;
 import com.reactnativenavigation.utils.UiUtils;
@@ -69,6 +70,7 @@ public class StackPresenter {
     private Map<Component, TopBarBackgroundViewController> backgroundControllers = new HashMap();
     private Map<Component, Map<String, TitleBarButtonController>> componentRightButtons = new HashMap();
     private Map<Component, Map<String, TitleBarButtonController>> componentLeftButtons = new HashMap();
+    private List<TitleBarButtonController> currentRightButtons = new ArrayList<>();
 
     public StackPresenter(Activity activity,
                           TitleBarReactViewCreator titleViewCreator,
@@ -278,8 +280,12 @@ public class StackPresenter {
         if (rightButtons != null) {
             List<TitleBarButtonController> rightButtonControllers = getOrCreateButtonControllers(componentRightButtons.get(child), rightButtons);
             componentRightButtons.put(child, keyBy(rightButtonControllers, TitleBarButtonController::getButtonInstanceId));
-            topBar.setRightButtons(rightButtonControllers);
+            if (!CollectionUtils.equals(currentRightButtons, rightButtonControllers)) {
+                currentRightButtons = rightButtonControllers;
+                topBar.setRightButtons(rightButtonControllers);
+            }
         } else {
+            currentRightButtons = null;
             topBar.clearRightButtons();
         }
 
@@ -370,7 +376,12 @@ public class StackPresenter {
             if (previousLeftButtons != null) forEach(previousLeftButtons.values(), TitleBarButtonController::destroy);
         }
 
-        if (buttons.right != null) topBar.setRightButtons(rightButtonControllers);
+        if (buttons.right != null) {
+            if (!CollectionUtils.equals(currentRightButtons, rightButtonControllers)) {
+                currentRightButtons = rightButtonControllers;
+                topBar.setRightButtons(rightButtonControllers);
+            }
+        }
         if (buttons.left != null) topBar.setLeftButtons(leftButtonControllers);
         if (buttons.back.hasValue()) topBar.setBackButton(createButtonController(buttons.back));
 

lib/android/app/src/main/java/com/reactnativenavigation/views/topbar/TopBar.java

@@ -28,7 +28,6 @@ import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Number;
-import com.reactnativenavigation.utils.CollectionUtils;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.TitleBarButtonController;
@@ -36,7 +35,6 @@ import com.reactnativenavigation.views.StackLayout;
 import com.reactnativenavigation.views.titlebar.TitleBar;
 import com.reactnativenavigation.views.toptabs.TopTabs;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -53,7 +51,6 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     private View border;
     private View component;
     private float elevation = -1;
-    private List<TitleBarButtonController> rightButtons = new ArrayList<>();
 
     public TopBar(final Context context, StackLayout parentView) {
         super(context);
@@ -220,8 +217,6 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     }
 
     public void setRightButtons(List<TitleBarButtonController> rightButtons) {
-        if (CollectionUtils.equals(this.rightButtons, rightButtons)) return;
-        this.rightButtons = rightButtons;
         titleBar.setRightButtons(rightButtons);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackPresenterTest.java

@@ -178,7 +178,9 @@ public class StackPresenterTest extends BaseTest {
         verify(topBar, times(0)).setLeftButtons(any());
 
         Options options = new Options();
-        options.topBar.buttons.right = new ArrayList<>();
+        Button button = new Button();
+        button.text = new Text("btn");
+        options.topBar.buttons.right = new ArrayList<>(Collections.singleton(button));
         uut.mergeChildOptions(options, EMPTY_OPTIONS, child);
         verify(topBar, times(1)).setRightButtons(any());