Browse Source

make static

Daniel Zlotin 8 years ago
parent
commit
25b8f55b62

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java View File

56
     protected void onCreate(Bundle savedInstanceState) {
56
     protected void onCreate(Bundle savedInstanceState) {
57
         super.onCreate(savedInstanceState);
57
         super.onCreate(savedInstanceState);
58
 
58
 
59
-        ActivityParams params = new ActivityParamsParser().parse(getIntent().getBundleExtra(PARAMS_BUNDLE));
59
+        ActivityParams params = ActivityParamsParser.parse(getIntent().getBundleExtra(PARAMS_BUNDLE));
60
 
60
 
61
         modalController = new ModalController();
61
         modalController = new ModalController();
62
         navigationReactInstance = new NavigationReactInstance(this);
62
         navigationReactInstance = new NavigationReactInstance(this);

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/core/objects/JsonObject.java View File

28
     protected Integer getColor(ReadableMap map, String key) {
28
     protected Integer getColor(ReadableMap map, String key) {
29
         return map.hasKey(key) ? Color.parseColor(map.getString(key)) : null;
29
         return map.hasKey(key) ? Color.parseColor(map.getString(key)) : null;
30
     }
30
     }
31
-    
31
+
32
     protected Boolean getBoolean(ReadableMap map, String key) {
32
     protected Boolean getBoolean(ReadableMap map, String key) {
33
         return map.hasKey(key) && map.getBoolean(key);
33
         return map.hasKey(key) && map.getBoolean(key);
34
     }
34
     }

+ 2
- 2
android/app/src/main/java/com/reactnativenavigation/params/parsers/ActivityParamsParser.java View File

5
 import com.reactnativenavigation.params.ActivityParams;
5
 import com.reactnativenavigation.params.ActivityParams;
6
 
6
 
7
 public class ActivityParamsParser {
7
 public class ActivityParamsParser {
8
-    public ActivityParams parse(Bundle params) {
8
+    public static ActivityParams parse(Bundle params) {
9
         ActivityParams result = new ActivityParams();
9
         ActivityParams result = new ActivityParams();
10
-        result.screenParams = new ScreenParamsParser().parse(params);
10
+        result.screenParams = ScreenParamsParser.parse(params);
11
         return result;
11
         return result;
12
     }
12
     }
13
 }
13
 }

+ 4
- 0
android/app/src/main/java/com/reactnativenavigation/params/parsers/ColorParser.java View File

1
+package com.reactnativenavigation.params.parsers;
2
+
3
+public class ColorParser {
4
+}

+ 3
- 4
android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java View File

12
     private static final String KEY_BUTTONS = "titleBarButtons";
12
     private static final String KEY_BUTTONS = "titleBarButtons";
13
     private static final String STYLE_PARAMS = "styleParams";
13
     private static final String STYLE_PARAMS = "styleParams";
14
 
14
 
15
-    public ScreenParams parse(Bundle params) {
15
+    public static ScreenParams parse(Bundle params) {
16
         ScreenParams result = new ScreenParams();
16
         ScreenParams result = new ScreenParams();
17
         result.screenId = params.getString(KEY_SCREEN_ID);
17
         result.screenId = params.getString(KEY_SCREEN_ID);
18
         result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
18
         result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
19
         result.passProps = params.getBundle(KEY_PROPS);
19
         result.passProps = params.getBundle(KEY_PROPS);
20
-        result.buttons = new TitleBarButtonParamsParser().parse(params.getBundle(KEY_BUTTONS));
20
+        result.buttons = TitleBarButtonParamsParser.parse(params.getBundle(KEY_BUTTONS));
21
         result.title = params.getString(KEY_TITLE);
21
         result.title = params.getString(KEY_TITLE);
22
-        result.styleParams = new ScreenStyleParamsParser().parse(params.getBundle(STYLE_PARAMS));
22
+        result.styleParams = ScreenStyleParamsParser.parse(params.getBundle(STYLE_PARAMS));
23
         return result;
23
         return result;
24
     }
24
     }
25
-
26
 }
25
 }

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenStyleParamsParser.java View File

5
 import com.reactnativenavigation.params.ScreenStyleParams;
5
 import com.reactnativenavigation.params.ScreenStyleParams;
6
 
6
 
7
 public class ScreenStyleParamsParser {
7
 public class ScreenStyleParamsParser {
8
-    public ScreenStyleParams parse(Bundle params) {
8
+    public static ScreenStyleParams parse(Bundle params) {
9
         ScreenStyleParams result = new ScreenStyleParams();
9
         ScreenStyleParams result = new ScreenStyleParams();
10
         result.statusBarColor = params.getInt("statusBarColor");
10
         result.statusBarColor = params.getInt("statusBarColor");
11
         result.topBarColor = params.getInt("topBarColor");
11
         result.topBarColor = params.getInt("topBarColor");

+ 7
- 7
android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarButtonParamsParser.java View File

9
 import java.util.List;
9
 import java.util.List;
10
 
10
 
11
 public class TitleBarButtonParamsParser {
11
 public class TitleBarButtonParamsParser {
12
-    public List<TitleBarButtonParams> parse(Bundle params) {
12
+    public static List<TitleBarButtonParams> parse(Bundle params) {
13
         List<TitleBarButtonParams> result = new ArrayList<>();
13
         List<TitleBarButtonParams> result = new ArrayList<>();
14
         for (String key : params.keySet()) {
14
         for (String key : params.keySet()) {
15
             result.add(parseItem(params.getBundle(key)));
15
             result.add(parseItem(params.getBundle(key)));
17
         return result;
17
         return result;
18
     }
18
     }
19
 
19
 
20
-    private TitleBarButtonParams parseItem(Bundle bundle) {
20
+    private static TitleBarButtonParams parseItem(Bundle bundle) {
21
         TitleBarButtonParams result = new TitleBarButtonParams();
21
         TitleBarButtonParams result = new TitleBarButtonParams();
22
         result.label = bundle.getString("label");
22
         result.label = bundle.getString("label");
23
         result.icon = ImageLoader.loadImage(bundle.getString("icon"));
23
         result.icon = ImageLoader.loadImage(bundle.getString("icon"));
27
         return result;
27
         return result;
28
     }
28
     }
29
 
29
 
30
-    private TitleBarButtonParams.ShowAsAction parseShowAsAction(String showAsAction) {
30
+    private static TitleBarButtonParams.ShowAsAction parseShowAsAction(String showAsAction) {
31
         switch (showAsAction) {
31
         switch (showAsAction) {
32
-            case "Always":
32
+            case "always":
33
                 return TitleBarButtonParams.ShowAsAction.Always;
33
                 return TitleBarButtonParams.ShowAsAction.Always;
34
-            case "Never":
34
+            case "never":
35
                 return TitleBarButtonParams.ShowAsAction.Never;
35
                 return TitleBarButtonParams.ShowAsAction.Never;
36
-            case "WithText":
36
+            case "withText":
37
                 return TitleBarButtonParams.ShowAsAction.WithText;
37
                 return TitleBarButtonParams.ShowAsAction.WithText;
38
-            case "IfRoom":
38
+            case "ifRoom":
39
             default:
39
             default:
40
                 return TitleBarButtonParams.ShowAsAction.IfRoom;
40
                 return TitleBarButtonParams.ShowAsAction.IfRoom;
41
         }
41
         }