From 0f69d1a91de2f4b2c1564b987d2ee65b87405c64 Mon Sep 17 00:00:00 2001 From: Jason Skuby Date: Thu, 23 Jun 2016 23:31:03 -0500 Subject: [PATCH 1/2] Style fixes --- .../reactnativenavigation/activities/BottomTabActivity.java | 1 + .../reactnativenavigation/activities/SingleScreenActivity.java | 1 + .../java/com/reactnativenavigation/activities/TabActivity.java | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java b/android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java index 1b59cc55eac..9688437f26e 100644 --- a/android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java +++ b/android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java @@ -157,6 +157,7 @@ public Screen getCurrentScreen() { public Screen resetTo(Screen screen) { super.resetTo(screen); + StyleHelper.updateStyles(mToolbar, screen); return mScreenStacks.get(mCurrentStackPosition).resetTo(screen); } diff --git a/android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java b/android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java index 3c48bbae88c..d1b4fea12d2 100644 --- a/android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java +++ b/android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java @@ -76,6 +76,7 @@ public Screen popToRoot(String navigatorId) { public Screen resetTo(Screen screen) { super.resetTo(screen); Screen popped = mScreenStack.resetTo(screen); + StyleHelper.updateStyles(mToolbar, screen); return popped; } diff --git a/android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java b/android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java index 58a97d00766..6e24fa763fa 100644 --- a/android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java +++ b/android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java @@ -7,6 +7,7 @@ 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 boolean onCreateOptionsMenu(Menu menu) { @Override public void push(Screen screen) { super.push(screen); - setNavigationStyle(screen); + StyleHelper.updateStyles(mToolbar, screen); mAdapter.push(screen); } From a37239d2a2a950e1ab79f4685e4be16074838926 Mon Sep 17 00:00:00 2001 From: Jason Skuby Date: Thu, 23 Jun 2016 23:56:40 -0500 Subject: [PATCH 2/2] Inherit from base navigation styles so nav bar updates properly on screen change --- src/platformSpecific.android.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platformSpecific.android.js b/src/platformSpecific.android.js index 6872ab16b77..b3782a5dfb1 100644 --- a/src/platformSpecific.android.js +++ b/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 {