Guy Carmeli преди 8 години
родител
ревизия
55bbd02011

+ 8
- 0
android/app/src/main/java/com/reactnativenavigation/params/parsers/ColorParser.java Целия файл

1
 package com.reactnativenavigation.params.parsers;
1
 package com.reactnativenavigation.params.parsers;
2
 
2
 
3
+import android.graphics.Color;
4
+import android.support.annotation.ColorInt;
5
+
6
+//TODO move to JS
3
 public class ColorParser {
7
 public class ColorParser {
8
+    @ColorInt
9
+    public static int parse(String str) {
10
+        return Color.parseColor(str);
11
+    }
4
 }
12
 }

+ 3
- 3
android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenStyleParamsParser.java Целия файл

7
 public class ScreenStyleParamsParser {
7
 public class ScreenStyleParamsParser {
8
     public static 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");
11
-        result.topBarColor = params.getInt("topBarColor");
12
-        result.navigationBarColor = params.getInt("navigationBarColor");
10
+        result.statusBarColor = ColorParser.parse(params.getString("statusBarColor"));
11
+        result.topBarColor = ColorParser.parse(params.getString("topBarColor"));
12
+        result.navigationBarColor = ColorParser.parse(params.getString("navigationBarColor"));
13
         result.titleBarHidden = params.getBoolean("titleBarHidden");
13
         result.titleBarHidden = params.getBoolean("titleBarHidden");
14
         result.backButtonHidden = params.getBoolean("backButtonHidden");
14
         result.backButtonHidden = params.getBoolean("backButtonHidden");
15
         result.topTabsHidden = params.getBoolean("topTabsHidden");
15
         result.topTabsHidden = params.getBoolean("topTabsHidden");

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarButtonParamsParser.java Целия файл

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"));
24
-        result.color = bundle.getInt("color");
24
+        result.color = ColorParser.parse(bundle.getString("color"));
25
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
25
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
26
         result.enabled = bundle.getBoolean("enabled");
26
         result.enabled = bundle.getBoolean("enabled");
27
         return result;
27
         return result;