Browse Source

Remove redundant code related to toolbar styling

Guy Carmeli 8 years ago
parent
commit
e53995b7f6

+ 0
- 7
android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java View File

103
         }
103
         }
104
     }
104
     }
105
 
105
 
106
-    @Override
107
-    public boolean onCreateOptionsMenu(Menu menu) {
108
-        boolean ret = super.onCreateOptionsMenu(menu);
109
-        mToolbar.handleOnCreateOptionsMenuAsync();
110
-        return ret;
111
-    }
112
-
113
     @Override
106
     @Override
114
     public void push(Screen screen) {
107
     public void push(Screen screen) {
115
         super.push(screen);
108
         super.push(screen);

+ 0
- 1
android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java View File

49
     }
49
     }
50
 
50
 
51
     protected void setupToolbar(Screen screen) {
51
     protected void setupToolbar(Screen screen) {
52
-        mToolbar.update(screen);
53
         StyleHelper.updateStyles(mToolbar, screen);
52
         StyleHelper.updateStyles(mToolbar, screen);
54
     }
53
     }
55
 
54
 

+ 0
- 1
android/app/src/main/java/com/reactnativenavigation/utils/StyleHelper.java View File

18
         try {
18
         try {
19
             toolBar.updateAndSetButtons(screen);
19
             toolBar.updateAndSetButtons(screen);
20
             setWindowStyle(screen);
20
             setWindowStyle(screen);
21
-            toolBar.setupToolbarButtonsAsync(screen);
22
         } catch (Exception e) {
21
         } catch (Exception e) {
23
             Log.w("RNNavigation", "Tried to update styles with no screen!");
22
             Log.w("RNNavigation", "Tried to update styles with no screen!");
24
         }
23
         }