From d8d8ad96e4f20738bad025dbbe08df4a22ad2662 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 21 May 2021 08:31:05 +0900 Subject: [PATCH] move all home references to base activity --- .../dkanada/gramophone/activities/AboutActivity.java | 10 ---------- .../dkanada/gramophone/activities/LoginActivity.java | 10 ---------- .../dkanada/gramophone/activities/SearchActivity.java | 9 --------- .../dkanada/gramophone/activities/SelectActivity.java | 10 ---------- .../gramophone/activities/SettingsActivity.java | 11 ----------- .../gramophone/activities/base/AbsBaseActivity.java | 11 +++++++++++ .../activities/details/AlbumDetailActivity.java | 3 --- .../activities/details/ArtistDetailActivity.java | 3 --- .../activities/details/GenreDetailActivity.java | 3 --- .../activities/details/PlaylistDetailActivity.java | 3 --- 10 files changed, 11 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java index 1636955c..1f5deffd 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java @@ -103,16 +103,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen thanksBinding.adrianWebsite.setOnClickListener(this); } - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - - return super.onOptionsItemSelected(item); - } - private static String getCurrentVersionName(@NonNull final Context context) { try { return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName; diff --git a/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java index b4846485..99ab61ab 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java @@ -67,16 +67,6 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen binding.select.setOnClickListener(this); } - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - - return super.onOptionsItemSelected(item); - } - @Override public void onClick(View v) { if (v == binding.select) { diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java index e9c8dae4..5ca4e9e9 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java @@ -134,15 +134,6 @@ public class SearchActivity extends AbsMusicContentActivity implements SearchVie return super.onCreateOptionsMenu(menu); } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - } - - return super.onOptionsItemSelected(item); - } - private void search(@NonNull String query) { this.query = query; diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java index af6deb15..fa1e3339 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java @@ -59,14 +59,4 @@ public class SelectActivity extends AbsBaseActivity { super.onPause(); overridePendingTransition(0, R.anim.fade_quick); } - - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java index bf22e2a9..9edfcdd2 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java @@ -3,7 +3,6 @@ package com.dkanada.gramophone.activities; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; -import android.view.MenuItem; import android.view.View; import androidx.annotation.ColorInt; @@ -77,16 +76,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia public void onColorChooserDismissed(@NonNull ColorChooserDialog dialog) { } - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - - return super.onOptionsItemSelected(item); - } - public static class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { @Override public void onCreatePreferences(Bundle bundle, String s) { diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java index 541fa204..22f11362 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java @@ -9,6 +9,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.PowerManager; import android.provider.Settings; +import android.view.MenuItem; import android.view.View; import androidx.annotation.NonNull; @@ -83,6 +84,16 @@ public abstract class AbsBaseActivity extends AbsThemeActivity { } } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + + return super.onOptionsItemSelected(item); + } + protected View getPermissionWindow() { return getWindow().getDecorView(); } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java index 677dc5e8..2e0da8cf 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java @@ -191,9 +191,6 @@ public class AlbumDetailActivity extends AbsMusicContentActivity implements Pale case R.id.action_add_to_playlist: AddToPlaylistDialog.create(songs).show(getSupportFragmentManager(), "ADD_PLAYLIST"); return true; - case android.R.id.home: - super.onBackPressed(); - return true; case R.id.action_go_to_artist: NavigationUtil.startArtist(this, new Artist(album), null); return true; diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java index fa48f8c9..030d33c5 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java @@ -221,9 +221,6 @@ public class ArtistDetailActivity extends AbsMusicContentActivity implements Pal case R.id.action_download: NavigationUtil.startDownload(this, songs); return true; - case android.R.id.home: - super.onBackPressed(); - return true; case R.id.action_colored_footers: item.setChecked(!item.isChecked()); setUsePalette(item.isChecked()); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java index 17974150..d11a6bf5 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java @@ -112,9 +112,6 @@ public class GenreDetailActivity extends AbsMusicContentActivity implements CabH case R.id.action_download: NavigationUtil.startDownload(this, adapter.getDataSet()); return true; - case android.R.id.home: - onBackPressed(); - return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java index 576e0e17..18f31883 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java @@ -136,9 +136,6 @@ public class PlaylistDetailActivity extends AbsMusicContentActivity implements C case R.id.action_download: NavigationUtil.startDownload(this, adapter.getDataSet()); return true; - case android.R.id.home: - onBackPressed(); - return true; } return PlaylistMenuHelper.handleMenuClick(this, playlist, item);