merged from master

android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java

@@ -464,4 +464,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
                 break;
         }
     }
+
+    public void showFAB(ReadableMap params) {
+    }
 }

android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java

@@ -4,9 +4,8 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.view.Menu;
+import android.support.design.widget.CoordinatorLayout;
 import android.view.View;
-import android.widget.FrameLayout;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
@@ -38,7 +37,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     private static boolean DEFAULT_TAB_INACTIVE_TITLES = true;
 
     private AHBottomNavigation mBottomNavigation;
-    private FrameLayout mContentFrame;
+    private CoordinatorLayout mContentFrame;
     private ArrayList<ScreenStack> mScreenStacks;
     private int mCurrentStackPosition = -1;
 
@@ -50,7 +49,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         setContentView(R.layout.bottom_tab_activity);
         mToolbar = (RnnToolBar) findViewById(R.id.toolbar);
         mBottomNavigation = (AHBottomNavigation) findViewById(R.id.bottom_tab_bar);
-        mContentFrame = (FrameLayout) findViewById(R.id.contentFrame);
+        mContentFrame = (CoordinatorLayout) findViewById(R.id.contentFrame);
 
         final ArrayList<Screen> screens = (ArrayList<Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
         final Drawer drawer = (Drawer) getIntent().getSerializableExtra(DRAWER_PARAMS);

android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java

@@ -1,7 +1,8 @@
 package com.reactnativenavigation.activities;
 
-import android.widget.FrameLayout;
+import android.support.design.widget.CoordinatorLayout;
 
+import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.core.RctManager;
 import com.reactnativenavigation.core.objects.Drawer;
@@ -34,7 +35,7 @@ public class SingleScreenActivity extends BaseReactActivity {
         setupDrawer(screen, drawer, R.id.drawerFrame, R.id.drawerLayout);
 
         mScreenStack = new ScreenStack(this);
-        FrameLayout contentFrame = (FrameLayout) findViewById(R.id.contentFrame);
+        CoordinatorLayout contentFrame = (CoordinatorLayout) findViewById(R.id.contentFrame);
         assert contentFrame != null;
         contentFrame.addView(mScreenStack);
         mScreenStack.push(screen);
@@ -107,4 +108,18 @@ public class SingleScreenActivity extends BaseReactActivity {
     protected void removeAllReactViews() {
         mScreenStack.removeAllReactViews();
     }
+
+    @Override
+    public void showFAB(ReadableMap params) {
+//        FloatingActionButton fab = new FloatingActionButton(this);
+//        fab.setImageDrawable(IconUtils.getIcon(this, params.getString("icon")));
+//        fab.setBackgroundColor(Color.parseColor(params.getString("backgroundColor")));
+//        fab.setImageResource(R.drawable.notification_background);
+//        CoordinatorLayout content = (CoordinatorLayout) findViewById(R.id.contentFrame);
+//        CoordinatorLayout.LayoutParams layoutParams = new CoordinatorLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
+//        layoutParams.gravity = Gravity.BOTTOM | Gravity.END;
+//        int m = (int) ImageUtils.convertDpToPixel(16, this);
+//        layoutParams.setMargins(m, m, m, m);
+//        content.addView(fab, layoutParams);
+    }
 }

android/app/src/main/java/com/reactnativenavigation/modal/RnnModal.java

@@ -97,6 +97,7 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
 
     @Override
     public void onDismiss(DialogInterface dialog) {
+        mScreenStack.removeAllReactViews();
         ModalController.getInstance().remove();
         // After modal is dismissed, update Toolbar with screen from parent activity or previously displayed modal
         BaseReactActivity context = ContextProvider.getActivityContext();

android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java

@@ -55,7 +55,7 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
 
             context.startActivity(intent);
             //TODO add abstract isRoot() instead of instanceof?
-            if(ContextProvider.getActivityContext() instanceof RootActivity) {
+            if (ContextProvider.getActivityContext() instanceof RootActivity) {
                 context.overridePendingTransition(0, 0);
             }
 
@@ -66,7 +66,7 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
 
     private ArrayList<Screen> createScreens(ReadableArray screens) {
         ArrayList<Screen> ret = new ArrayList<>();
-        for(int i = 0; i < screens.size(); i++) {
+        for (int i = 0; i < screens.size(); i++) {
             ret.add(new Screen(screens.getMap(i)));
         }
         return ret;
@@ -87,7 +87,7 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
             intent.putExtras(extras);
 
             context.startActivity(intent);
-            if(ContextProvider.getActivityContext() instanceof RootActivity) {
+            if (ContextProvider.getActivityContext() instanceof RootActivity) {
                 context.overridePendingTransition(0, 0);
             }
 
@@ -306,15 +306,15 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
     public void dismissAllModals(final ReadableMap params) {
         final BaseReactActivity context = ContextProvider.getActivityContext();
         if (context != null && !context.isFinishing()) {
-        context.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                ModalController modalController = ModalController.getInstance();
-                if (modalController.isModalDisplayed()) {
-                    modalController.dismissAllModals();
+            context.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    ModalController modalController = ModalController.getInstance();
+                    if (modalController.isModalDisplayed()) {
+                        modalController.dismissAllModals();
+                    }
                 }
-            }
-        });
+            });
         }
     }
 
@@ -328,4 +328,19 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
             modalController.dismissModal();
         }
     }
