Merge pull request #83 from the-mx-group/android_style_fixes

Android style fixes

android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java

@@ -157,6 +157,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
 
     public Screen resetTo(Screen screen) {
         super.resetTo(screen);
+        StyleHelper.updateStyles(mToolbar, screen);
         return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
     }
 

android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java

@@ -76,6 +76,7 @@ public class SingleScreenActivity extends BaseReactActivity {
     public Screen resetTo(Screen screen) {
         super.resetTo(screen);
         Screen popped = mScreenStack.resetTo(screen);
+        StyleHelper.updateStyles(mToolbar, screen);
         return popped;
     }
 

android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java

@@ -7,6 +7,7 @@ import com.reactnativenavigation.R;
 import com.reactnativenavigation.adapters.ViewPagerAdapter;
 import com.reactnativenavigation.core.RctManager;
 import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.utils.StyleHelper;
 import com.reactnativenavigation.views.RnnTabLayout;
 import com.reactnativenavigation.views.RnnToolBar;
 
@@ -68,7 +69,7 @@ public class TabActivity extends BaseReactActivity {
     @Override
     public void push(Screen screen) {
         super.push(screen);
-        setNavigationStyle(screen);
+        StyleHelper.updateStyles(mToolbar, screen);
         mAdapter.push(screen);
     }
 

src/platformSpecific.android.js

@@ -73,7 +73,7 @@ function navigatorPop(navigator, params) {
 function navigatorPopToRoot(navigator, params) {
   RctActivity.navigatorPopToRoot({
     navigatorID: navigator.navigatorID,
-    animated: !(params.animated !== false)
+    animated: !(params.animated === false)
   });
 }
 
@@ -157,7 +157,7 @@ function addNavigatorButtons(screen) {
 
 function addNavigationStyleParams(screen) {
   const Screen = Navigation.getRegisteredScreen(screen.screen);
-  screen.navigatorStyle = Screen.navigatorStyle;
+  screen.navigatorStyle = Object.assign({}, screen.navigatorStyle, Screen.navigatorStyle);
 }
 
 export default {