Initial commit

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

@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ActivityParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
@@ -17,7 +18,7 @@ import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.SideMenu;
-import com.reactnativenavigation.views.SnackbarContainer;
+import com.reactnativenavigation.views.SnackbarAndFabContainer;
 
 import java.util.List;
 
@@ -28,7 +29,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     private final AppCompatActivity activity;
     private ActivityParams params;
-    private SnackbarContainer snackbarContainer;
+    private SnackbarAndFabContainer snackbarAndFabContainer;
     private BottomTabs bottomTabs;
     private ScreenStack[] screenStacks;
     private final SideMenuParams sideMenuParams;
@@ -51,6 +52,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         addScreenStacks();
         createSnackbarContainer();
         showInitialScreenStack();
+        showFab();
     }
 
     private void createSideMenu() {
@@ -100,17 +102,23 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void createSnackbarContainer() {
-        snackbarContainer = new SnackbarContainer(getContext());
-        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext());
+        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.addRule(ABOVE, bottomTabs.getId());
-        snackbarContainer.setLayoutParams(lp);
-        getScreenStackParent().addView(snackbarContainer);
+        getScreenStackParent().addView(snackbarAndFabContainer, lp);
     }
 
     private void showInitialScreenStack() {
         showStackAndUpdateStyle(screenStacks[0]);
     }
 
+    private void showFab() {
+        FabParams fabParams = getCurrentScreenStack().peek().getFabParams();
+        if (fabParams != null) {
+            snackbarAndFabContainer.showFab(fabParams);
+        }
+    }
+
     @Override
     public View asView() {
         return this;
@@ -187,7 +195,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     @Override
     public void showSnackbar(SnackbarParams params) {
         final String eventId = getCurrentScreenStack().peek().getNavigatorEventId();
-        snackbarContainer.showSnackbar(eventId, params);
+        snackbarAndFabContainer.showSnackbar(eventId, params);
     }
 
     public void selectBottomTabByTabIndex(Integer index) {
@@ -205,7 +213,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         if (isCurrentStack(screenStack)) {
             bottomTabs.setStyleFromScreen(screenParams.styleParams);
         }
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
@@ -216,14 +224,14 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
                 setBottomTabsStyleFromCurrentScreen();
             }
         });
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
     public void popToRoot(ScreenParams params) {
         getCurrentScreenStack().popToRoot(params.animateScreenTransitions);
         setBottomTabsStyleFromCurrentScreen();
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
@@ -238,12 +246,12 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         screenStacks[currentStackIndex] = newStack;
 
         bottomTabs.setStyleFromScreen(params.styleParams);
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
     public void destroy() {
-        snackbarContainer.destroy();
+        snackbarAndFabContainer.destroy();
         for (ScreenStack screenStack : screenStacks) {
             screenStack.destroy();
         }
@@ -256,7 +264,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     public boolean onTabSelected(int position, boolean wasSelected) {
         hideCurrentStack();
         showNewStack(position);
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
         return true;
     }
 

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

@@ -14,7 +14,7 @@ import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.SideMenu;
-import com.reactnativenavigation.views.SnackbarContainer;
+import com.reactnativenavigation.views.SnackbarAndFabContainer;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     protected final ScreenParams screenParams;
     private final SideMenuParams sideMenuParams;
     protected ScreenStack stack;
-    private SnackbarContainer snackbarContainer;
+    private SnackbarAndFabContainer snackbarAndFabContainer;
     protected LeftButtonOnClickListener leftButtonOnClickListener;
     private @Nullable SideMenu sideMenu;
 
@@ -75,11 +75,11 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     }
 
     private void createSnackbarContainer() {
-        snackbarContainer = new SnackbarContainer(getContext());
+        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext());
         RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, WRAP_CONTENT);
         lp.addRule(ALIGN_PARENT_BOTTOM);
-        snackbarContainer.setLayoutParams(lp);
-        getScreenStackParent().addView(snackbarContainer);
+        snackbarAndFabContainer.setLayoutParams(lp);
+        getScreenStackParent().addView(snackbarAndFabContainer);
     }
 
     @Override
