Save dynamic fab in ScreenParams (#858)

Since fab set dynamically wasn’t saved in screen params, when returning
to that screen the fab wasn't displayed.

This commit also enables setting fab dynamically in modals

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -13,6 +13,7 @@ import com.reactnativenavigation.layouts.ModalScreenLayout;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
 import com.reactnativenavigation.params.AppStyle;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.Orientation;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -47,6 +48,10 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         layout.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
     }
 
+    void setFab(String screenInstanceId, String navigatorEventId, FabParams fab) {
+        layout.setFab(screenInstanceId, navigatorEventId, fab);
+    }
+
     public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
         layout.showContextualMenu(screenInstanceId, params, onButtonClicked);
     }

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -7,6 +7,7 @@ import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ModalDismissedEvent;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
@@ -14,15 +15,15 @@ import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import java.util.List;
 import java.util.Stack;
 
-public class ModalController implements ScreenStackContainer, Modal.OnModalDismissedListener {
+class ModalController implements ScreenStackContainer, Modal.OnModalDismissedListener {
     private final AppCompatActivity activity;
     private Stack<Modal> stack = new Stack<>();
 
-    public ModalController(AppCompatActivity activity) {
+    ModalController(AppCompatActivity activity) {
         this.activity = activity;
     }
 
-    public boolean containsNavigator(String navigatorId) {
+    boolean containsNavigator(String navigatorId) {
         for (Modal modal : stack) {
             if (modal.containsNavigator(navigatorId)) {
                 return true;
@@ -31,26 +32,26 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
         return false;
     }
 
-    public void showModal(ScreenParams screenParams) {
+    void showModal(ScreenParams screenParams) {
         Modal modal = new Modal(activity, this, screenParams);
         modal.show();
         stack.add(modal);
     }
 
-    public void dismissTopModal() {
+    void dismissTopModal() {
         if (isShowing()) {
             stack.pop().dismiss();
         }
     }
 
-    public void dismissAllModals() {
+    void dismissAllModals() {
         for (Modal modal : stack) {
             modal.dismiss();
         }
         stack.clear();
     }
 
-    public boolean isShowing() {
+    boolean isShowing() {
         return !stack.empty();
     }
 
@@ -97,30 +98,36 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
         }
     }
 
-    public void setTitleBarTitle(String screenInstanceId, String title) {
+    void setTitleBarTitle(String screenInstanceId, String title) {
         for (Modal modal : stack) {
             modal.setTitleBarTitle(screenInstanceId, title);
         }
     }
 
-    public void setTitleBarSubtitle(String screenInstanceId, String subtitle) {
+    void setTitleBarSubtitle(String screenInstanceId, String subtitle) {
         for (Modal modal : stack) {
             modal.setTitleBarSubtitle(screenInstanceId, subtitle);
         }
     }
 
-    public void setTitleBarRightButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+    void setTitleBarRightButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
         for (Modal modal : stack) {
             modal.setTitleBarRightButtons(screenInstanceId, navigatorEventId, titleBarButtons);
         }
     }
 
-    public void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButton) {
+    void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButton) {
         for (Modal modal : stack) {
             modal.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
         }
     }
 
+    void setFab(String screenInstanceId, String navigatorEventId, FabParams fab) {
+        for (Modal modal : stack) {
+            modal.setFab(screenInstanceId, navigatorEventId, fab);
+        }
+    }
+
     public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
         for (Modal modal : stack) {
             modal.showContextualMenu(screenInstanceId, params, onButtonClicked);

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -277,6 +277,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     void setScreenFab(String screenInstanceId, String navigatorEventId, FabParams fab) {
         layout.setFab(screenInstanceId, navigatorEventId, fab);
+        modalController.setFab(screenInstanceId, navigatorEventId, fab);
     }
 
     public void toggleSideMenuVisible(boolean animated, Side side) {

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -187,7 +187,7 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
     @Override
     public void setFab(String screenInstanceId, String navigatorEventId, FabParams fabParams) {
         for (int i = 0; i < bottomTabs.getItemsCount(); i++) {
-            screenStacks[i].setFab(screenInstanceId, navigatorEventId, fabParams);
+            screenStacks[i].setFab(screenInstanceId, fabParams);
         }
     }
 

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -192,7 +192,7 @@ public class SingleScreenLayout extends BaseLayout {
 
     @Override
     public void setFab(String screenInstanceId, String navigatorEventId, FabParams fabParams) {
-        stack.setFab(screenInstanceId, navigatorEventId, fabParams);
+        stack.setFab(screenInstanceId, fabParams);
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/params/BaseScreenParams.java

@@ -44,4 +44,8 @@ public class BaseScreenParams {
     public FabParams getFab() {
         return fabParams;
     }
+
+    public void setFab(FabParams params) {
+        fabParams = params;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java

@@ -294,11 +294,11 @@ public class ScreenStack {
         });
     }
 
-    public void setFab(String screenInstanceId, final String navigatorEventId, final FabParams fabParams) {
+    public void setFab(String screenInstanceId, final FabParams fabParams) {
         performOnScreen(screenInstanceId, new Task<Screen>() {
             @Override
-            public void run(Screen param) {
-                param.setFab(fabParams);
+            public void run(Screen screen) {
+                screen.setFab(fabParams);
             }
         });
     }

android/app/src/main/java/com/reactnativenavigation/screens/ViewPagerScreen.java

@@ -6,6 +6,7 @@ import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.params.BaseScreenParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.PageParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.views.ContentView;
@@ -32,6 +33,12 @@ public class ViewPagerScreen extends Screen {
         return screenParams.topTabParams.get(viewPager.getCurrentItem());
     }
 
+    @Override
+    public void setFab(FabParams fabParams) {
+        super.setFab(fabParams);
+        getScreenParams().fabParams = fabParams;
+    }
+
     @Override
     protected void createContent() {
         TopTabs topTabs = topBar.initTabs();