From a011c43fec9c7428013dcd5533a878ae78bb4587 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 25 Nov 2019 02:27:46 +0900 Subject: [PATCH] add two strings back and ignore artist activity result --- .../gramophone/adapter/album/AlbumAdapter.java | 2 +- .../gramophone/adapter/artist/ArtistAdapter.java | 4 ++-- .../gramophone/adapter/song/SongAdapter.java | 4 ++-- .../java/com/kabouzeid/gramophone/model/Artist.java | 2 -- .../java/com/kabouzeid/gramophone/model/Playlist.java | 5 +---- .../gramophone/model/playlist/FrequentPlaylist.java | 1 - .../gramophone/ui/activities/AboutActivity.java | 4 +--- .../gramophone/ui/activities/AlbumDetailActivity.java | 3 ++- .../ui/activities/ArtistDetailActivity.java | 11 ++--------- app/src/main/res/values/strings.xml | 2 ++ 10 files changed, 13 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java index d6453e7f..c1420b11 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java @@ -43,7 +43,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { super(activity, cabHolder, R.menu.menu_media_selection); diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java index a06671ff..b8ac3957 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java @@ -42,7 +42,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { super(activity, cabHolder, R.menu.menu_media_selection); @@ -168,7 +168,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter getSongList(@NonNull List artists) { final List songs = new ArrayList<>(); for (Artist artist : artists) { - songs.addAll(artist.getSongs()); // maybe async in future? + songs.addAll(artist.getSongs()); } return songs; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java index 84006e68..12a5e0e0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java @@ -43,8 +43,8 @@ public class SongAdapter extends AbsMultiSelectAdapter dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) { this(activity, dataSet, itemLayoutRes, usePalette, cabHolder, true); diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java b/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java index bb5ed9e6..38623b54 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java @@ -70,7 +70,6 @@ public class Artist implements Parcelable { Artist artist = (Artist) o; return albums != null ? albums.equals(artist.albums) : artist.albums == null; - } @Override @@ -85,7 +84,6 @@ public class Artist implements Parcelable { '}'; } - @Override public int describeContents() { return 0; diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java b/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java index a1458243..51531826 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java @@ -41,10 +41,7 @@ public class Playlist implements Parcelable { @Override public String toString() { - return "Playlist{" + - "id=" + id + - ", name='" + name + '\'' + - '}'; + return "Playlist{" + "id=" + id + ", name='" + name + '\'' + '}'; } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/playlist/FrequentPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/playlist/FrequentPlaylist.java index 77015186..c1ad60c9 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/playlist/FrequentPlaylist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/playlist/FrequentPlaylist.java @@ -31,7 +31,6 @@ public class FrequentPlaylist extends AbsSmartPlaylist { SongPlayCountStore.getInstance(context).clear(); } - @Override public int describeContents() { return 0; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java index b4f4f9d3..c4a58bac 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java @@ -14,11 +14,9 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.kabouzeid.appthemehelper.ThemeStore; -import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.dialogs.DonationsDialog; import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; -import com.kabouzeid.gramophone.ui.activities.bugreport.BugReportActivity; import butterknife.BindView; import butterknife.ButterKnife; @@ -172,7 +170,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen } else if (v == visitWebsite) { openUrl(WEBSITE); } else if (v == reportBugs) { - startActivity(new Intent(this, BugReportActivity.class)); + openUrl(GITHUB); } else if (v == writeAnEmail) { Intent intent = new Intent(Intent.ACTION_SENDTO); intent.setData(Uri.parse("mailto:contact@kabouzeid.com")); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 1c83d907..41042aa6 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -158,7 +158,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements setTaskDescriptionColor(color); toolbar.setBackgroundColor(color); - setSupportActionBar(toolbar); // needed to auto readjust the toolbar content color + // needed to auto readjust the toolbar content color + setSupportActionBar(toolbar); setStatusbarColor(color); int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index 05b68994..e909bccc 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -195,14 +195,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement }); } - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - reload(); - } - } - @Override public int getPaletteColor() { return toolbarColor; @@ -216,7 +208,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement setTaskDescriptionColor(color); toolbar.setBackgroundColor(color); - setSupportActionBar(toolbar); // needed to auto readjust the toolbar content color + // needed to auto readjust the toolbar content color + setSupportActionBar(toolbar); setStatusbarColor(color); int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb189dec..a5ec6d24 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -170,6 +170,8 @@ Write an email Follow on Twitter Visit website + Report bugs + Report bugs or request new features. Translate Help translating Phonograph to your native language. Rate