fixed FragmentScreen

CHANGELOG.md

@@ -5,3 +5,7 @@
 * **Breaking change:** in order to handle nav button press events, you now need to register your event handler explicitly. Until now, you've just had to have `onNavigatorEvent(event)` method on your screen component. From now on, explicitly register your handler with `navigator.setOnNavigatorEvent(this.onNavigatorEvent.bind(this));`. A good place to do this is in your screen's constructor. See the example for an example.
 * Simplified API significantly. You now don't need to have your screen components extend `Screen`. You can leave them extending React's traditional `Component`. When you register your screen, instead of using `Navigation.registerScreen` directly, you can now use `Navigation.registerComponent`. This wrapper will wrap your regular component with a `Screen` automatically and pass the navigator instance through props. The benefit of this change is that your screen components now have *zero(!)* references to react-native-navigation. All of the changes required by this package are now purely concentrated in one place - your app bootstrap.
 * Added redux example and optional redux support
+
+### 2.0.0
+
+* Android native code redesign

android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -9,7 +9,7 @@ import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
 import com.reactnativenavigation.react.NavigationReactInstance;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
 public abstract class NavigationApplication extends Application {
@@ -38,9 +38,9 @@ public abstract class NavigationApplication extends Application {
     }
 
     public final List<ReactPackage> createReactPackages() {
-        List<ReactPackage> list = Arrays.asList(
-                new MainReactPackage(),
-                new NavigationReactPackage());
+        List<ReactPackage> list = new ArrayList<>();
+        list.add(new MainReactPackage());
+        list.add(new NavigationReactPackage());
         addAdditionalReactPackagesIfNeeded(list);
         return list;
     }

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

@@ -22,12 +22,10 @@ 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

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

@@ -2,9 +2,9 @@ package com.reactnativenavigation.screens;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Window;
 import android.widget.RelativeLayout;
@@ -27,13 +27,15 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 public abstract class Screen extends RelativeLayout implements ScrollDirectionListener.OnScrollChanged {
 
+    protected final AppCompatActivity activity;
     protected final ScreenParams screenParams;
     protected TopBar topBar;
     private final TitleBarBackButtonListener titleBarBackButtonListener;
     private VisibilityAnimator topBarVisibilityAnimator;
 
-    public Screen(Context context, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
-        super(context);
+    public Screen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
+        super(activity);
+        this.activity = activity;
         this.screenParams = screenParams;
         this.titleBarBackButtonListener = titleBarBackButtonListener;
 

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

@@ -1,7 +1,7 @@
 package com.reactnativenavigation.screens;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.views.ContentView;
@@ -13,9 +13,9 @@ public class SingleScreen extends Screen {
 
     private ContentView contentView;
 
-    public SingleScreen(Context context, ScreenParams screenParams,
+    public SingleScreen(AppCompatActivity activity, ScreenParams screenParams,
                         TitleBarBackButtonListener titleBarBarBackButtonListener) {
-        super(context, screenParams, titleBarBarBackButtonListener);
+        super(activity, screenParams, titleBarBarBackButtonListener);
     }
 
     @Override

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

@@ -1,10 +1,10 @@
 package com.reactnativenavigation.screens;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -24,8 +24,8 @@ public class TabbedScreen extends Screen {
     private ViewPager viewPager;
     private ContentViewPagerAdapter adapter;
 
-    public TabbedScreen(Context context, ScreenParams screenParams, TitleBarBackButtonListener backButtonListener) {
-        super(context, screenParams, backButtonListener);
+    public TabbedScreen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener backButtonListener) {
+        super(activity, screenParams, backButtonListener);
     }
 
     @Override

src/deprecated/platformSpecificDeprecated.android.js

@@ -277,7 +277,7 @@ function getLeftButton(screen) {
     return screen.navigatorButtons.leftButton;
   }
 
-  return screen.leftButton
+  return screen.leftButton;
 }
 
 function getRightButtons(screen) {
@@ -285,7 +285,7 @@ function getRightButtons(screen) {
     return screen.navigatorButtons.rightButtons;
   }
 
-  return screen.rightButtons
+  return screen.rightButtons;
 }
 
 function addNavigationStyleParams(screen) {