+
+    @ReactMethod
+    public void showFAB(final ReadableMap params) {
+        final BaseReactActivity context = ContextProvider.getActivityContext();
+        if (context == null || context.isFinishing()) {
+            return;
+        }
+        context.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                context.showFAB(params);
+            }
+        });
+    }
+
 }

android/app/src/main/java/com/reactnativenavigation/utils/ImageUtils.java

@@ -1,11 +1,9 @@
 package com.reactnativenavigation.utils;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
-import android.util.DisplayMetrics;
 
 /**
  * Created by guyc on 23/04/16.
@@ -19,14 +17,12 @@ public class ImageUtils {
     /**
      * This method converts dp unit to equivalent pixels, depending on device density.
      *
-     * @param dp A value in dp (density independent pixels) unit. Which we need to convert into pixels
+     * @param dp      A value in dp (density independent pixels) unit. Which we need to convert into pixels
      * @param context Context to get resources and device specific display metrics
      * @return A float value to represent px equivalent to dp depending on device density
      */
-    public static float convertDpToPixel(float dp, Context context){
-        Resources resources = context.getResources();
-        DisplayMetrics metrics = resources.getDisplayMetrics();
-        float px = dp * ((float)metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT);
-        return px;
+    public static float convertDpToPixel(float dp, Context context) {
+        float scale = context.getResources().getDisplayMetrics().density;
+        return dp * scale + 0.5f;
     }
 }

android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -0,0 +1,21 @@
+package com.reactnativenavigation.utils;
+
+import android.view.View;
+import android.view.ViewTreeObserver;
+
+public class ViewUtils {
+    public static void runOnPreDraw(final View view, final Runnable task) {
+        view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                if (!view.getViewTreeObserver().isAlive()) {
+                    return true;
+                }
+                view.getViewTreeObserver().removeOnPreDrawListener(this);
+                task.run();
+                return true;
+            }
+        });
+    }
+}
+

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

@@ -2,9 +2,9 @@ package com.reactnativenavigation.views;
 
 import android.animation.LayoutTransition;
 import android.content.Context;
