Browse Source

Fix typo in topTabsScrollable property

Guy Carmeli 7 years ago
parent
commit
3948776dac

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java View File

@@ -70,7 +70,7 @@ public class StyleParams {
70 70
     public Color selectedTopTabIconColor;
71 71
     public int selectedTopTabIndicatorHeight;
72 72
     public Color selectedTopTabIndicatorColor;
73
-    public boolean topTabScrollable;
73
+    public boolean topTabsScrollable;
74 74
 
75 75
     public Color screenBackgroundColor;
76 76
 

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

@@ -52,7 +52,7 @@ public class StyleParamsParser {
52 52
         result.selectedTopTabTextColor = getColor("selectedTopTabTextColor", getDefaultSelectedTopTabTextColor());
53 53
         result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
54 54
         result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
55
-        result.topTabScrollable = getBoolean("topTabScrollable", getDefaultTopTabScrollable());
55
+        result.topTabsScrollable = getBoolean("topTabsScrollable", getDefaultTopTabsScrollable());
56 56
 
57 57
         result.screenBackgroundColor = getColor("screenBackgroundColor", getDefaultScreenBackgroundColor());
58 58
 
@@ -175,8 +175,8 @@ public class StyleParamsParser {
175 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 182
     private StyleParams.Color getDefaultTopTabIconColor() {

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/views/TopTabs.java View File

@@ -40,7 +40,7 @@ public class TopTabs extends TabLayout {
40 40
     }
41 41
 
42 42
     void setScrollable(StyleParams style) {
43
-        if (style.topTabScrollable) {
43
+        if (style.topTabsScrollable) {
44 44
             setTabMode(TabLayout.MODE_SCROLLABLE);
45 45
         } else {
46 46
             setTabMode(TabLayout.MODE_FIXED);

+ 1
- 1
src/deprecated/platformSpecificDeprecated.android.js View File

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