Skip to content

Commit 7adce86

Browse files
fix: redundant top app bar in ReadArticleActivity
1 parent 53ac42a commit 7adce86

File tree

1 file changed

+19
-28
lines changed

1 file changed

+19
-28
lines changed

app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ public class ReadArticleActivity extends AppCompatActivity {
162162
private boolean onPageFinishedCallPostponedUntilResume;
163163
private boolean loadingFinished;
164164

165+
private MaterialToolbar toolbar;
166+
165167
@Override
166168
public void onCreate(Bundle savedInstanceState) {
167169
// not sure if it is relevant to WebView
@@ -188,14 +190,12 @@ public void onCreate(Bundle savedInstanceState) {
188190
super.onCreate(savedInstanceState);
189191
setContentView(R.layout.article);
190192

191-
MaterialToolbar toolbar = findViewById(R.id.toolbar);
193+
toolbar = findViewById(R.id.toolbar);
192194
toolbar.setNavigationOnClickListener(v -> onBackPressed());
193-
setSupportActionBar(toolbar);
194195

195196
if (fullscreenArticleView) {
196-
ActionBar actionBar = getSupportActionBar();
197-
if (actionBar != null) {
198-
actionBar.hide();
197+
if (toolbar != null) {
198+
toolbar.setVisibility(View.GONE);
199199
}
200200
}
201201

@@ -231,10 +231,19 @@ public void onCreate(Bundle savedInstanceState) {
231231
annotationsEnabled = settings.isAnnotationsEnabled();
232232
onyxWorkaroundEnabled = settings.isOnyxWorkaroundEnabled();
233233

234-
setTitle(articleTitle);
234+
toolbar.setTitle(articleTitle);
235235

236236
// article is loaded - update menu
237-
invalidateOptionsMenu();
237+
Log.d(TAG, "Creating the menu");
238+
239+
toolbar.inflateMenu(R.menu.option_article);
240+
Menu menu = toolbar.getMenu();
241+
if (article != null) {
242+
articleActionsHelper.initMenu(menu, article);
243+
}
244+
menu.findItem(R.id.menuTTS).setChecked(ttsFragment != null);
245+
246+
toolbar.setOnMenuItemClickListener(this::onOptionsItemSelected);
238247

239248
scrollView = findViewById(R.id.scroll);
240249
scrollViewLastChild = scrollView.getChildAt(scrollView.getChildCount() - 1);
@@ -306,23 +315,6 @@ protected void onDestroy() {
306315
super.onDestroy();
307316
}
308317

309-
@Override
310-
public boolean onCreateOptionsMenu(Menu menu) {
311-
super.onCreateOptionsMenu(menu);
312-
313-
Log.d(TAG, "onCreateOptionsMenu() started");
314-
315-
getMenuInflater().inflate(R.menu.option_article, menu);
316-
317-
if (article != null) {
318-
articleActionsHelper.initMenu(menu, article);
319-
}
320-
321-
menu.findItem(R.id.menuTTS).setChecked(ttsFragment != null);
322-
323-
return true;
324-
}
325-
326318
@Override
327319
public boolean onOptionsItemSelected(MenuItem item) {
328320
switch (item.getItemId()) {
@@ -687,12 +679,11 @@ public void onHideCustomView() {
687679

688680
private void hideUi(boolean hide) {
689681
if (!fullscreenArticleView) {
690-
ActionBar actionBar = getSupportActionBar();
691-
if (actionBar != null) {
682+
if (toolbar != null) {
692683
if (hide) {
693-
actionBar.hide();
684+
toolbar.setVisibility(View.GONE);
694685
} else {
695-
actionBar.show();
686+
toolbar.setVisibility(View.VISIBLE);
696687
}
697688
}
698689
}

0 commit comments

Comments
 (0)