+import android.support.design.widget.CoordinatorLayout;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
 
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.activities.BaseReactActivity;
@@ -15,7 +15,7 @@ import java.util.Stack;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
-public class ScreenStack extends FrameLayout {
+public class ScreenStack extends android.support.design.widget.CoordinatorLayout {
 
     private static final int DISAPPEAR_ANIMATION_DELAY = 200;
 
@@ -163,7 +163,7 @@ public class ScreenStack extends FrameLayout {
     public void addToScreen(ViewGroup parent) {
         mStack.peek().view.onReAddToScreen();
 
-        parent.addView(this, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        parent.addView(this, new CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 
     public void removeAllReactViews() {

android/app/src/main/res/layout/bottom_tab_activity.xml

@@ -27,7 +27,7 @@
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <FrameLayout
+        <android.support.design.widget.CoordinatorLayout
             android:id="@+id/contentFrame"
             android:layout_width="match_parent"
             android:layout_height="0dp"

android/app/src/main/res/layout/single_screen_activity.xml

@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
+        <android.support.design.widget.CoordinatorLayout
             android:id="@+id/contentFrame"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

example-redux/src/screens/LoginScreen.js

@@ -6,7 +6,7 @@ import {
   TouchableOpacity,
   StyleSheet
 } from 'react-native';
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import * as counterActions from '../reducers/counter/actions';
 import * as appActions from '../reducers/app/actions';
 
@@ -23,6 +23,10 @@ class LoginScreen extends Component {
     super(props);
   }
 
+  componentWillUnmount() {
+    console.log('Component-Lifecycle', 'componentWillUnmount', 'LoginScreen');
+  }
+
   render() {
     return (
       <View style={{flex: 1, padding: 20}}>
@@ -39,6 +43,10 @@ class LoginScreen extends Component {
           <Text style={styles.button}>Login</Text>
         </TouchableOpacity>
 
+        <TouchableOpacity onPress={ this.onShowModalPress.bind(this) }>
+          <Text style={styles.button}>Show another login as modal</Text>
+        </TouchableOpacity>
+
         <Text style={{fontWeight: '500'}}>String prop: {this.props.str}</Text>
         <Text style={{fontWeight: '500'}}>Number prop: {this.props.num}</Text>
         <Text style={{fontWeight: '500'}}>Object prop: {this.props.obj.str}</Text>
@@ -48,12 +56,42 @@ class LoginScreen extends Component {
       </View>
     );
   }
+
   onIncrementPress() {
     this.props.dispatch(counterActions.increment());
   }
+
   onLoginPress() {
     this.props.dispatch(appActions.login());
   }
+
+  onShowModalPress() {
+    this.props.navigator.showModal({
+      screen: 'example.LoginScreen',
+      title: 'Login',
+      passProps: {
+        str: 'This is a prop passed in \'startSingleScreenApp()\'!',
+        obj: {
+          str: 'This is a prop passed in an object!',
+          arr: [
+            {
+              str: 'This is a prop in an object in an array in an object!'
+            }
+          ],
+          arr2: [
+            [
+              'array of strings',
+              'with two strings'
+            ],
+            [
+              1, 2, 3
+            ]
+          ]
+        },
+        num: 1234
+      }
+    });
+  }
 }
 
 const styles = StyleSheet.create({
@@ -61,13 +99,13 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontSize: 18,
     marginBottom: 10,
-    marginTop:10,
+    marginTop: 10,
   },
   button: {
     textAlign: 'center',
     fontSize: 18,
     marginBottom: 10,
-    marginTop:10,
+    marginTop: 10,
     color: 'blue'
   }
 });

src/Screen.js

@@ -93,6 +93,10 @@ class Navigator {
     return platformSpecific.navigatorSwitchToTab(this, params);
   }
 
+  showFAB(params = {}) {
+    return platformSpecific.showFAB(params);
+  }
+
   setOnNavigatorEvent(callback) {
     this.navigatorEventHandler = callback;
     if (!this.navigatorEventSubscription) {
@@ -101,6 +105,7 @@ class Navigator {
       _allNavigatorEventHandlers[this.navigatorEventID] = (event) => this.onNavigatorEvent(event);
     }
   }
+
   handleDeepLink(params = {}) {
     if (!params.link) return;
     const event = {
@@ -129,7 +134,7 @@ class Navigator {
 export default class Screen extends Component {
   static navigatorStyle = {};
   static navigatorButtons = {};
-  
+
   constructor(props) {
     super(props);
     if (props.navigatorID) {

src/platformSpecific.android.js

@@ -197,6 +197,11 @@ function setupDrawer(drawerParams) {
   return drawer;
 }
 
+function showFAB(params) {
+  params.icon = resolveAssetSource(params.icon).uri;
+  RctActivity.showFAB(params);
+}
+
 export default {
   startTabBasedApp,
   startSingleScreenApp,
@@ -207,6 +212,7 @@ export default {
   showModal,
   dismissModal,
   dismissAllModals,
+  showFAB,
   navigatorSetButtons,
   navigatorSetTabBadge,
   navigatorSetTitle,