Make tabBarHideShadow to be configurable on Android (#2990)

wix · Apr 10, 2018 · 033cb61 · 033cb61
1 parent f075b1a
commit 033cb61
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java b/android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java
@@ -145,6 +145,7 @@ public String toString() {
     public int bottomTabsInitialIndex;
     public boolean bottomTabsHidden;
     public boolean bottomTabsHiddenOnScroll;
+    public boolean bottomTabsHideShadow;
     public Color bottomTabsColor;
     public Color selectedBottomTabsButtonColor;
     public Color bottomTabsButtonColor;

diff --git a/android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java b/android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java
@@ -86,6 +86,8 @@ public StyleParams parse() {
 
         result.bottomTabsInitialIndex = getInt("initialTabIndex", 0);
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
+        result.bottomTabsHideShadow = getBoolean("bottomTabsHideShadow", false);
+
         result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
                                            params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
         if (result.titleBarHideOnScroll) {

diff --git a/android/app/src/main/java/com/reactnativenavigation/views/BottomTabs.java b/android/app/src/main/java/com/reactnativenavigation/views/BottomTabs.java
@@ -27,6 +27,7 @@ public BottomTabs(Context context) {
         setStyle();
         setFontFamily();
         setFontSize();
+        setTabsHideShadow();
     }
 
     public void addTabs(List<ScreenParams> params, OnTabSelectedListener onTabSelectedListener) {
@@ -163,4 +164,8 @@ private void setFontSize() {
             setTitleTextSizeInSp(AppStyle.appStyle.bottomTabSelectedFontSize, AppStyle.appStyle.bottomTabFontSize);
         }
     }
+
+    private void setTabsHideShadow() {
+        setUseElevation(!AppStyle.appStyle.bottomTabsHideShadow);
+    }
 }
diff --git a/docs/styling-the-tab-bar.md b/docs/styling-the-tab-bar.md
@@ -24,7 +24,7 @@ Navigation.startTabBasedApp({
   tabBarLabelColor: '#ffb700', // iOS only. change the color of tab text
   tabBarSelectedLabelColor: 'red', // iOS only. change the color of the selected tab text
   forceTitlesDisplay: true, // Android only. If true - Show all bottom tab labels. If false - only the selected tab's label is visible.
-  tabBarHideShadow: true // iOS only. Remove default tab bar top shadow (hairline)
+  tabBarHideShadow: true // Remove default tab bar top shadow (hairline)
 }
 ```
 
@@ -36,6 +36,7 @@ Navigation.startTabBasedApp({
   appStyle: {
     tabBarBackgroundColor: '#0f2362',
     tabBarButtonColor: '#ffffff',
+    tabBarHideShadow: true,
     tabBarSelectedButtonColor: '#63d7cc',
     tabBarTranslucent: false,
     tabFontFamily: 'Avenir-Medium',  // existing font family name or asset file without extension which can be '.ttf' or '.otf' (searched only if '.ttf' asset not found)

diff --git a/src/deprecated/platformSpecificDeprecated.android.js b/src/deprecated/platformSpecificDeprecated.android.js
@@ -224,6 +224,7 @@ function convertStyleParams(originalStyleObject) {
     bottomTabsSelectedButtonColor: processColor(originalStyleObject.tabBarSelectedButtonColor),
     bottomTabsHidden: originalStyleObject.tabBarHidden,
     bottomTabsHiddenOnScroll: originalStyleObject.bottomTabsHiddenOnScroll,
+    bottomTabsHideShadow: originalStyleObject.tabBarHideShadow,
     forceTitlesDisplay: originalStyleObject.forceTitlesDisplay,
     bottomTabBadgeTextColor: processColor(originalStyleObject.bottomTabBadgeTextColor),
     bottomTabBadgeBackgroundColor: processColor(originalStyleObject.bottomTabBadgeBackgroundColor),