Jason Skuby преди 8 години
родител
ревизия
0f69d1a91d

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java Целия файл

157
 
157
 
158
     public Screen resetTo(Screen screen) {
158
     public Screen resetTo(Screen screen) {
159
         super.resetTo(screen);
159
         super.resetTo(screen);
160
+        StyleHelper.updateStyles(mToolbar, screen);
160
         return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
161
         return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
161
     }
162
     }
162
 
163
 

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java Целия файл

76
     public Screen resetTo(Screen screen) {
76
     public Screen resetTo(Screen screen) {
77
         super.resetTo(screen);
77
         super.resetTo(screen);
78
         Screen popped = mScreenStack.resetTo(screen);
78
         Screen popped = mScreenStack.resetTo(screen);
79
+        StyleHelper.updateStyles(mToolbar, screen);
79
         return popped;
80
         return popped;
80
     }
81
     }
81
 
82
 

+ 2
- 1
android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java Целия файл

7
 import com.reactnativenavigation.adapters.ViewPagerAdapter;
7
 import com.reactnativenavigation.adapters.ViewPagerAdapter;
8
 import com.reactnativenavigation.core.RctManager;
8
 import com.reactnativenavigation.core.RctManager;
9
 import com.reactnativenavigation.core.objects.Screen;
9
 import com.reactnativenavigation.core.objects.Screen;
10
+import com.reactnativenavigation.utils.StyleHelper;
10
 import com.reactnativenavigation.views.RnnTabLayout;
11
 import com.reactnativenavigation.views.RnnTabLayout;
11
 import com.reactnativenavigation.views.RnnToolBar;
12
 import com.reactnativenavigation.views.RnnToolBar;
12
 
13
 
68
     @Override
69
     @Override
69
     public void push(Screen screen) {
70
     public void push(Screen screen) {
70
         super.push(screen);
71
         super.push(screen);
71
-        setNavigationStyle(screen);
72
+        StyleHelper.updateStyles(mToolbar, screen);
72
         mAdapter.push(screen);
73
         mAdapter.push(screen);
73
     }
74
     }
74
 
75