From f9f970c2323160dcee1ecaeb07ba1083a909bbbf Mon Sep 17 00:00:00 2001 From: enricocid Date: Mon, 18 Jun 2018 21:42:17 +0200 Subject: [PATCH] Code refactoring Signed-off-by: enricocid --- .../main/java/com/iven/musicplayergo/FloatingPlayButtons.java | 3 ++- project/app/src/main/java/com/iven/musicplayergo/Utils.java | 4 ++-- .../com/iven/musicplayergo/playback/MediaPlayerHolder.java | 4 ++-- .../iven/musicplayergo/playback/MusicNotificationManager.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/project/app/src/main/java/com/iven/musicplayergo/FloatingPlayButtons.java b/project/app/src/main/java/com/iven/musicplayergo/FloatingPlayButtons.java index 6dd9fb817..858418111 100644 --- a/project/app/src/main/java/com/iven/musicplayergo/FloatingPlayButtons.java +++ b/project/app/src/main/java/com/iven/musicplayergo/FloatingPlayButtons.java @@ -1,6 +1,7 @@ package com.iven.musicplayergo; import android.content.Context; +import android.support.annotation.NonNull; import android.support.v7.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -23,7 +24,7 @@ public void run() { }); } - private void inflateLayout(Context context) { + private void inflateLayout(@NonNull final Context context) { final View v = LayoutInflater.from(context).inflate(R.layout.player_buttons, this, true); container = v.findViewById(R.id.layout_button_container); } diff --git a/project/app/src/main/java/com/iven/musicplayergo/Utils.java b/project/app/src/main/java/com/iven/musicplayergo/Utils.java index 430400607..7eca4ef2f 100644 --- a/project/app/src/main/java/com/iven/musicplayergo/Utils.java +++ b/project/app/src/main/java/com/iven/musicplayergo/Utils.java @@ -23,7 +23,7 @@ static boolean isMarshmallow() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; } - public static Spanned buildSpanned(String res) { + public static Spanned buildSpanned(final String res) { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ? Html.fromHtml(res, Html.FROM_HTML_MODE_LEGACY) : Html.fromHtml(res); @@ -48,7 +48,7 @@ static boolean isThemeInverted(@NonNull final Context context) { return isThemeInverted; } - static void setTheme(@NonNull final Activity activity, boolean isThemeInverted, int accent) { + static void setTheme(@NonNull final Activity activity, final boolean isThemeInverted, final int accent) { final int theme = resolveTheme(isThemeInverted, accent); activity.setTheme(theme); if (isMarshmallow()) { diff --git a/project/app/src/main/java/com/iven/musicplayergo/playback/MediaPlayerHolder.java b/project/app/src/main/java/com/iven/musicplayergo/playback/MediaPlayerHolder.java index cd1962ced..2eaaccea4 100644 --- a/project/app/src/main/java/com/iven/musicplayergo/playback/MediaPlayerHolder.java +++ b/project/app/src/main/java/com/iven/musicplayergo/playback/MediaPlayerHolder.java @@ -390,7 +390,7 @@ public void skip(final boolean isNext) { } private void getSkipSong(final boolean isNext) { - int currentIndex = mSongs.indexOf(mSelectedSong); + final int currentIndex = mSongs.indexOf(mSelectedSong); int index; @@ -450,7 +450,7 @@ private class NotificationReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { // TODO Auto-generated method stub - String action = intent.getAction(); + final String action = intent.getAction(); if (action != null) { diff --git a/project/app/src/main/java/com/iven/musicplayergo/playback/MusicNotificationManager.java b/project/app/src/main/java/com/iven/musicplayergo/playback/MusicNotificationManager.java index 51346e3f1..51c067f45 100644 --- a/project/app/src/main/java/com/iven/musicplayergo/playback/MusicNotificationManager.java +++ b/project/app/src/main/java/com/iven/musicplayergo/playback/MusicNotificationManager.java @@ -40,7 +40,7 @@ public class MusicNotificationManager { mNotificationManager = (NotificationManager) mMusicService.getSystemService(Context.NOTIFICATION_SERVICE); } - public void setAccentColor(int color) { + public void setAccentColor(final int color) { mAccent = ContextCompat.getColor(mMusicService, color); } @@ -123,7 +123,7 @@ private NotificationCompat.Action notificationAction(final String action) { private void createNotificationChannel() { if (mNotificationManager.getNotificationChannel(CHANNEL_ID) == null) { - NotificationChannel notificationChannel = + final NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID, mMusicService.getString(R.string.app_name), NotificationManager.IMPORTANCE_LOW);