npm
/
react-native-navigation
Watch 11
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/wix/react-native-navigation

Daniel Zlotin 7 years ago
parent
34052a901d 67db72fdb5
commit
55ddf850c9
1 changed files with 1 additions and 2 deletions
Unified View Show Diff Stats
  1. 1
    2
      android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarButtonParamsParser.java

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

26 
             result.icon = ImageLoader.loadImage(bundle.getString("icon"));
 26 
             result.icon = ImageLoader.loadImage(bundle.getString("icon"));
27 
         }
 27 
         }
28 
         result.color = getColor(bundle, "color", AppStyle.appStyle.titleBarButtonColor);
 28 
         result.color = getColor(bundle, "color", AppStyle.appStyle.titleBarButtonColor);
29 
-        result.disabledColor =
30 
-                getColor(bundle, "titleBarDisabledButtonColor", AppStyle.appStyle.titleBarDisabledButtonColor);
29 
+        result.disabledColor = getColor(bundle, "titleBarDisabledButtonColor", AppStyle.appStyle.titleBarDisabledButtonColor);
31 
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
 30 
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
32 
         result.enabled = bundle.getBoolean("enabled", true);
 31 
         result.enabled = bundle.getBoolean("enabled", true);
33 
         result.hint = bundle.getString("hint", "");
 32 
         result.hint = bundle.getString("hint", "");