Browse Source

merged from master

Daniel Zlotin 8 years ago
parent
commit
6fd3e8914f

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

16
     public StyleParams parse() {
16
     public StyleParams parse() {
17
         StyleParams result = new StyleParams();
17
         StyleParams result = new StyleParams();
18
         if (params == null) {
18
         if (params == null) {
19
+            result.titleBarDisabledButtonColor = getTitleBarDisabledButtonColor();
19
             return result;
20
             return result;
20
         }
21
         }
21
 
22
 
201
         }
202
         }
202
     }
203
     }
203
 
204
 
204
-    private int getInt(String selectedTopTabIndicatorHeight, int defaultSelectedTopTabIndicatorHeight) {
205
-        return params.containsKey(selectedTopTabIndicatorHeight) ?
206
-                (int) params.getDouble(selectedTopTabIndicatorHeight) :
207
-                defaultSelectedTopTabIndicatorHeight;
205
+    private int getInt(String key, int defaultValue) {
206
+        return params.containsKey(key) ? params.getInt(key) : defaultValue;
208
     }
207
     }
209
 }
208
 }

+ 5
- 0
example/src/screens/FirstTabScreen.js View File

137
     Navigation.startSingleScreenApp({
137
     Navigation.startSingleScreenApp({
138
       screen: {
138
       screen: {
139
         screen: 'example.FirstTabScreen'
139
         screen: 'example.FirstTabScreen'
140
+      },
141
+      drawer: {
142
+        left: {
143
+          screen: 'example.SideMenu'
144
+        }
140
       }
145
       }
141
     });
146
     });
142
   }
147
   }

+ 3
- 0
src/deprecated/platformSpecificDeprecated.android.js View File

413
         fab.expendedIcon = expendedIconUri.uri;
413
         fab.expendedIcon = expendedIconUri.uri;
414
       }
414
       }
415
     }
415
     }
416
+    if (fab.backgroundColor) {
417
+      fab.backgroundColor = processColor(fab.backgroundColor);
418
+    }
416
 
419
 
417
     if (fab.actions) {
420
     if (fab.actions) {
418
       _.forEach(fab.actions, (action) => {
421
       _.forEach(fab.actions, (action) => {