refactoed

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

@@ -1,11 +1,100 @@
 package com.reactnativenavigation.layouts;
 
-import android.view.View;
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.view.Window;
+import android.widget.RelativeLayout;
 
-public interface Screen {
-    View asView();
+import com.reactnativenavigation.animation.OnScrollAnimator;
+import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.utils.SdkSupports;
+import com.reactnativenavigation.views.ScrollDirectionListener;
+import com.reactnativenavigation.views.TopBar;
 
-    void preventUnmountOnDetachedFromWindow();
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-    void ensureUnmountOnDetachedFromWindow();
+public abstract class Screen extends RelativeLayout implements ScrollDirectionListener.OnScrollChanged {
+
+    protected final ScreenParams screenParams;
+    protected TopBar topBar;
+    private OnScrollAnimator scrollAnimator;
+
+    public Screen(Context context, ScreenParams screenParams) {
+        super(context);
+        this.screenParams = screenParams;
+
+        createViews();
+        setStyle(screenParams.styleParams);
+    }
+
+    private void createViews() {
+        createTopBar();
+        createTitleBar();
+        createContent();
+    }
+
+    protected abstract void createContent();
+
+    private void createTitleBar() {
+        topBar.addTitleBarAndSetButtons(screenParams.buttons, screenParams.navigatorEventId);
+        topBar.setTitle(screenParams.title);
+    }
+
+    private void createTopBar() {
+        topBar = new TopBar(getContext());
+        addView(topBar, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
+    }
+
+    private void setStyle(ScreenStyleParams styleParams) {
+        setStatusBarColor(styleParams.statusBarColor);
+        setNavigationBarColor(styleParams.navigationBarColor);
+        topBar.setStyle(styleParams);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    private void setStatusBarColor(ScreenStyleParams.Color statusBarColor) {
+        if (!SdkSupports.lollipop()) {
+            return;
+        }
+
+        final Activity context = (Activity) getContext();
+        final Window window = context.getWindow();
+        if (statusBarColor.hasColor()) {
+            window.setStatusBarColor(statusBarColor.getColor());
+        } else {
+            window.setStatusBarColor(Color.BLACK);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public void setNavigationBarColor(ScreenStyleParams.Color navigationBarColor) {
+        if (!SdkSupports.lollipop()) {
+            return;
+        }
+
+        final Activity context = (Activity) getContext();
+        final Window window = context.getWindow();
+        if (navigationBarColor.hasColor()) {
+            window.setNavigationBarColor(navigationBarColor.getColor());
+        } else {
+            window.setNavigationBarColor(Color.BLACK);
+        }
+    }
+
+    @Override
+    public void onScrollChanged(ScrollDirectionListener.Direction direction) {
+        if (scrollAnimator == null) {
+            scrollAnimator = new OnScrollAnimator(topBar, OnScrollAnimator.HideDirection.Up, topBar.getHeight());
+        }
+        scrollAnimator.onScrollChanged(direction);
+    }
+
+    public abstract void ensureUnmountOnDetachedFromWindow();
+
+    public abstract void preventUnmountOnDetachedFromWindow();
 }

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

@@ -1,130 +0,0 @@
-package com.reactnativenavigation.layouts;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.view.View;
-import android.view.Window;
-import android.widget.RelativeLayout;
-
-import com.reactnativenavigation.animation.OnScrollAnimator;
-import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.ScreenStyleParams;
-import com.reactnativenavigation.utils.SdkSupports;
-import com.reactnativenavigation.views.ContentView;
-import com.reactnativenavigation.views.ScrollDirectionListener;
-import com.reactnativenavigation.views.TopBar;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-
-public class ScreenImpl extends RelativeLayout implements Screen, ScrollDirectionListener.OnScrollChanged {
-
-    private final ScreenParams screenParams;
-    private ContentView contentView;
-    private TopBar topBar;
-    private OnScrollAnimator scrollAnimator;
-
-    public ScreenImpl(Context context, ScreenParams screenParams) {
-        super(context);
-        this.screenParams = screenParams;
-
-        createViews();
-        setStyle(screenParams.styleParams);
-    }
-
-    private void createViews() {
-        addTopBar();
-        addTitleBar();
-        addContentView();
-    }
-
-    private void addTitleBar() {
-        topBar.addTitleBarAndSetButtons(screenParams.buttons, screenParams.navigatorEventId);
-        topBar.setTitle(screenParams.title);
-    }
-
-    private void addTopBar() {
-        topBar = new TopBar(getContext());
-        addView(topBar, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
-    }
-
-    private void addContentView() {
-        contentView = new ContentView(getContext(), screenParams, this);
-        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        if (!screenParams.styleParams.drawUnderTopBar) {
-            params.addRule(RelativeLayout.BELOW, topBar.getId());
-        }
-        addView(contentView, params);
-        contentView.init();
-    }
-
-    private void setStyle(ScreenStyleParams styleParams) {
-        setStatusBarColor(styleParams.statusBarColor);
-        setTopBarColor(styleParams.topBarColor);
-        setNavigationBarColor(styleParams.navigationBarColor);
-        topBar.setTitleBarVisibility(styleParams.titleBarHidden);
-        topBar.setVisibility(styleParams.topBarHidden ? GONE : VISIBLE);
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    private void setStatusBarColor(ScreenStyleParams.Color statusBarColor) {
-        if (!SdkSupports.lollipop()) {
-            return;
-        }
-
-        final Activity context = (Activity) getContext();
-        final Window window = context.getWindow();
-        if (statusBarColor.hasColor()) {
-            window.setStatusBarColor(statusBarColor.getColor());
-        } else {
-            window.setStatusBarColor(Color.BLACK);
-        }
-    }
-
-    private void setTopBarColor(ScreenStyleParams.Color topBarColor) {
-        if (topBarColor.hasColor()) {
-            topBar.setBackgroundColor(topBarColor.getColor());
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public void setNavigationBarColor(ScreenStyleParams.Color navigationBarColor) {
-        if (!SdkSupports.lollipop()) {
-            return;
-        }
-
-        final Activity context = (Activity) getContext();
-        final Window window = context.getWindow();
-        if (navigationBarColor.hasColor()) {
-            window.setNavigationBarColor(navigationBarColor.getColor());
-        } else {
-            window.setNavigationBarColor(Color.BLACK);
-        }
-    }
-
-    @Override
-    public void onScrollChanged(ScrollDirectionListener.Direction direction) {
-        if (scrollAnimator == null) {
-            scrollAnimator = new OnScrollAnimator(topBar, OnScrollAnimator.HideDirection.Up, topBar.getHeight());
-        }
-        scrollAnimator.onScrollChanged(direction);
-    }
-
-    @Override
-    public View asView() {
-        return this;
-    }
-
-    @Override
-    public void ensureUnmountOnDetachedFromWindow() {
-        contentView.ensureUnmountOnDetachedFromWindow();
-    }
-
-    @Override
-    public void preventUnmountOnDetachedFromWindow() {
-        contentView.preventUnmountOnDetachedFromWindow();
-    }
-}

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

@@ -31,14 +31,14 @@ public class ScreenStack extends FrameLayout {
     }
 
     private void addScreen(ScreenParams screenParams) {
-        Screen screen = new ScreenImpl(getContext(), screenParams);
-        addView(screen.asView(), new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        Screen screen = new SingleScreen(getContext(), screenParams);
+        addView(screen, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         stack.push(screen);
     }
 
     private void removePreviousWithoutUnmount(Screen previous) {
         previous.preventUnmountOnDetachedFromWindow();
-        removeView(previous.asView());
+        removeView(previous);
     }
 
     public void pop() {
@@ -52,11 +52,11 @@ public class ScreenStack extends FrameLayout {
         readdPrevious(previous);
 
         toRemove.ensureUnmountOnDetachedFromWindow();
-        removeView(toRemove.asView());
+        removeView(toRemove);
     }
 
     private void readdPrevious(Screen previous) {
-        addView(previous.asView(), new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        addView(previous, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 
     public void popToRoot() {
@@ -68,7 +68,7 @@ public class ScreenStack extends FrameLayout {
     public void destroy() {
         for (Screen screen : stack) {
             screen.ensureUnmountOnDetachedFromWindow();
-            removeView(screen.asView());
+            removeView(screen);
         }
         stack.clear();
     }

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

@@ -0,0 +1,45 @@
+package com.reactnativenavigation.layouts;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.widget.RelativeLayout;
+
+import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.views.ContentView;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+
+public class SingleScreen extends Screen {
+
+    private ContentView contentView;
+
+    public SingleScreen(Context context, ScreenParams screenParams) {
+        super(context, screenParams);
+    }
+
+    @Override
+    protected void createContent() {
+        contentView = new ContentView(getContext(), screenParams, this);
+        addView(contentView, addBelowTopBar());
+        contentView.init();
+    }
+
+    @NonNull
+    private LayoutParams addBelowTopBar() {
+        LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
+        if (!screenParams.styleParams.drawUnderTopBar) {
+            params.addRule(RelativeLayout.BELOW, topBar.getId());
+        }
+        return params;
+    }
+
+    @Override
+    public void ensureUnmountOnDetachedFromWindow() {
+        contentView.ensureUnmountOnDetachedFromWindow();
+    }
+
+    @Override
+    public void preventUnmountOnDetachedFromWindow() {
+        contentView.preventUnmountOnDetachedFromWindow();
+    }
+}

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.views;
 import android.content.Context;
 import android.support.design.widget.AppBarLayout;
 
+import com.reactnativenavigation.params.ScreenStyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.utils.ViewUtils;
 
@@ -24,11 +25,15 @@ public class TopBar extends AppBarLayout {
         titleBar.setButtons(buttons, navigatorEventId);
     }
 
-    public void setTitleBarVisibility(boolean isHidden) {
-        titleBar.setVisibility(isHidden ? GONE : VISIBLE);
-    }
-
     public void setTitle(String title) {
         titleBar.setTitle(title);
     }
+
+    public void setStyle(ScreenStyleParams styleParams) {
+        if (styleParams.topBarColor.hasColor()) {
+            setBackgroundColor(styleParams.topBarColor.getColor());
+        }
+        setVisibility(styleParams.topBarHidden ? GONE : VISIBLE);
+        titleBar.setVisibility(styleParams.titleBarHidden ? GONE : VISIBLE);
+    }
 }