Fab gravity (#2926)

* WIP

* Apply default options when screen options are null

* modal animations

* fix tests

* refactor

* refactor

* refactor

* refactor

* test fix

* topBar anim

* child disappear bug

* Update app.js

* Update WelcomeScreen.js

* fix tests

* bottom tabs

* stack id

* fix test

* refactoring

* merge fix

* Update app.js

* merge

* comment to fix test

* merge options

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

@@ -34,13 +34,13 @@ public class FabOptionsPresenter {
 
         if (options.id.hasValue()) {
             if (fabMenu != null && fabMenu.getFabId().equals(options.id.get())) {
-                setParams(fabMenu, options);
                 fabMenu.bringToFront();
                 applyFabMenuOptions(fabMenu, options);
+                setParams(fabMenu, options);
             } else if (fab != null && fab.getFabId().equals(options.id.get())) {
-                setParams(fab, options);
                 fab.bringToFront();
                 applyFabOptions(fab, options);
+                setParams(fab, options);
                 fab.setOnClickListener(v -> component.sendOnNavigationButtonPressed(options.id.get()));
             } else {
                 createFab(options);
@@ -51,6 +51,26 @@ public class FabOptionsPresenter {
         }
     }
 
+    public void mergeOptions(FabOptions options, @NonNull ReactComponent component, @NonNull ViewGroup viewGroup) {
+        this.viewGroup = viewGroup;
+        this.component = component;
+
+        if (options.id.hasValue()) {
+            if (fabMenu != null && fabMenu.getFabId().equals(options.id.get())) {
+                mergeParams(fabMenu, options);
+                fabMenu.bringToFront();
+                mergeFabMenuOptions(fabMenu, options);
+            } else if (fab != null && fab.getFabId().equals(options.id.get())) {
+                mergeParams(fab, options);
+                fab.bringToFront();
+                mergeFabOptions(fab, options);
+                fab.setOnClickListener(v -> component.sendOnNavigationButtonPressed(options.id.get()));
+            } else {
+                createFab(options);
+            }
+        }
+    }
+
     private void createFab(FabOptions options) {
         if (options.actionsArray.size() > 0) {
             fabMenu = new FabMenu(viewGroup.getContext(), options.id.get());
@@ -151,6 +171,73 @@ public class FabOptionsPresenter {
         fab.setLayoutParams(layoutParams);
     }
 
+    private void mergeParams(View fab, FabOptions options) {
+        ViewGroup.LayoutParams layoutParams = fab.getLayoutParams();
+        if (viewGroup instanceof RelativeLayout) {
+            RelativeLayout.LayoutParams layoutParamsRelative = (RelativeLayout.LayoutParams) fab.getLayoutParams();
+            if (layoutParamsRelative == null) {
+                layoutParamsRelative = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                layoutParamsRelative.bottomMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+                layoutParamsRelative.rightMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+                layoutParamsRelative.leftMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+                layoutParamsRelative.topMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+            }
+            if (options.alignHorizontally.hasValue()) {
+                if ("right".equals(options.alignHorizontally.get())) {
+                    layoutParamsRelative.removeRule(ALIGN_PARENT_LEFT);
+                    layoutParamsRelative.addRule(ALIGN_PARENT_RIGHT);
+                }
+                if ("left".equals(options.alignHorizontally.get())) {
+                    layoutParamsRelative.removeRule(ALIGN_PARENT_RIGHT);
+                    layoutParamsRelative.addRule(ALIGN_PARENT_LEFT);
+                }
+            }
+            if (options.alignVertically.hasValue()) {
+                if ("top".equals(options.alignVertically.get())) {
+                    layoutParamsRelative.removeRule(ALIGN_PARENT_BOTTOM);
+                    layoutParamsRelative.addRule(ALIGN_PARENT_TOP);
+                }
+                if ("bottom".equals(options.alignVertically.get())) {
+                    layoutParamsRelative.removeRule(ALIGN_PARENT_TOP);
+                    layoutParamsRelative.addRule(ALIGN_PARENT_BOTTOM);
+                }
+            }
+            layoutParams = layoutParamsRelative;
+        }
+        if (viewGroup instanceof FrameLayout) {
+            FrameLayout.LayoutParams layoutParamsFrame = (FrameLayout.LayoutParams) fab.getLayoutParams();
+            if (layoutParamsFrame == null) {
+                layoutParamsFrame = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                layoutParamsFrame.bottomMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+                layoutParamsFrame.rightMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+                layoutParamsFrame.leftMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+                layoutParamsFrame.topMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
+            }
+            if (options.alignHorizontally.hasValue()) {
+                if ("right".equals(options.alignHorizontally.get())) {
+                    removeGravityParam(layoutParamsFrame, Gravity.LEFT);
+                    setGravityParam(layoutParamsFrame, Gravity.RIGHT);
+                }
+                if ("left".equals(options.alignHorizontally.get())) {
+                    removeGravityParam(layoutParamsFrame, Gravity.RIGHT);
+                    setGravityParam(layoutParamsFrame, Gravity.LEFT);
+                }
+            }
+            if (options.alignVertically.hasValue()) {
+                if ("top".equals(options.alignVertically.get())) {
+                    removeGravityParam(layoutParamsFrame, Gravity.BOTTOM);
+                    setGravityParam(layoutParamsFrame, Gravity.TOP);
+                }
+                if ("bottom".equals(options.alignVertically.get())) {
+                    removeGravityParam(layoutParamsFrame, Gravity.TOP);
+                    setGravityParam(layoutParamsFrame, Gravity.BOTTOM);
+                }
+            }
+            layoutParams = layoutParamsFrame;
+        }
+        fab.setLayoutParams(layoutParams);
+    }
+
     private void applyFabOptions(Fab fab, FabOptions options) {
         if (options.visible.isTrueOrUndefined()) {
             fab.show(true);
@@ -181,6 +268,36 @@ public class FabOptionsPresenter {
         }
     }
 
+    private void mergeFabOptions(Fab fab, FabOptions options) {
+        if (options.visible.isTrue()) {
+            fab.show(true);
+        }
+        if (options.visible.isFalse()) {
+            fab.hide(true);
+        }
+        if (options.backgroundColor.hasValue()) {
+            fab.setColorNormal(options.backgroundColor.get());
+        }
+        if (options.clickColor.hasValue()) {
+            fab.setColorPressed(options.clickColor.get());
+        }
+        if (options.rippleColor.hasValue()) {
+            fab.setColorRipple(options.rippleColor.get());
+        }
+        if (options.icon.hasValue()) {
+            fab.applyIcon(options.icon.get());
+        }
+        if (options.size.hasValue()) {
+            fab.setButtonSize("mini".equals(options.size.get()) ? SIZE_MINI : SIZE_NORMAL);
+        }
+        if (options.hideOnScroll.isTrue()) {
+            fab.enableCollapse(component.getScrollEventListener());
+        }
+        if (options.hideOnScroll.isFalse()) {
+            fab.disableCollapse();
+        }
+    }
+
     private void applyFabMenuOptions(FabMenu fabMenu, FabOptions options) {
         if (options.visible.isTrueOrUndefined()) {
             fabMenu.showMenuButton(true);
@@ -218,6 +335,45 @@ public class FabOptionsPresenter {
         }
     }
 
+    private void mergeFabMenuOptions(FabMenu fabMenu, FabOptions options) {
+        if (options.visible.isTrue()) {
+            fabMenu.showMenuButton(true);
+        }
+        if (options.visible.isFalse()) {
+            fabMenu.hideMenuButton(true);
+        }
+
+        if (options.backgroundColor.hasValue()) {
+            fabMenu.setMenuButtonColorNormal(options.backgroundColor.get());
+        }
+        if (options.clickColor.hasValue()) {
+            fabMenu.setMenuButtonColorPressed(options.clickColor.get());
+        }
+        if (options.rippleColor.hasValue()) {
+            fabMenu.setMenuButtonColorRipple(options.rippleColor.get());
+        }
+        if (options.actionsArray.size() > 0) {
+            for (Fab fabStored : fabMenu.getActions()) {
+                fabMenu.removeMenuButton(fabStored);
+            }
+            fabMenu.getActions().clear();
+            for (FabOptions fabOption : options.actionsArray) {
+                Fab fab = new Fab(viewGroup.getContext(), fabOption.id.get());
+                applyFabOptions(fab, fabOption);
+                fab.setOnClickListener(v -> component.sendOnNavigationButtonPressed(options.id.get()));
+
+                fabMenu.getActions().add(fab);
+                fabMenu.addMenuButton(fab);
+            }
+        }
+        if (options.hideOnScroll.isTrue()) {
+            fabMenu.enableCollapse(component.getScrollEventListener());
+        }
+        if (options.hideOnScroll.isFalse()) {
+            fabMenu.disableCollapse();
+        }
+    }
+
     private void setGravityParam(FrameLayout.LayoutParams params, int gravityParam) {
         params.gravity = params.gravity | gravityParam;
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -66,7 +66,7 @@ public class StackController extends ParentController<StackLayout> {
         getView().mergeChildOptions(options, child);
         animator.mergeOptions(options.animationsOptions);
         if (options.fabOptions.hasValue() && child instanceof ReactComponent) {
-            fabOptionsPresenter.applyOptions(options.fabOptions, (ReactComponent) child, getView());
+            fabOptionsPresenter.mergeOptions(options.fabOptions, (ReactComponent) child, getView());
         }
         applyOnParentController(parentController ->
                 ((ParentController) parentController).mergeChildOptions(