FragmentScreen

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

@@ -1,8 +1,8 @@
 package com.reactnativenavigation.controllers;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Window;
 
 import com.reactnativenavigation.R;
@@ -13,7 +13,7 @@ import com.reactnativenavigation.params.ScreenParams;
 
 public class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenStackContainer {
 
-    private final Activity activity;
+    private final AppCompatActivity activity;
     private final OnModalDismissedListener onModalDismissedListener;
 
     public interface OnModalDismissedListener {
@@ -23,7 +23,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
     private final ScreenParams screenParams;
     private Layout layout;
 
-    public Modal(Activity activity, OnModalDismissedListener onModalDismissedListener, ScreenParams screenParams) {
+    public Modal(AppCompatActivity activity, OnModalDismissedListener onModalDismissedListener, ScreenParams screenParams) {
         super(activity, R.style.Modal);
         this.activity = activity;
         this.onModalDismissedListener = onModalDismissedListener;
@@ -31,7 +31,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         createContent();
     }
 
-    public Activity getActivity() {
+    public AppCompatActivity getActivity() {
         return activity;
     }
 

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

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.controllers;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.layouts.ScreenStackContainer;
 import com.reactnativenavigation.params.ScreenParams;
@@ -8,10 +8,10 @@ import com.reactnativenavigation.params.ScreenParams;
 import java.util.Stack;
 
 public class ModalController implements ScreenStackContainer, Modal.OnModalDismissedListener {
-    private final Activity activity;
+    private final AppCompatActivity activity;
     private Stack<Modal> stack = new Stack<>();
 
-    public ModalController(Activity activity) {
+    public ModalController(AppCompatActivity activity) {
         this.activity = activity;
     }
 

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

@@ -1,11 +1,11 @@
 package com.reactnativenavigation.layouts;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.params.ActivityParams;
 
 public class LayoutFactory {
-    public static Layout create(Activity activity, ActivityParams params) {
+    public static Layout create(AppCompatActivity activity, ActivityParams params) {
         switch (params.type) {
             case TabBased:
                 return createBottomTabsScreenLayout(activity, params);
@@ -15,7 +15,7 @@ public class LayoutFactory {
         }
     }
 
-    private static Layout createSingleScreenLayout(Activity activity, ActivityParams params) {
+    private static Layout createSingleScreenLayout(AppCompatActivity activity, ActivityParams params) {
         return new SingleScreenLayout(activity, params.screenParams);
     }
 

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

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.layouts;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.FrameLayout;
 
@@ -15,11 +15,13 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 public class SingleScreenLayout extends FrameLayout implements Layout {
 
+    private final AppCompatActivity activity;
     private final ScreenParams screenParams;
     private ScreenStack stack;
 
-    public SingleScreenLayout(Activity activity, ScreenParams screenParams) {
+    public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams) {
         super(activity);
+        this.activity = activity;
         this.screenParams = screenParams;
         createStack();
     }
@@ -29,7 +31,7 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
             stack.destroy();
             removeView(stack);
         }
-        stack = new ScreenStack(getContext(), screenParams);
+        stack = new ScreenStack(activity, screenParams);
         addView(stack, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 

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

@@ -13,6 +13,10 @@ public class ScreenParams {
     public String title;
     public ScreenStyleParams styleParams;
     public List<TopTabParams> topTabParams;
+    public String fragmentCreatorClassName;
+
+    //    public String tabLabel; TODO when tabs are supported move to TabParams
+    //    public Drawable tabIcon;
     public String tabLabel;
     public Drawable tabIcon;
 
@@ -24,4 +28,8 @@ public class ScreenParams {
     public boolean hasTopTabs() {
         return topTabParams != null && !topTabParams.isEmpty();
     }
+
+    public boolean isFragmentScreen() {
+        return fragmentCreatorClassName != null;
+    }
 }

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

@@ -18,7 +18,8 @@ public class ScreenParamsParser extends Parser {
     private static final String KEY_RIGHT_BUTTONS = "rightButtons";
     private static final String KEY_LEFT_BUTTON = "leftButton";
     private static final String STYLE_PARAMS = "styleParams";
-    public static final String TOP_TABS = "topTabs";
+    private static final String TOP_TABS = "topTabs";
+    private static final String FRAGMENT_CREATOR_CLASS_NAME = "fragmentCreatorClassName";
 
     @SuppressWarnings("ConstantConditions")
     public static ScreenParams parse(Bundle params) {
@@ -41,6 +42,9 @@ public class ScreenParamsParser extends Parser {
         if (hasKey(params, TOP_TABS)) {
             result.topTabParams = TopTabParamsParser.parse(params.getBundle(TOP_TABS));
         }
+        if (hasKey(params, FRAGMENT_CREATOR_CLASS_NAME)) {
+            result.fragmentCreatorClassName = params.getString(FRAGMENT_CREATOR_CLASS_NAME);
+        }
         if (hasKey(params, "label")) {
             result.tabLabel = params.getString("label");
         }

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

@@ -0,0 +1,107 @@
+package com.reactnativenavigation.screens;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.utils.ViewUtils;
+import com.reactnativenavigation.views.TitleBarBackButtonListener;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+
+@SuppressWarnings("ResourceType")
+public class FragmentScreen extends Screen {
+
+    private static final String CONTRACT_GET_FRAGMENT = "getFragment";
+    private static final String CONTRACT_GET_SUPPORT_FRAGMENT = "getSupportFragment";
+    private final AppCompatActivity activity;
+    private FrameLayout content;
+
+    public FragmentScreen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
+        super(activity, screenParams, titleBarBackButtonListener);
+        this.activity = activity;
+    }
+
+    @Override
+    protected void createContent() {
+        content = new FrameLayout(getContext());
+        content.setId(ViewUtils.generateViewId());
+        addView(content, MATCH_PARENT, MATCH_PARENT);
+        addFragment();
+    }
+
+    private void addFragment() {
+        try {
+            Fragment fragment = tryGetFragment();
+            if (fragment != null) {
+                addFragment(fragment);
+                return;
+            }
+
+            android.support.v4.app.Fragment supportFragment = tryGetSupportFragment();
+            if (supportFragment != null) {
+                addSupportFragment(supportFragment);
+                return;
+            }
+            throw new RuntimeException("must provide public static method " + CONTRACT_GET_FRAGMENT + " or " + CONTRACT_GET_SUPPORT_FRAGMENT);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void addFragment(Fragment fragment) {
+        FragmentManager fm = activity.getFragmentManager();
+        FragmentTransaction transaction = fm.beginTransaction();
+        transaction.add(content.getId(), fragment);
+        transaction.commit();
+    }
+
+    private void addSupportFragment(android.support.v4.app.Fragment supportFragment) {
+        android.support.v4.app.FragmentManager fm = activity.getSupportFragmentManager();
+        android.support.v4.app.FragmentTransaction transaction = fm.beginTransaction();
+        transaction.add(content.getId(), supportFragment);
+        transaction.commit();
+    }
+
+    @Nullable
+    private Fragment tryGetFragment() throws ClassNotFoundException, IllegalAccessException, InvocationTargetException {
+        try {
+            String className = screenParams.fragmentCreatorClassName;
+            Class<?> fragmentCreatorClass = Class.forName(className);
+            Method method = fragmentCreatorClass.getMethod(CONTRACT_GET_FRAGMENT, Bundle.class);
+            return (android.app.Fragment) method.invoke(null, screenParams.passProps);
+        } catch (NoSuchMethodException noSuchMethod) {
+            return null;
+        }
+    }
+
+    @Nullable
+    private android.support.v4.app.Fragment tryGetSupportFragment() throws ClassNotFoundException, IllegalAccessException, InvocationTargetException {
+        try {
+            String className = screenParams.fragmentCreatorClassName;
+            Class<?> fragmentCreatorClass = Class.forName(className);
+            Method method = fragmentCreatorClass.getMethod(CONTRACT_GET_SUPPORT_FRAGMENT, Bundle.class);
+            return (android.support.v4.app.Fragment) method.invoke(null, screenParams.passProps);
+        } catch (NoSuchMethodException noSuchMethod) {
+            return null;
+        }
+    }
+
+    @Override
+    public void ensureUnmountOnDetachedFromWindow() {
+        // nothing
+    }
+
+    @Override
+    public void preventUnmountOnDetachedFromWindow() {
+        // nothing
+    }
+}

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

@@ -28,8 +28,8 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 public abstract class Screen extends RelativeLayout implements ScrollDirectionListener.OnScrollChanged {
 
     protected final ScreenParams screenParams;
-    private final TitleBarBackButtonListener titleBarBackButtonListener;
     protected TopBar topBar;
+    private final TitleBarBackButtonListener titleBarBackButtonListener;
     private VisibilityAnimator topBarVisibilityAnimator;
 
     public Screen(Context context, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {

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

@@ -1,18 +1,20 @@
 package com.reactnativenavigation.screens;
 
-import android.content.Context;
+import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 public class ScreenFactory {
-    public static Screen create(Context context,
+    public static Screen create(AppCompatActivity activity,
                                 ScreenParams screenParams,
                                 TitleBarBackButtonListener titleBarBackButtonListener) {
-        if (screenParams.hasTopTabs()) {
-            return new TabbedScreen(context, screenParams, titleBarBackButtonListener);
+        if (screenParams.isFragmentScreen()) {
+            return new FragmentScreen(activity, screenParams, titleBarBackButtonListener);
+        } else if (screenParams.hasTopTabs()) {
+            return new TabbedScreen(activity, screenParams, titleBarBackButtonListener);
         } else {
-            return new SingleScreen(context, screenParams, titleBarBackButtonListener);
+            return new SingleScreen(activity, screenParams, titleBarBackButtonListener);
         }
     }
 }

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

@@ -1,7 +1,7 @@
 package com.reactnativenavigation.screens;
 
 import android.animation.LayoutTransition;
-import android.content.Context;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
@@ -16,10 +16,12 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 // TODO there's really no reason for ScreenStack to extend FrameLayout. All screens can be added to parent.
 public class ScreenStack extends FrameLayout implements TitleBarBackButtonListener {
+    private final AppCompatActivity activity;
     private Stack<Screen> stack = new Stack<>();
 
-    public ScreenStack(Context context, ScreenParams initialScreenParams) {
-        super(context);
+    public ScreenStack(AppCompatActivity activity, ScreenParams initialScreenParams) {
+        super(activity);
+        this.activity = activity;
         setLayoutTransition(new LayoutTransition());
         pushInitialScreen(initialScreenParams);
     }
@@ -35,7 +37,7 @@ public class ScreenStack extends FrameLayout implements TitleBarBackButtonListen
     }
 
     private void addScreen(ScreenParams screenParams) {
-        Screen screen = ScreenFactory.create(getContext(), screenParams, this);
+        Screen screen = ScreenFactory.create(activity, screenParams, this);
         addView(screen, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         stack.push(screen);
     }