parsers

android/app/src/main/java/com/reactnativenavigation/bridge/parsers/BundleConverter.java → android/app/src/main/java/com/reactnativenavigation/bridge/BundleConverter.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.bridge.parsers;
+package com.reactnativenavigation.bridge;
 
 import android.os.Bundle;
 

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -8,7 +8,6 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.bridge.parsers.BundleConverter;
 import com.reactnativenavigation.controllers.NavigationActivity;
 
 /**

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

@@ -1,41 +0,0 @@
-package com.reactnativenavigation.bridge.parsers;
-
-import android.os.Bundle;
-
-import com.reactnativenavigation.controllers.ScreenParams;
-
-public class ScreenParamsParser {
-    private static final String KEY_TITLE = "title";
-    private static final String KEY_SCREEN_ID = "screenId";
-    private static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
-    private static final String KEY_PROPS = "passProps";
-    private static final String KEY_LABEL = "tabLabel";
-    private static final String KEY_ICON = "tabIcon";
-    private static final String KEY_NAVIGATOR_BUTTONS = "navigatorButtons";
-    private static final String KEY_RIGHT_BUTTONS = "rightButtons";
-    private static final String KEY_TOOL_BAR_STYLE = "navigatorStyle";
-    private static final String KEY_STATUS_BAR_COLOR = "statusBarColor";
-    private static final String KEY_TOOL_BAR_COLOR = "navBarBackgroundColor";
-    private static final String KEY_TOOL_BAR_HIDDEN = "navBarHidden";
-    private static final String KEY_NAVIGATION_BAR_COLOR = "navigationBarColor";
-    private static final String KEY_NAV_BAR_BUTTON_COLOR = "navBarButtonColor";
-    private static final String KEY_NAV_BAR_TEXT_COLOR = "navBarTextColor";
-    private static final String KEY_BACK_BUTTON_HIDDEN = "backButtonHidden";
-    private static final String KEY_TAB_NORMAL_TEXT_COLOR = "tabNormalTextColor";
-    private static final String KEY_TAB_SELECTED_TEXT_COLOR = "tabSelectedTextColor";
-    private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
-    private static final String KEY_BOTTOM_TABS_HIDDEN = "tabBarHidden";
-    private static final String KEY_BOTTOM_TABS_HIDDEN_ON_SCROLL = "bottomTabsHiddenOnScroll";
-
-    public ScreenParams parse(Bundle params) {
-        ScreenParams result = new ScreenParams();
-        result.screenId = params.getString(KEY_SCREEN_ID);
-        result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
-        result.passProps = params.getBundle(KEY_PROPS);
-        result.buttons = null;
-        result.title = params.getString(KEY_TITLE);
-        result.styleParams = null;
-        return result;
-    }
-
-}

android/app/src/main/java/com/reactnativenavigation/bridge/parsers/TitleBarButtonParamsParser.java

@@ -1,15 +0,0 @@
-package com.reactnativenavigation.bridge.parsers;
-
-import android.os.Bundle;
-
-import com.reactnativenavigation.views.TitleBarButton;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TitleBarButtonParamsParser {
-    public List<TitleBarButton.Params> params(Bundle params) {
-        List<TitleBarButton.Params> result = new ArrayList<>();
-        return result;
-    }
-}

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

@@ -10,9 +10,11 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
-import com.reactnativenavigation.bridge.parsers.ActivityParamsParser;
+import com.reactnativenavigation.params.ActivityParams;
+import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.ScreenLayout;
+import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.NavigationReactInstance;
 import com.reactnativenavigation.react.RedboxPermission;

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

@@ -12,7 +12,7 @@ import android.widget.LinearLayout;
 
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.controllers.ScreenParams;
-import com.reactnativenavigation.controllers.ScreenStyleParams;
+import com.reactnativenavigation.params.ScreenStyleParams;
 import com.reactnativenavigation.utils.SdkSupports;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.ScrollDirectionListener;

android/app/src/main/java/com/reactnativenavigation/controllers/ActivityParams.java → android/app/src/main/java/com/reactnativenavigation/params/ActivityParams.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.controllers;
+package com.reactnativenavigation.params;
 
 public class ActivityParams {
     public ScreenParams screenParams;

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

@@ -1,16 +1,14 @@
-package com.reactnativenavigation.controllers;
+package com.reactnativenavigation.params;
 
 import android.os.Bundle;
 
-import com.reactnativenavigation.views.TitleBarButton;
-
-import java.util.ArrayList;
+import java.util.List;
 
 public class ScreenParams {
     public String screenId;
     public String screenInstanceId;
     public Bundle passProps;
-    public ArrayList<TitleBarButton.Params> buttons;
+    public List<TitleBarButtonParams> buttons;
     public String title;
     public ScreenStyleParams styleParams;
     //    public String tabLabel; TODO when tabs are supported move to TabParams

android/app/src/main/java/com/reactnativenavigation/controllers/ScreenStyleParams.java → android/app/src/main/java/com/reactnativenavigation/params/ScreenStyleParams.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.controllers;
+package com.reactnativenavigation.params;
 
 import android.support.annotation.ColorInt;
 

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

@@ -0,0 +1,28 @@
+package com.reactnativenavigation.params;
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorInt;
+import android.view.MenuItem;
+
+public class TitleBarButtonParams {
+    public enum ShowAsAction {
+        IfRoom(MenuItem.SHOW_AS_ACTION_IF_ROOM),
+        Always(MenuItem.SHOW_AS_ACTION_ALWAYS),
+        Never(MenuItem.SHOW_AS_ACTION_NEVER),
+        WithText(MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+        public final int action;
+
+        ShowAsAction(int action) {
+            this.action = action;
+        }
+    }
+
+    // Todo: add id for click listener
+    public String label;
+    public Drawable icon;
+    @ColorInt
+    public int color;
+    public ShowAsAction showAsAction;
+    public boolean enabled = true;
+}

android/app/src/main/java/com/reactnativenavigation/bridge/parsers/ActivityParamsParser.java → android/app/src/main/java/com/reactnativenavigation/params/parsers/ActivityParamsParser.java

@@ -1,8 +1,8 @@
-package com.reactnativenavigation.bridge.parsers;
+package com.reactnativenavigation.params.parsers;
 
 import android.os.Bundle;
 
-import com.reactnativenavigation.controllers.ActivityParams;
+import com.reactnativenavigation.params.ActivityParams;
 
 public class ActivityParamsParser {
     public ActivityParams parse(Bundle params) {

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

@@ -0,0 +1,26 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.reactnativenavigation.params.ScreenParams;
+
+public class ScreenParamsParser {
+    private static final String KEY_TITLE = "title";
+    private static final String KEY_SCREEN_ID = "screenId";
+    private static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
+    private static final String KEY_PROPS = "passProps";
+    private static final String KEY_BUTTONS = "titleBarButtons";
+    private static final String STYLE_PARAMS = "styleParams";
+
+    public ScreenParams parse(Bundle params) {
+        ScreenParams result = new ScreenParams();
+        result.screenId = params.getString(KEY_SCREEN_ID);
+        result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
+        result.passProps = params.getBundle(KEY_PROPS);
+        result.buttons = new TitleBarButtonParamsParser().parse(params.getBundle(KEY_BUTTONS));
+        result.title = params.getString(KEY_TITLE);
+        result.styleParams = new ScreenStyleParamsParser().parse(params.getBundle(STYLE_PARAMS));
+        return result;
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.reactnativenavigation.params.ScreenStyleParams;
+
+public class ScreenStyleParamsParser {
+    public ScreenStyleParams parse(Bundle params) {
+        ScreenStyleParams result = new ScreenStyleParams();
+        result.statusBarColor = params.getInt("statusBarColor");
+        result.topBarColor = params.getInt("topBarColor");
+        result.navigationBarColor = params.getInt("navigationBarColor");
+        result.titleBarHidden = params.getBoolean("titleBarHidden");
+        result.backButtonHidden = params.getBoolean("backButtonHidden");
+        result.topTabsHidden = params.getBoolean("topTabsHidden");
+        result.bottomTabsHidden = params.getBoolean("bottomTabsHidden");
+        result.bottomTabsHiddenOnScroll = params.getBoolean("bottomTabsHiddenOnScroll");
+        return result;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.react.ImageLoader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TitleBarButtonParamsParser {
+    public List<TitleBarButtonParams> parse(Bundle params) {
+        List<TitleBarButtonParams> result = new ArrayList<>();
+        for (String key : params.keySet()) {
+            result.add(parseItem(params.getBundle(key)));
+        }
+        return result;
+    }
+
+    private TitleBarButtonParams parseItem(Bundle bundle) {
+        TitleBarButtonParams result = new TitleBarButtonParams();
+        result.label = bundle.getString("label");
+        result.icon = ImageLoader.loadImage(bundle.getString("icon"));
+        result.color = bundle.getInt("color");
+        result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
+        result.enabled = bundle.getBoolean("enabled");
+        return result;
+    }
+
+    private TitleBarButtonParams.ShowAsAction parseShowAsAction(String showAsAction) {
+        switch (showAsAction) {
+            case "Always":
+                return TitleBarButtonParams.ShowAsAction.Always;
+            case "Never":
+                return TitleBarButtonParams.ShowAsAction.Never;
+            case "WithText":
+                return TitleBarButtonParams.ShowAsAction.WithText;
+            case "IfRoom":
+            default:
+                return TitleBarButtonParams.ShowAsAction.IfRoom;
+        }
+    }
+}

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

@@ -1,7 +1,5 @@
 package com.reactnativenavigation.views;
 
-import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.ActionMenuView;
 import android.view.Menu;
@@ -9,47 +7,19 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
+import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.utils.ImageUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 
 import java.util.ArrayList;
 
 public class TitleBarButton {
-    public static class Params {
-        public enum ShowAsAction {
-            IfRoom(MenuItem.SHOW_AS_ACTION_IF_ROOM),
-            Always(MenuItem.SHOW_AS_ACTION_ALWAYS),
-            Never(MenuItem.SHOW_AS_ACTION_NEVER),
-            WithText(MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-
-            int action;
-
-            ShowAsAction(int action) {
-                this.action = action;
-            }
-        }
-
-        // Todo: add id for click listener
-        private final String label;
-        private final Drawable icon;
-        @ColorInt
-        private final int color;
-        private final ShowAsAction showAsAction;
-        private final boolean enabled = true;
-
-        public Params(String label, Drawable icon, int color, ShowAsAction showAsAction) {
-            this.label = label;
-            this.icon = icon;
-            this.color = color;
-            this.showAsAction = showAsAction;
-        }
-    }
 
     private final Menu menu;
     private final ActionMenuView parent;
-    private Params buttonParams;
+    private TitleBarButtonParams buttonParams;
 
-    public TitleBarButton(Menu menu, ActionMenuView parent, Params buttonParams) {
+    public TitleBarButton(Menu menu, ActionMenuView parent, TitleBarButtonParams buttonParams) {
         this.menu = menu;
         this.parent = parent;
         this.buttonParams = buttonParams;