|
@@ -94,7 +94,6 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
|
94
|
94
|
}
|
95
|
95
|
}
|
96
|
96
|
|
97
|
|
-
|
98
|
97
|
@Override
|
99
|
98
|
public boolean onCreateOptionsMenu(Menu menu) {
|
100
|
99
|
boolean ret = super.onCreateOptionsMenu(menu);
|
|
@@ -142,23 +141,21 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
|
142
|
141
|
setNavigationStyle(mScreenStacks.get(mCurrentStackPosition).peek());
|
143
|
142
|
}
|
144
|
143
|
|
145
|
|
-
|
146
|
144
|
private static class SetupTabsTask extends AsyncTask<Void, Void, Map<Screen, Drawable>> {
|
147
|
|
-
|
148
|
|
- private BottomTabActivity activity;
|
149
|
|
- private ArrayList<Screen> screens;
|
|
145
|
+ private BottomTabActivity mActivity;
|
|
146
|
+ private ArrayList<Screen> mScreens;
|
150
|
147
|
|
151
|
148
|
public SetupTabsTask(BottomTabActivity context, ArrayList<Screen> screens) {
|
152
|
|
- this.activity = context;
|
153
|
|
- this.screens = screens;
|
|
149
|
+ mActivity = context;
|
|
150
|
+ mScreens = screens;
|
154
|
151
|
}
|
155
|
152
|
|
156
|
153
|
@Override
|
157
|
154
|
protected Map<Screen, Drawable> doInBackground(Void... params) {
|
158
|
155
|
Map<Screen, Drawable> icons = new HashMap<>();
|
159
|
|
- for (Screen screen : this.screens) {
|
|
156
|
+ for (Screen screen : mScreens) {
|
160
|
157
|
if (screen.icon != null) {
|
161
|
|
- icons.put(screen, screen.getIcon(this.activity));
|
|
158
|
+ icons.put(screen, screen.getIcon(this.mActivity));
|
162
|
159
|
}
|
163
|
160
|
}
|
164
|
161
|
return icons;
|
|
@@ -166,7 +163,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
|
166
|
163
|
|
167
|
164
|
@Override
|
168
|
165
|
protected void onPostExecute(Map<Screen, Drawable> icons) {
|
169
|
|
- activity.setTabsWithIcons(this.screens, icons);
|
|
166
|
+ mActivity.setTabsWithIcons(mScreens, icons);
|
170
|
167
|
}
|
171
|
168
|
}
|
172
|
169
|
|