Bläddra i källkod

Fix typo in topTabsScrollable property

Guy Carmeli 8 år sedan
förälder
incheckning
3948776dac

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java Visa fil

70
     public Color selectedTopTabIconColor;
70
     public Color selectedTopTabIconColor;
71
     public int selectedTopTabIndicatorHeight;
71
     public int selectedTopTabIndicatorHeight;
72
     public Color selectedTopTabIndicatorColor;
72
     public Color selectedTopTabIndicatorColor;
73
-    public boolean topTabScrollable;
73
+    public boolean topTabsScrollable;
74
 
74
 
75
     public Color screenBackgroundColor;
75
     public Color screenBackgroundColor;
76
 
76
 

+ 3
- 3
android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java Visa fil

52
         result.selectedTopTabTextColor = getColor("selectedTopTabTextColor", getDefaultSelectedTopTabTextColor());
52
         result.selectedTopTabTextColor = getColor("selectedTopTabTextColor", getDefaultSelectedTopTabTextColor());
53
         result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
53
         result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
54
         result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
54
         result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
55
-        result.topTabScrollable = getBoolean("topTabScrollable", getDefaultTopTabScrollable());
55
+        result.topTabsScrollable = getBoolean("topTabsScrollable", getDefaultTopTabsScrollable());
56
 
56
 
57
         result.screenBackgroundColor = getColor("screenBackgroundColor", getDefaultScreenBackgroundColor());
57
         result.screenBackgroundColor = getColor("screenBackgroundColor", getDefaultScreenBackgroundColor());
58
 
58
 
175
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.topTabTextColor;
175
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.topTabTextColor;
176
     }
176
     }
177
 
177
 
178
-    private boolean getDefaultTopTabScrollable() {
179
-        return AppStyle.appStyle != null && AppStyle.appStyle.topTabScrollable;
178
+    private boolean getDefaultTopTabsScrollable() {
179
+        return AppStyle.appStyle != null && AppStyle.appStyle.topTabsScrollable;
180
     }
180
     }
181
 
181
 
182
     private StyleParams.Color getDefaultTopTabIconColor() {
182
     private StyleParams.Color getDefaultTopTabIconColor() {

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/views/TopTabs.java Visa fil

40
     }
40
     }
41
 
41
 
42
     void setScrollable(StyleParams style) {
42
     void setScrollable(StyleParams style) {
43
-        if (style.topTabScrollable) {
43
+        if (style.topTabsScrollable) {
44
             setTabMode(TabLayout.MODE_SCROLLABLE);
44
             setTabMode(TabLayout.MODE_SCROLLABLE);
45
         } else {
45
         } else {
46
             setTabMode(TabLayout.MODE_FIXED);
46
             setTabMode(TabLayout.MODE_FIXED);

+ 1
- 1
src/deprecated/platformSpecificDeprecated.android.js Visa fil

168
     selectedTopTabTextColor: processColor(originalStyleObject.selectedTopTabTextColor),
168
     selectedTopTabTextColor: processColor(originalStyleObject.selectedTopTabTextColor),
169
     selectedTopTabIndicatorHeight: originalStyleObject.selectedTopTabIndicatorHeight,
169
     selectedTopTabIndicatorHeight: originalStyleObject.selectedTopTabIndicatorHeight,
170
     selectedTopTabIndicatorColor: processColor(originalStyleObject.selectedTopTabIndicatorColor),
170
     selectedTopTabIndicatorColor: processColor(originalStyleObject.selectedTopTabIndicatorColor),
171
-    topTabScrollable: originalStyleObject.topTabScollable,
171
+    topTabsScrollable: originalStyleObject.topTabsScrollable,
172
     screenBackgroundColor: processColor(originalStyleObject.screenBackgroundColor),
172
     screenBackgroundColor: processColor(originalStyleObject.screenBackgroundColor),
173
 
173
 
174
     drawScreenAboveBottomTabs: !originalStyleObject.drawUnderTabBar,
174
     drawScreenAboveBottomTabs: !originalStyleObject.drawUnderTabBar,