Procházet zdrojové kódy

merged from master

Daniel Zlotin před 8 roky
rodič
revize
6fd3e8914f

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

@@ -16,6 +16,7 @@ public class StyleParamsParser {
16 16
     public StyleParams parse() {
17 17
         StyleParams result = new StyleParams();
18 18
         if (params == null) {
19
+            result.titleBarDisabledButtonColor = getTitleBarDisabledButtonColor();
19 20
             return result;
20 21
         }
21 22
 
@@ -201,9 +202,7 @@ public class StyleParamsParser {
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 Zobrazit soubor

@@ -137,6 +137,11 @@ export default class FirstTabScreen extends Component {
137 137
     Navigation.startSingleScreenApp({
138 138
       screen: {
139 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 Zobrazit soubor

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