@@ -99,7 +99,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     @Override
     public void destroy() {
         stack.destroy();
-        snackbarContainer.destroy();
+        snackbarAndFabContainer.destroy();
         if (sideMenu != null) {
             sideMenu.destroy();
         }
@@ -109,26 +109,26 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     public void push(ScreenParams params) {
         LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         stack.push(params, lp);
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
     public void pop(ScreenParams params) {
         stack.pop(params.animateScreenTransitions);
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
     public void popToRoot(ScreenParams params) {
         stack.popToRoot(params.animateScreenTransitions);
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
     public void newStack(ScreenParams params) {
         RelativeLayout parent = sideMenu == null ? this : sideMenu.getContentContainer();
         createStack(parent);
-        snackbarContainer.onScreenChange();
+        snackbarAndFabContainer.onScreenChange();
     }
 
     @Override
@@ -179,7 +179,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     @Override
     public void showSnackbar(SnackbarParams params) {
         final String navigatorEventId = stack.peek().getNavigatorEventId();
-        snackbarContainer.showSnackbar(navigatorEventId, params);
+        snackbarAndFabContainer.showSnackbar(navigatorEventId, params);
     }
 
     @Override

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

@@ -0,0 +1,8 @@
+package com.reactnativenavigation.params;
+
+import android.graphics.drawable.Drawable;
+
+public class FabActionParams {
+    public String id;
+    public Drawable icon;
+}

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

@@ -0,0 +1,13 @@
+package com.reactnativenavigation.params;
+
+import android.graphics.drawable.Drawable;
+
+import java.util.List;
+
+public class FabParams {
+    public Drawable collapsedIcon;
+    public Drawable expendedIcon;
+    public StyleParams.Color backgroundColor;
+    public String id;
+    public List<FabActionParams> actions;
+}

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

@@ -16,7 +16,7 @@ public class ScreenParams {
     public String fragmentCreatorClassName;
     public Bundle fragmentCreatorPassProps;
     public boolean animateScreenTransitions;
-
+    public FabParams fabParams;
     public String tabLabel;
     public Drawable tabIcon;
 

android/app/src/main/java/com/reactnativenavigation/params/parsers/FabActionParamsParser.java

@@ -0,0 +1,15 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.reactnativenavigation.params.FabActionParams;
+import com.reactnativenavigation.react.ImageLoader;
+
+public class FabActionParamsParser extends Parser {
+    public FabActionParams parse(Bundle params) {
+        FabActionParams fabActionParams = new FabActionParams();
+        fabActionParams.id = params.getString("id");
+        fabActionParams.icon = ImageLoader.loadImage(params.getString("icon"));
+        return fabActionParams;
+    }
+}

android/app/src/main/java/com/reactnativenavigation/params/parsers/FabParamsParser.java

@@ -0,0 +1,33 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.reactnativenavigation.params.FabActionParams;
+import com.reactnativenavigation.params.FabParams;
+import com.reactnativenavigation.params.StyleParams;
+import com.reactnativenavigation.react.ImageLoader;
+
+public class FabParamsParser extends Parser {
+    public FabParams parse(Bundle params) {
+        FabParams fabParams = new FabParams();
+        fabParams.id = params.getString("id");
+        fabParams.backgroundColor = getColor(params, "backgroundColor", new StyleParams.Color());
+
+        if (hasKey(params, "collapsedIcon")) {
+            fabParams.collapsedIcon = ImageLoader.loadImage(params.getString("collapsedIcon"));
+        }
+        if (hasKey(params, "expendedIcon")) {
+            fabParams.expendedIcon = ImageLoader.loadImage(params.getString("expendedIcon"));
+        }
+        if (hasKey(params, "actions")) {
+            fabParams.actions = parseBundle(params.getBundle("actions"), new ParseStrategy<FabActionParams>() {
+                @Override
+                public FabActionParams parse(Bundle params) {
+                    return new FabActionParamsParser().parse(params);
+                }
+            });
+        }
+
+        return fabParams;
+    }
+}

android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation.params.parsers;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -18,6 +19,7 @@ public class ScreenParamsParser extends Parser {
     private static final String KEY_NAVIGATION_PARAMS = "navigationParams";
     private static final String KEY_RIGHT_BUTTONS = "rightButtons";
     private static final String KEY_LEFT_BUTTON = "leftButton";
+    private static final String KEY_FAB = "fab";
     private static final String KEY_BACK_BUTTON_HIDDEN = "backButtonHidden";
     private static final String STYLE_PARAMS = "styleParams";
     private static final String TOP_TABS = "topTabs";
@@ -46,6 +48,8 @@ public class ScreenParamsParser extends Parser {
             result.fragmentCreatorPassProps = params.getBundle(FRAGMENT_CREATOR_PASS_PROPS);
         }
 
+        result.fabParams = parseFab(params);
+
         result.tabLabel = getTabLabel(params);
         result.tabIcon = getTabIcon(params);
 
@@ -99,6 +103,14 @@ public class ScreenParamsParser extends Parser {
         return leftButton;
     }
 
+    private static FabParams parseFab(Bundle params) {
+        FabParams fabParams = null;
+        if (hasKey(params, KEY_FAB)) {
+            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB));
+        }
+        return fabParams;
+    }
+
     public List<ScreenParams> parseTabs(Bundle params) {
         return parseBundle(params, new ParseStrategy<ScreenParams>() {
             @Override

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

@@ -9,6 +9,7 @@ import android.view.Window;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.animation.VisibilityAnimator;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -136,6 +137,10 @@ public abstract class Screen extends RelativeLayout {
         return screenParams.getNavigatorEventId();
     }
 
+    public FabParams getFabParams() {
+        return screenParams.fabParams;
+    }
+
     public void setTopBarVisible(boolean visible, boolean animate) {
         topBarVisibilityAnimator.setVisible(visible, animate);
     }

android/app/src/main/java/com/reactnativenavigation/views/SnackbarContainer.java → android/app/src/main/java/com/reactnativenavigation/views/SnackbarAndFabContainer.java

@@ -1,17 +1,23 @@
 package com.reactnativenavigation.views;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.FloatingActionButton;
+import android.view.Gravity;
+import android.view.ViewGroup;
 
 import com.reactnativenavigation.events.ScreenChangeBroadcastReceiver;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
+import com.reactnativenavigation.utils.ViewUtils;
 
-public class SnackbarContainer extends CoordinatorLayout implements Snakbar.OnDismissListener, ScreenChangeBroadcastReceiver.OnScreenChangeListener {
-
+public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakbar.OnDismissListener, ScreenChangeBroadcastReceiver.OnScreenChangeListener {
+    private static final String TAG = "SnackbarAndFabContainer";
     private Snakbar snakbar;
     private ScreenChangeBroadcastReceiver screenChangeBroadcastReceiver;
 
-    public SnackbarContainer(Context context) {
+    public SnackbarAndFabContainer(Context context) {
         super(context);
         registerTabSelectedReceiver();
     }
@@ -46,4 +52,13 @@ public class SnackbarContainer extends CoordinatorLayout implements Snakbar.OnDi
     public void onScreenChangeListener() {
         onScreenChange();
     }
+
+    public void showFab(@NonNull FabParams fabParams) {
+        FloatingActionButton fab = new FloatingActionButton(getContext());
+        CoordinatorLayout.LayoutParams lp = new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        lp.gravity = Gravity.RIGHT | Gravity.BOTTOM;
+        int margin = (int) ViewUtils.convertDpToPixel(16);
+        lp.setMargins(0, 0, margin, margin);
+        addView(fab, lp);
+    }
 }

android/app/src/main/java/com/reactnativenavigation/views/Snakbar.java

@@ -16,6 +16,18 @@ public class Snakbar {
         void onDismiss();
     }
 
+    public void show() {
+        snackbar.show();
+    }
+
+    public void dismiss() {
+        snackbar.dismiss();
+    }
+
+    public View getView() {
+        return snackbar.getView();
+    }
+
     public Snakbar(OnDismissListener parent, String navigatorEventId, SnackbarParams params) {
         this.parent = parent;
         this.navigatorEventId = navigatorEventId;
@@ -60,12 +72,4 @@ public class Snakbar {
             }
         });
     }
-
-    public void show() {
-        snackbar.show();
-    }
-
-    public void dismiss() {
-        snackbar.dismiss();
-    }
 }

src/deprecated/platformSpecificDeprecated.android.js

@@ -357,6 +357,11 @@ function addNavigatorButtons(screen, sideMenuParams) {
     }
   }
 
+  const fab = getFab(screen);
+  if (fab) {
+    screen.fab = fab;
+  }
+
   if (rightButtons) {
     screen.rightButtons = rightButtons;
   }
@@ -365,6 +370,24 @@ function addNavigatorButtons(screen, sideMenuParams) {
   }
 }
 
+function getFab(screen) {
+  if (screen.fab) {
+    const fab = screen.fab;
+    debugger;
+    fab.collapsedIcon = resolveAssetSource(fab.collapsedIcon).uri;
+    fab.expendedIcon = resolveAssetSource(fab.expendedIcon).uri;
+
+    if (fab.actions) {
+      _.forEach(fab.actions, (action) => {
+        action.icon = resolveAssetSource(action.icon).uri;
+        return action;
+      })
+    }
+
+    return fab;
+  }
+}
+
 function createSideMenuButton() {
   return {
     id: "sideMenu"