fixed code styling and removed unused files

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

@@ -40,7 +40,8 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     private static final String REDBOX_PERMISSION_MESSAGE =
             "Overlay permissions needs to be granted in order for react native apps to run in dev mode";
 
-    protected  @Nullable ReactInstanceManager mReactInstanceManager;
+    @Nullable
+    protected ReactInstanceManager mReactInstanceManager;
     private LifecycleState mLifecycleState = LifecycleState.BEFORE_RESUME;
     private boolean mDoRefresh = false;
     private Menu mMenu;
@@ -51,9 +52,10 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
      * always try to load the JS bundle from the packager server.
      * e.g. "index.android.bundle"
      */
-    protected @Nullable String getBundleAssetName() {
+    @Nullable
+    protected String getBundleAssetName() {
         return "index.android.bundle";
-    };
+    }
 
     /**
      * Returns a custom path of the bundle file. This is used in cases the bundle should be loaded
@@ -61,7 +63,8 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
      * by {getBundleAssetName}.
      * e.g. "file://sdcard/myapp_cache/index.android.bundle"
      */
-    protected @Nullable String getJSBundleFile() {
+    @Nullable
+    protected String getJSBundleFile() {
         return null;
     }
 
@@ -82,7 +85,8 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
      * If your React Native application requires props set outside of JS, override
      * this method to return the Android.os.Bundle of your desired initial props.
      */
-    protected @Nullable Bundle getLaunchOptions() {
+    @Nullable
+    protected Bundle getLaunchOptions() {
         return null;
     }
 
@@ -191,7 +195,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
 
         // Destroy react instance manager only if there are no resumed react activities
         BaseReactActivity activity = ContextProvider.getActivityContext();
-        if (mReactInstanceManager != null && activity!=null && activity.isFinishing()) {
+        if (mReactInstanceManager != null && activity != null && activity.isFinishing()) {
             Log.i(TAG, "Destroying ReactInstanceManager");
             mReactInstanceManager.onDestroy();
         } else {
@@ -255,14 +259,14 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
 
     @Override
     public void onBackPressed() {
-        if(getScreenStackSize() > 1){
+        if (getScreenStackSize() > 1) {
             pop(getActiveNavigatorID());
-        }
-        else{
-            if (mReactInstanceManager != null)
+        } else {
+            if (mReactInstanceManager != null) {
                 mReactInstanceManager.onBackPressed();
-            else
+            } else {
                 super.onBackPressed();
+            }
         }
     }
 

android/app/src/main/java/com/reactnativenavigation/adapters/ViewPagerAdapter.java

@@ -3,11 +3,9 @@ package com.reactnativenavigation.adapters;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.activities.BaseReactActivity;
@@ -27,10 +25,8 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
 
     private static final String EVENT_ON_TAB_SELECTED = "OnTabSelected";
 
-    private BaseReactActivity mContext;
     private ViewPager mViewPager;
     private RnnToolBar mToolbar;
-    private final ReactInstanceManager mReactInstanceManager;
     private final ArrayList<ScreenStack> screenStacks;
     private final ArrayList<String> navIDs;
     private final Map<String, ScreenStack> stacksByNavId;
@@ -38,31 +34,30 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
 
     public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, RnnToolBar toolbar,
                             ArrayList<Screen> screens) {
-        mContext = context;
         mViewPager = viewPager;
         mToolbar = toolbar;
         screenStacks = new ArrayList<>();
         navIDs = new ArrayList<>();
-        stacksByNavId  = new HashMap<>();
-        for(Screen screen: screens){
+        stacksByNavId = new HashMap<>();
+        for (Screen screen : screens) {
             ScreenStack stack = new ScreenStack(context);
             stack.push(screen);
             screenStacks.add(stack);
             navIDs.add(screen.navigatorId);
             stacksByNavId.put(screen.navigatorId, stack);
         }
-        mReactInstanceManager = RctManager.getInstance().getReactInstanceManager();
     }
 
-    public void pushScreen(Screen screen){
+    public void pushScreen(Screen screen) {
         ScreenStack stack = stacksByNavId.get(screen.navigatorId);
         stack.push(screen);
     }
 
-    public Screen pop(String navID){
+    public Screen pop(String navID) {
         ScreenStack stack = stacksByNavId.get(navID);
-        if(stack != null)
+        if (stack != null) {
             return stack.pop();
+        }
         return null;
     }
 

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

@@ -1,71 +0,0 @@
-package com.reactnativenavigation.layouts;
-
-import android.content.Context;
-import android.support.design.widget.TabLayout;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-/**
- *
- * Created by guyc on 06/03/16.
- */
-@Deprecated
-public class ReactTabLayout extends TabLayout {
-
-    public enum InitialState {
-        TAB_POSITION_UNSET,
-        TAB_POSITION_SET,
-        TAB_SELECTED
-    }
-
-    private List<Tab> mTabs = new ArrayList<>();
-    private List<Integer> mIds = new ArrayList<>();
-    private InitialState mInitialState = InitialState.TAB_POSITION_UNSET;
-    private int mInitialTabPosition;
-
-    public ReactTabLayout(Context context) {
-        super(context);
-    }
-
-
-    @Override
-    public void addTab(Tab tab) {
-        super.addTab(tab);
-        mTabs.add(tab);
-        mIds.add(UUID.randomUUID().hashCode());
-    }
-
-    public int getId(int index) {
-        return mIds.get(index);
-    }
-
-    public int indexOf(Tab tab) {
-        return mTabs.indexOf(tab);
-    }
-
-    @Override
-    public void removeAllTabs() {
-        mTabs.clear();
-        mIds.clear();
-        super.removeAllTabs();
-    }
-
-    public InitialState getInitialState() {
-        return mInitialState;
-    }
-
-    public int getInitialTabPosition() {
-        return mInitialTabPosition;
-    }
-
-    public void setInitialState(InitialState initialState) {
-        mInitialState = initialState;
-    }
-
-    public void setInitialTabPosition(int initialTabPosition) {
-        mInitialTabPosition = initialTabPosition;
-    }
-}
-

android/app/src/main/java/com/reactnativenavigation/managers/AppBarLayoutManager.java

@@ -1,110 +0,0 @@
-package com.reactnativenavigation.managers;
-
-import android.support.design.widget.AppBarLayout;
-import android.view.View;
-
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-import java.util.Map;
-
-/**
- * Created by guyc on 08/03/16.
- */
-@Deprecated
-public class AppBarLayoutManager extends ViewGroupManager<AppBarLayout> {
-    private static final String REACT_CLASS = "AppbarLayout";
-    private static final int COMMAND_SET_CHILDREN_SCROLL_FLAGS = 1;
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected AppBarLayout createViewInstance(ThemedReactContext reactContext) {
-        AppBarLayout appBarLayout = new AppBarLayout(reactContext);
-        appBarLayout.setFitsSystemWindows(true);
-        return appBarLayout;
-    }
-
-    @Override
-    public boolean needsCustomLayoutForChildren() {
-        return true;
-    }
-
-    @Override
-    public Map<String,Integer> getCommandsMap() {
-        return MapBuilder.of(
-                "setChildrenScrollFlags", COMMAND_SET_CHILDREN_SCROLL_FLAGS);
-    }
-
-    @Override
-    public void receiveCommand(AppBarLayout view, int commandType, ReadableArray args) {
-        Assertions.assertNotNull(view);
-        Assertions.assertNotNull(args);
-
-        switch (commandType) {
-            case COMMAND_SET_CHILDREN_SCROLL_FLAGS: {
-                ReadableArray options = args.getArray(0);
-                setChildrenScrollFlags(view, options);
-                return;
-            }
-
-            default:
-                throw new JSApplicationIllegalArgumentException(String.format(
-                        "Unsupported command %d received by %s.",
-                        commandType,
-                        getClass().getSimpleName()));
-        }
-    }
-
-    @ReactProp(name = "childrenScrollFlags")
-    public void setScrollFlags(AppBarLayout view, ReadableArray options) {
-        setChildrenScrollFlags(view, options);
-    }
-
-    private void setChildrenScrollFlags(AppBarLayout view, ReadableArray options) {
-        try {
-            int optionSize = options.size();
-            for (int i=0; i<optionSize; i++) {
-
-                ReadableMap optionMap = options.getMap(i);
-                ReadableArray scrollFlags = optionMap.getArray("scrollFlags");
-
-                int scrollFlagsSize = scrollFlags.size();
-                int scrollFlagsInteger = 0;
-
-                for (int j=0; j<scrollFlagsSize; j++) {
-                    String scrollFlagString = scrollFlags.getString(j);
-
-                    if ("enterAlways".equals(scrollFlagString)) {
-                        scrollFlagsInteger = scrollFlagsInteger | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS;
-                    } else if ("enterAlwaysCollapsed".equals(scrollFlagString)) {
-                        scrollFlagsInteger = scrollFlagsInteger | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS_COLLAPSED;
-                    } else if ("exitUntilCollapsed".equals(scrollFlagString)) {
-                        scrollFlagsInteger = scrollFlagsInteger | AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED;
-                    } else if ("scroll".equals(scrollFlagString)) {
-                        scrollFlagsInteger = scrollFlagsInteger | AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL;
-                    } else if ("snap".equals(scrollFlagString)) {
-                        scrollFlagsInteger = scrollFlagsInteger | AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP;
-                    }
-                }
-
-                View childView = view.getChildAt(optionMap.getInt("index"));
-                AppBarLayout.LayoutParams param = (AppBarLayout.LayoutParams) childView.getLayoutParams();
-
-                //noinspection ResourceType
-                param.setScrollFlags(scrollFlagsInteger);
-            }
-        } catch (Exception e) {
-            // TODO: Handle Exception
-        }
-    }
-}

android/app/src/main/java/com/reactnativenavigation/managers/CoordinatorLayoutManager.java

@@ -1,49 +0,0 @@
-package com.reactnativenavigation.managers;
-
-import android.support.design.widget.CoordinatorLayout;
-import android.view.View;
-
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-
-import java.util.Map;
-
-/**
- * Created by guyc on 19/03/16.
- */
-@Deprecated
-public class CoordinatorLayoutManager extends ViewGroupManager<CoordinatorLayout> {
-    private static final String REACT_CLASS = "CoordinatorLayout";
-    private static final String COMMAND_CHILD_FLAGS = "setChildFlags";
-    private static final int COMMAND_SET_CHILD_FLAGS_TYPE = 1;
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    public boolean needsCustomLayoutForChildren() {
-        return true;
-    }
-
-    @Override
-    protected CoordinatorLayout createViewInstance(ThemedReactContext reactContext) {
-        CoordinatorLayout coordinatorLayout = new CoordinatorLayout(reactContext);
-        coordinatorLayout.setFitsSystemWindows(true);
-        return coordinatorLayout;
-    }
-
-
-    @Override
-    public void addView(CoordinatorLayout parent, View child, int index) {
-        child.setFitsSystemWindows(true);
-        super.addView(parent, child, index);
-    }
-
-    @Override
-    public Map<String, Integer> getCommandsMap() {
-        return MapBuilder.of(COMMAND_CHILD_FLAGS, COMMAND_SET_CHILD_FLAGS_TYPE);
-    }
-}

android/app/src/main/java/com/reactnativenavigation/managers/TabLayoutManager.java

@@ -1,293 +0,0 @@
-package com.reactnativenavigation.managers;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.reactnativenavigation.layouts.ReactTabLayout;
-import com.reactnativenavigation.layouts.ReactTabLayout.InitialState;
-import com.reactnativenavigation.utils.ResourceUtils;
-
-import java.util.Map;
-
-import static android.support.design.widget.TabLayout.Tab;
-
-/**
- *
- * Created by guyc on 06/03/16.
- */
-@Deprecated
-public class TabLayoutManager extends ViewGroupManager<ReactTabLayout> {
-    private static final String REACT_CLASS = "TabLayout";
-    public static final int COMMAND_SET_VIEW_PAGER_TYPE = 1;
-    public static final String PARAM_ICON = "icon";
-    public static final String PARAM_TEXT = "text";
-    public static final String REGISTRATION_NAME = "registrationName";
-    public static final String EVENT_ON_TAB_SELECTED = "onTabSelected";
-    public static final String COMMAND_SET_VIEW_PAGER = "setViewPager";
-    private static final String TAG = TabLayoutManager.class.getSimpleName();
-
-    private enum TabMode {
-        SCROLLABLE(TabLayout.MODE_SCROLLABLE),
-        FIXED(TabLayout.MODE_FIXED);
-
-        int mode;
-
-        TabMode(int mode) {
-            this.mode = mode;
-        }
-
-        public static TabMode fromString(String text) {
-            return text != null ? Enum.valueOf(TabMode.class, text.trim().toUpperCase()) : null;
-        }
-    }
-
-    private enum TabGravity {
-        FILL(TabLayout.GRAVITY_FILL),
-        CENTER(TabLayout.GRAVITY_CENTER);
-
-        int gravity;
-
-        TabGravity(int gravity) {
-            this.gravity = gravity;
-        }
-
-        public static TabGravity fromString(String text) {
-            return text != null ? Enum.valueOf(TabGravity.class, text.trim().toUpperCase()) : null;
-        }
-    }
-
-    private EventDispatcher mDispatcher;
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected ReactTabLayout createViewInstance(ThemedReactContext reactContext) {
-        ReactTabLayout tabLayout = new ReactTabLayout(reactContext);
-//        setupWithViewPager(tabLayout);
-        return tabLayout;
-    }
-
-    private void setupWithViewPager(final ReactTabLayout tabLayout, final ReadableArray tabs) {
-        tabLayout.post(new Runnable() {
-            @Override
-            public void run() {
-                if (tabLayout.getParent() == null) {
-                    Log.e(TAG, "Tried to setupViewPager but parent is null");
-                    return;
-                }
-                
-                ViewGroup parent = (ViewGroup) tabLayout.getParent().getParent();
-                if (parent == null) {
-                    return;
-                }
-
-                for (int i = 0; i < parent.getChildCount(); i++) {
-                    View child = parent.getChildAt(i);
-                    if (child instanceof ViewPager) {
-                        // Setup TabLayout with ViewPager
-                        ViewPager viewPager = (ViewPager) child;
-                        tabLayout.setupWithViewPager(viewPager);
-
-                        // Add tabs
-                        if (tabs != null) {
-                            tabLayout.removeAllTabs();
-                            populateTabLayoutWithTabs(tabLayout, tabs);
-                            tabLayout.setOnTabSelectedListener(new OnTabSelectedListener(viewPager, tabLayout, TabLayoutManager.this));
-                        }
-                    }
-                }
-
-                Log.i("GUY", "childCount" + parent.getChildCount());
-                for (int i = 0; i < parent.getChildCount(); i++) {
-                    Log.d("GUY", "[" + 1 + "] " + parent.getChildAt(i).getClass().getSimpleName());
-                }
-            }
-        });
-
-    }
-
-    @Override
-    public void addView(ReactTabLayout tabLayout, View child, int index) {
-        Tab tab = tabLayout.newTab();
-        tabLayout.addTab(tab);
-
-        // when initial position was stored, update tab selection
-        if (tabLayout.getInitialState() == InitialState.TAB_POSITION_SET &&
-            tabLayout.getInitialTabPosition() == index) {
-            tabLayout.setInitialState(InitialState.TAB_SELECTED);
-            tab.select();
-        }
-    }
-
-    @ReactProp(name = "tabs")
-    public void setTabs(ReactTabLayout tabLayout, ReadableArray tabs) {
-        setupWithViewPager(tabLayout, tabs);
-    }
-
-
-    @ReactProp(name = "selectedTab", defaultInt = 0)
-    public void setSelectedTab(ReactTabLayout view, int selectedTab) {
-        selectTab(view, selectedTab);
-    }
-
-    private void selectTab(ReactTabLayout tabLayout, int position) {
-        if (position < 0 || position >= tabLayout.getTabCount()) {
-            Log.w(REACT_CLASS, "Tried to select tab " + position + " but index is out of bounds");
-            return;
-        }
-
-        Tab tab = tabLayout.getTabAt(position);
-        if (tab != null) {
-            tab.select();
-        }
-    }
-
-    @ReactProp(name = "selectedTabIndicatorColor")
-    public void setSelectedTabIndicatorColor(ReactTabLayout view, int indicatorColor) {
-        view.setSelectedTabIndicatorColor(indicatorColor);
-    }
-
-    @ReactProp(name = "tabMode")
-    public void setTabMode(ReactTabLayout view, String mode) {
-        TabMode tabMode = TabMode.fromString(mode);
-        if (tabMode == null) {
-            Log.w(REACT_CLASS, "Invalid tabMode [" + tabMode + "]");
-        } else {
-            view.setTabMode(tabMode.mode);
-        }
-    }
-
-    @ReactProp(name = "tabGravity")
-    public void setTabGravity(ReactTabLayout view, String gravity) {
-        TabGravity tabGravity = TabGravity.fromString(gravity);
-        if (tabGravity == null) {
-            Log.w(REACT_CLASS, "Invalid tabGravity [" + gravity + "]");
-        } else {
-            view.setTabGravity(tabGravity.gravity);
-        }
-    }
-
-    @Override
-    public boolean needsCustomLayoutForChildren() {
-        return true;
-    }
-
-    @Override
-    protected void addEventEmitters(ThemedReactContext reactContext, ReactTabLayout view) {
-        mDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
-    }
-
-//    @Override
-//    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-//        return MapBuilder.of(
-//                TabSelectedEvent.EVENT_NAME, (Object) MapBuilder.of(REGISTRATION_NAME, EVENT_ON_TAB_SELECTED)
-//        );
-//    }
-
-    /*
-    * This method allows us to expose an interface which we can use from react.
-    * If we obtain a reference to this native view, we can call `setViewPager` method and handle
-    * the call in `receiveCommand`
-    * */
-    @Override
-    public Map<String, Integer> getCommandsMap() {
-        return MapBuilder.of(COMMAND_SET_VIEW_PAGER, COMMAND_SET_VIEW_PAGER_TYPE);
-    }
-
-    @Override
-    public void receiveCommand(ReactTabLayout tabLayout, int commandType, ReadableArray args) {
-        Assertions.assertNotNull(tabLayout);
-        Assertions.assertNotNull(args);
-
-        switch (commandType) {
-            case COMMAND_SET_VIEW_PAGER_TYPE: {
-                // Setup TabLayout with ViewPager
-                int viewPagerId = args.getInt(0);
-                ViewPager viewPager = (ViewPager) tabLayout.getRootView().findViewById(viewPagerId);
-                tabLayout.setupWithViewPager(viewPager);
-
-                // Add tabs
-                ReadableArray tabs = args.getArray(1);
-                if (tabs != null) {
-                    tabLayout.removeAllTabs();
-                    this.populateTabLayoutWithTabs(tabLayout, tabs);
-//                    tabLayout.setOnTabSelectedListener(new OnTabSelectedListener(viewPager, tabLayout, this));
-                }
-
-                return;
-            }
-
-            default:
-                throw new JSApplicationIllegalArgumentException(String.format(
-                        "Unsupported command %d received by %s.", commandType, REACT_CLASS));
-        }
-    }
-
-    private void populateTabLayoutWithTabs(ReactTabLayout tabLayout, ReadableArray tabs) {
-        for (int i = 0; i < tabs.size(); i++) {
-            ReadableMap tabMap = tabs.getMap(i);
-            TabLayout.Tab tab = tabLayout.newTab();
-
-            // Set tab text
-            if (tabMap.hasKey(PARAM_TEXT)) {
-                tab.setText(tabMap.getString(PARAM_TEXT));
-            }
-
-            // Set tab icon
-            if (tabMap.hasKey(PARAM_ICON)) {
-                Context ctx = tabLayout.getContext();
-                Drawable icon = ResourceUtils.getDrawable(ctx, tabMap.getString(PARAM_ICON));
-                if (icon != null) {
-                    tab.setIcon(icon);
-                }
-            }
-
-            tabLayout.addTab(tab);
-        }
-    }
-
-    private static class OnTabSelectedListener extends TabLayout.ViewPagerOnTabSelectedListener {
-        private final ReactTabLayout mTabLayout;
-        private TabLayoutManager mTabLayoutManager;
-
-        public OnTabSelectedListener(ViewPager viewPager, ReactTabLayout tabLayout, TabLayoutManager manager) {
-            super(viewPager);
-            mTabLayout = tabLayout;
-            mTabLayoutManager = manager;
-        }
-
-        @Override
-        public void onTabSelected(Tab tab) {
-            super.onTabSelected(tab);
-            int position = mTabLayout.indexOf(tab);
-//            mTabLayoutManager.mDispatcher.dispatchEvent(new TabSelectedEvent(mTabLayout.getId(position), position));
-//            mTabLayoutManager.mDispatcher.dispatchEvent(new TabSelectedEvent(mTabLayout.getId(), position));
-        }
-
-        @Override
-        public void onTabUnselected(Tab tab) {
-        }
-
-        @Override
-        public void onTabReselected(Tab tab) {
-        }
-    }
-}

android/app/src/main/java/com/reactnativenavigation/managers/ToolbarManager.java

@@ -1,41 +0,0 @@
-package com.reactnativenavigation.managers;
-
-import android.content.Context;
-import android.support.v7.widget.Toolbar;
-import android.view.LayoutInflater;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.reactnativenavigation.R;
-
-/**
- *
- * Created by guyc on 19/03/16.
- */
-@Deprecated
-public class ToolbarManager extends ViewGroupManager<Toolbar> {
-    private static final String REACT_CLASS = "Toolbar";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    public boolean needsCustomLayoutForChildren() {
-        return true;
-    }
-
-    @Override
-    protected Toolbar createViewInstance(ThemedReactContext reactContext) {
-        return (Toolbar)
-                ((LayoutInflater) reactContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE))
-                .inflate(R.layout.toolbar, null, false);
-    }
-
-    @ReactProp(name = "title")
-    public void setTitle(Toolbar view, String title) {
-        view.setTitle(title);
-    }
-}

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

@@ -7,7 +7,6 @@ import com.reactnativenavigation.activities.BaseReactActivity;
 import java.lang.ref.WeakReference;
 
 /**
- *
  * Created by guyc on 10/03/16.
  */
 public class ContextProvider {
@@ -19,7 +18,8 @@ public class ContextProvider {
         }
     }
 
-    public static @Nullable BaseReactActivity getActivityContext() {
+    @Nullable
+    public static BaseReactActivity getActivityContext() {
         return sActivityWR != null ? sActivityWR.get() : null;
     }
 

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

@@ -16,38 +16,39 @@ import javax.annotation.Nullable;
  */
 public class ResourceDrawableIdHelper {
 
-  private Map<String, Integer> mResourceDrawableIdMap;
+    private Map<String, Integer> mResourceDrawableIdMap;
 
-  public ResourceDrawableIdHelper() {
-    mResourceDrawableIdMap = new HashMap<String, Integer>();
-  }
+    public ResourceDrawableIdHelper() {
+        mResourceDrawableIdMap = new HashMap<>();
+    }
+
+    public int getResourceDrawableId(Context context, @Nullable String name) {
+        if (name == null || name.isEmpty()) {
+            return 0;
+        }
+        name = name.toLowerCase().replace("-", "_");
+        if (mResourceDrawableIdMap.containsKey(name)) {
+            return mResourceDrawableIdMap.get(name);
+        }
+        int id = context.getResources().getIdentifier(
+                name,
+                "drawable",
+                context.getPackageName());
+        mResourceDrawableIdMap.put(name, id);
+        return id;
+    }
 
-  public int getResourceDrawableId(Context context, @Nullable String name) {
-    if (name == null || name.isEmpty()) {
-      return 0;
+    @Nullable
+    public Drawable getResourceDrawable(Context context, @Nullable String name) {
+        int resId = getResourceDrawableId(context, name);
+        return resId > 0 ? context.getResources().getDrawable(resId) : null;
     }
-    name = name.toLowerCase().replace("-", "_");
-    if (mResourceDrawableIdMap.containsKey(name)) {
-      return mResourceDrawableIdMap.get(name);
+
+    public Uri getResourceDrawableUri(Context context, @Nullable String name) {
+        int resId = getResourceDrawableId(context, name);
+        return resId > 0 ? new Uri.Builder()
+                .scheme(UriUtil.LOCAL_RESOURCE_SCHEME)
+                .path(String.valueOf(resId))
+                .build() : Uri.EMPTY;
     }
-    int id = context.getResources().getIdentifier(
-        name,
-        "drawable",
-        context.getPackageName());
-    mResourceDrawableIdMap.put(name, id);
-    return id;
-  }
-
-  public @Nullable Drawable getResourceDrawable(Context context, @Nullable String name) {
-    int resId = getResourceDrawableId(context, name);
-    return resId > 0 ? context.getResources().getDrawable(resId) : null;
-  }
-
-  public Uri getResourceDrawableUri(Context context, @Nullable String name) {
-    int resId = getResourceDrawableId(context, name);
-    return resId > 0 ? new Uri.Builder()
-        .scheme(UriUtil.LOCAL_RESOURCE_SCHEME)
-        .path(String.valueOf(resId))
-        .build() : Uri.EMPTY;
-  }
 }

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

@@ -1,21 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.support.v4.content.res.ResourcesCompat;
-
-/**
- * Created by guyc on 17/03/16.
- */
-public class ResourceUtils {
-
-    public static final String TYPE_DRAWABLE = "drawable";
-
-    public static Drawable getDrawable(Context context, String resourceName) {
-        Resources resources = context.getResources();
-        int id =  resources.getIdentifier(resourceName, TYPE_DRAWABLE, context.getPackageName());
-        return id > 0 ? ResourcesCompat.getDrawable(resources, id, context.getTheme()) : null;
-    }
-
-}

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.views;
 
 import android.animation.LayoutTransition;
-import android.view.View;
 import android.widget.FrameLayout;
 
 import com.facebook.react.ReactInstanceManager;
@@ -17,7 +16,7 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 public class ScreenStack extends FrameLayout {
 
-    private class ScreenView{
+    private class ScreenView {
         Screen screen;
         RctView view;
 
@@ -28,36 +27,37 @@ public class ScreenStack extends FrameLayout {
     }
 
     private final Stack<ScreenView> stack = new Stack<>();
-    private final ReactInstanceManager mReactInstanceManager = RctManager.getInstance().getReactInstanceManager();
+    private final ReactInstanceManager mReactInstanceManager =
+            RctManager.getInstance().getReactInstanceManager();
     private final BaseReactActivity reactActivity;
 
-    public ScreenStack(BaseReactActivity context){
+    public ScreenStack(BaseReactActivity context) {
         super(context);
         reactActivity = context;
         setLayoutTransition(new LayoutTransition());
     }
 
-    public void push(Screen screen){
-        View oldView = null;
-        if(!stack.isEmpty()) {
+    public void push(Screen screen) {
+        RctView oldView = null;
+        if (!stack.isEmpty()) {
             oldView = stack.peek().view;
         }
         RctView view = new RctView(reactActivity, mReactInstanceManager, screen);
         addView(view, MATCH_PARENT, MATCH_PARENT);
-        if(oldView != null) {
-            ReactRootView reactRootView = ((RctView) oldView).getReactRootView();
+        if (oldView != null) {
+            ReactRootView reactRootView = oldView.getReactRootView();
             ReflectionUtils.setBooleanField(reactRootView, "mAttachScheduled", true);
             removeView(oldView);
         }
         stack.push(new ScreenView(screen, view));
     }
 
-    public Screen pop(){
-        if(stack.isEmpty()) {
+    public Screen pop() {
+        if (stack.isEmpty()) {
             return null;
         }
         ScreenView popped = stack.pop();
-        if(!stack.isEmpty()) {
+        if (!stack.isEmpty()) {
             addView(stack.peek().view, 0);
         }
 
@@ -66,15 +66,15 @@ public class ScreenStack extends FrameLayout {
         return popped.screen;
     }
 
-    public boolean isEmpty(){
+    public boolean isEmpty() {
         return stack.isEmpty();
     }
 
-    public int getStackSize(){
+    public int getStackSize() {
         return stack.size();
     }
 
-    public Screen peek(){
+    public Screen peek() {
         return stack.peek().screen;
     }
 }