Selaa lähdekoodia

Remove redundant code related to toolbar styling

Guy Carmeli 8 vuotta sitten
vanhempi
commit
e53995b7f6

+ 0
- 7
android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java Näytä tiedosto

@@ -103,13 +103,6 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
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 106
     @Override
114 107
     public void push(Screen screen) {
115 108
         super.push(screen);

+ 0
- 1
android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java Näytä tiedosto

@@ -49,7 +49,6 @@ public class SingleScreenActivity extends BaseReactActivity {
49 49
     }
50 50
 
51 51
     protected void setupToolbar(Screen screen) {
52
-        mToolbar.update(screen);
53 52
         StyleHelper.updateStyles(mToolbar, screen);
54 53
     }
55 54
 

+ 0
- 1
android/app/src/main/java/com/reactnativenavigation/utils/StyleHelper.java Näytä tiedosto

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