From b90476f6abcc6bc7a7212df248db3353f008ffc1 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sun, 10 Nov 2019 18:18:27 +0900
Subject: [PATCH] refactor some code

---
 .../com/kabouzeid/gramophone/adapter/SearchAdapter.java  | 8 ++------
 .../kabouzeid/gramophone/adapter/album/AlbumAdapter.java | 5 +----
 .../java/com/kabouzeid/gramophone/model/Playlist.java    | 2 --
 .../main/java/com/kabouzeid/gramophone/model/Song.java   | 1 -
 .../com/kabouzeid/gramophone/service/MusicService.java   | 8 ++++----
 .../pager/AbsLibraryPagerRecyclerViewFragment.java       | 2 --
 .../java/com/kabouzeid/gramophone/util/MusicUtil.java    | 9 ++++-----
 .../com/kabouzeid/gramophone/util/NavigationUtil.java    | 4 ++--
 app/src/main/res/values-pt-rBR/strings.xml               | 2 +-
 9 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
index 51e6cc1f..35dea37c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java
@@ -152,16 +152,12 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
                 case ALBUM:
                     NavigationUtil.goToAlbum(activity,
                             ((Album) item).getId(),
-                            Pair.create(image,
-                                    activity.getResources().getString(R.string.transition_album_art)
-                            ));
+                            Pair.create(image, activity.getResources().getString(R.string.transition_album_art)));
                     break;
                 case ARTIST:
                     NavigationUtil.goToArtist(activity,
                             ((Artist) item).getId(),
-                            Pair.create(image,
-                                    activity.getResources().getString(R.string.transition_artist_image)
-                            ));
+                            Pair.create(image, activity.getResources().getString(R.string.transition_artist_image)));
                     break;
                 case SONG:
                     List<Song> playList = new ArrayList<>();
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 d4ece171..d6453e7f 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
@@ -220,10 +220,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
             if (isInQuickSelectMode()) {
                 toggleChecked(getAdapterPosition());
             } else {
-                Pair[] albumPairs = new Pair[]{
-                        Pair.create(image,
-                                activity.getResources().getString(R.string.transition_album_art)
-                        )};
+                Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_art))};
                 NavigationUtil.goToAlbum(activity, dataSet.get(getAdapterPosition()).getId(), albumPairs);
             }
         }
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 98159d77..a1458243 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java
@@ -30,7 +30,6 @@ public class Playlist implements Parcelable {
 
         if (id != playlist.id) return false;
         return name != null ? name.equals(playlist.name) : playlist.name == null;
-
     }
 
     @Override
@@ -48,7 +47,6 @@ public class Playlist implements Parcelable {
                 '}';
     }
 
-
     @Override
     public int describeContents() {
         return 0;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/Song.java b/app/src/main/java/com/kabouzeid/gramophone/model/Song.java
index b2ed1033..539786f8 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/Song.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/Song.java
@@ -90,7 +90,6 @@ public class Song implements Parcelable {
                 '}';
     }
 
-
     @Override
     public int describeContents() {
         return 0;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index 9ebbc897..3bba505a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -145,7 +145,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
     private boolean pausedByTransientLossOfFocus;
     private PlayingNotification playingNotification;
     private AudioManager audioManager;
-    @SuppressWarnings("deprecation")
     private MediaSessionCompat mediaSession;
     private PowerManager.WakeLock wakeLock;
     private PlaybackHandler playerHandler;
@@ -1071,14 +1070,15 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                 savePosition();
                 savePositionInTrack();
                 final Song currentSong = getCurrentSong();
-                HistoryStore.getInstance(this).addSongId(currentSong.id);
+                //HistoryStore.getInstance(this).addSongId(currentSong.id);
                 if (songPlayCountHelper.shouldBumpPlayCount()) {
-                    SongPlayCountStore.getInstance(this).bumpPlayCount(songPlayCountHelper.getSong().id);
+                    //SongPlayCountStore.getInstance(this).bumpPlayCount(songPlayCountHelper.getSong().id);
                 }
                 songPlayCountHelper.notifySongChanged(currentSong);
                 break;
             case QUEUE_CHANGED:
-                updateMediaSessionMetaData(); // because playing queue size might have changed
+                // because playing queue size might have changed
+                updateMediaSessionMetaData();
                 saveState();
                 if (playingQueue.size() > 0) {
                     prepareNext();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
index bd08cabd..c516feaf 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java
@@ -3,7 +3,6 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager;
 import android.os.Bundle;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener;
@@ -33,7 +32,6 @@ public abstract class AbsLibraryPagerRecyclerViewFragment<A extends RecyclerView
     View container;
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
-    @Nullable
     @BindView(android.R.id.empty)
     TextView empty;
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
index 06f7b2c0..b1d7f564 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
@@ -57,8 +57,6 @@ public class MusicUtil {
         }
     }
 
-
-
     @NonNull
     public static String getArtistInfoString(@NonNull final Context context, @NonNull final Artist artist) {
         int albumCount = artist.getAlbumCount();
@@ -163,8 +161,8 @@ public class MusicUtil {
         return string1 + "  •  " + string2;
     }
 
-    //iTunes uses for example 1002 for track 2 CD1 or 3011 for track 11 CD3.
-    //this method converts those values to normal tracknumbers
+    // iTunes uses for example 1002 for track 2 CD1 or 3011 for track 11 CD3.
+    // this method converts those values to normal track numbers
     public static int getFixedTrackNumber(int trackNumberToFix) {
         return trackNumberToFix % 1000;
     }
@@ -280,7 +278,8 @@ public class MusicUtil {
     }
 
     public static boolean isFavorite(@NonNull final Context context, @NonNull final Song song) {
-        return PlaylistsUtil.doPlaylistContains(context, getFavoritesPlaylist(context).id, song.id);
+        //return PlaylistsUtil.doPlaylistContains(context, getFavoritesPlaylist(context).id, song.id);
+        return false;
     }
 
     public static void toggleFavorite(@NonNull final Context context, @NonNull final Song song) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
index 93e49532..b4b76608 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
@@ -28,8 +28,8 @@ public class NavigationUtil {
         final Intent intent = new Intent(activity, ArtistDetailActivity.class);
         intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId);
 
-        //noinspection unchecked
         if (sharedElements != null && sharedElements.length > 0) {
+            //noinspection unchecked
             activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle());
         } else {
             activity.startActivity(intent);
@@ -40,8 +40,8 @@ public class NavigationUtil {
         final Intent intent = new Intent(activity, AlbumDetailActivity.class);
         intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM_ID, albumId);
 
-        //noinspection unchecked
         if (sharedElements != null && sharedElements.length > 0) {
+            //noinspection unchecked
             activity.startActivity(intent, ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle());
         } else {
             activity.startActivity(intent);
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0fcd4d89..5a932ecb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -48,7 +48,7 @@
     <string name="action_grid_size_land">Número de colunas (horizontal)</string>
     <string name="inserted_x_songs_into_playlist_x">Inserido {%1$d} músicas na lista de reprodução {%2$s}.</string>
     <string name="created_playlist_x">Lista de reprodução criada {% 1 $ s}.</string>
-    <string name="deleted_x_songs">Excluídas {%1$s} músicas.</string>
+    <string name="deleted_x_songs">Excluídas {%1$d} músicas.</string>
     <string name="playlist_exists">A lista de reprodução %1$s já existe.</string>
     <string name="could_not_create_playlist">N\u00e3o foi poss\u00edvel criar a lista de reprodu\u00e7\u00e3o.</string>
     <string name="delete_playlist_x"><![CDATA[ Deseja excluir a playlist <b>%1$s</b>? ]]></string>