Browse Source

Fix BottomTabs style after pop

Guy Carmeli 8 years ago
parent
commit
488a563c14

+ 7
- 3
android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java View File

79
     public boolean onBackPressed() {
79
     public boolean onBackPressed() {
80
         if (getCurrentScreenStack().canPop()) {
80
         if (getCurrentScreenStack().canPop()) {
81
             getCurrentScreenStack().pop();
81
             getCurrentScreenStack().pop();
82
-            bottomTabs.setStyleFromScreen(getCurrentScreenStack().getCurrentScreenStyleParams());
82
+            setBottomTabsStyleFromCurrentScreen();
83
             return true;
83
             return true;
84
         } else {
84
         } else {
85
             return false;
85
             return false;
123
     @Override
123
     @Override
124
     public void pop(ScreenParams screenParams) {
124
     public void pop(ScreenParams screenParams) {
125
         getCurrentScreenStack().pop();
125
         getCurrentScreenStack().pop();
126
-        bottomTabs.setStyleFromScreen(screenParams.styleParams);
126
+        setBottomTabsStyleFromCurrentScreen();
127
     }
127
     }
128
 
128
 
129
     @Override
129
     @Override
130
     public void popToRoot(ScreenParams params) {
130
     public void popToRoot(ScreenParams params) {
131
         getCurrentScreenStack().popToRoot();
131
         getCurrentScreenStack().popToRoot();
132
-        bottomTabs.setStyleFromScreen(getCurrentScreenStack().getCurrentScreenStyleParams());
132
+        setBottomTabsStyleFromCurrentScreen();
133
     }
133
     }
134
 
134
 
135
     @Override
135
     @Override
176
     private ScreenStack getCurrentScreenStack() {
176
     private ScreenStack getCurrentScreenStack() {
177
         return screenStacks[currentStackIndex];
177
         return screenStacks[currentStackIndex];
178
     }
178
     }
179
+
180
+    private void setBottomTabsStyleFromCurrentScreen() {
181
+        bottomTabs.setStyleFromScreen(getCurrentScreenStack().getCurrentScreenStyleParams());
182
+    }
179
 }
183
 }