From 99135a0e0d6211f9a5622c7bfa2f9dc242269c52 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Mon, 19 Apr 2021 15:24:42 +0200 Subject: [PATCH] Fix code style --- .../play/adapter/ArtistCatalogueAdapter.java | 3 +-- .../play/adapter/GenreCatalogueAdapter.java | 1 - .../play/helper/ThemeHelper.java | 5 ----- .../play/interfaces/MediaCallback.java | 1 + .../interfaces/MusicServiceEventListener.java | 1 + .../play/service/MusicService.java | 9 +++++---- .../play/util/PreferenceUtil.java | 20 +++++++++++++++++++ 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java index bb81bc7d..5622b527 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java @@ -19,8 +19,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -public class ArtistCatalogueAdapter extends - RecyclerView.Adapter { +public class ArtistCatalogueAdapter extends RecyclerView.Adapter { private static final String TAG = "ArtistCatalogueAdapter"; private List artists; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java index 0839e225..395fe1dd 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java @@ -28,7 +28,6 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter(); } - // inflates the row layout from xml when needed @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { View view = mInflater.inflate(R.layout.item_library_catalogue_genre, parent, false); diff --git a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java index be21138a..273f3e0c 100644 --- a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java +++ b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java @@ -16,19 +16,14 @@ public class ThemeHelper { public static void applyTheme(@NonNull String themePref) { switch (themePref) { case LIGHT_MODE: { - Log.d(TAG, "applyTheme: LIGHT"); AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); break; } case DARK_MODE: { - Log.d(TAG, "applyTheme: DARK"); - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); break; } default: { - Log.d(TAG, "applyTheme: SYSTEM"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); } else { diff --git a/app/src/main/java/com/cappielloantonio/play/interfaces/MediaCallback.java b/app/src/main/java/com/cappielloantonio/play/interfaces/MediaCallback.java index 01a4d32c..49a9ad57 100644 --- a/app/src/main/java/com/cappielloantonio/play/interfaces/MediaCallback.java +++ b/app/src/main/java/com/cappielloantonio/play/interfaces/MediaCallback.java @@ -3,6 +3,7 @@ package com.cappielloantonio.play.interfaces; import java.util.List; public interface MediaCallback { + void onError(Exception exception); void onLoadMedia(List media); diff --git a/app/src/main/java/com/cappielloantonio/play/interfaces/MusicServiceEventListener.java b/app/src/main/java/com/cappielloantonio/play/interfaces/MusicServiceEventListener.java index d750cd14..d4e5ab85 100644 --- a/app/src/main/java/com/cappielloantonio/play/interfaces/MusicServiceEventListener.java +++ b/app/src/main/java/com/cappielloantonio/play/interfaces/MusicServiceEventListener.java @@ -1,6 +1,7 @@ package com.cappielloantonio.play.interfaces; public interface MusicServiceEventListener { + void onServiceConnected(); void onServiceDisconnected(); diff --git a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java index 3a6cf4a0..4b014d58 100644 --- a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java +++ b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java @@ -26,6 +26,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.preference.Preference; import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; @@ -331,11 +332,11 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks } private void savePosition() { - PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(PreferenceUtil.POSITION, getPosition()).apply(); + PreferenceUtil.getInstance(getApplicationContext()).setPosition(getPosition()); } private void saveProgress() { - PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(PreferenceUtil.PROGRESS, getSongProgressMillis()).apply(); + PreferenceUtil.getInstance(getApplicationContext()).setProgress(getSongProgressMillis()); } private void restoreState() { @@ -348,8 +349,8 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks QueueRepository queueRepository = new QueueRepository(App.getInstance()); List restoredQueue = queueRepository.getSongs(); - int restoredPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(PreferenceUtil.POSITION, -1); - int restoredPositionInTrack = PreferenceManager.getDefaultSharedPreferences(this).getInt(PreferenceUtil.PROGRESS, -1); + int restoredPosition = PreferenceUtil.getInstance(getApplicationContext()).getPosition(); + int restoredPositionInTrack = PreferenceUtil.getInstance(getApplicationContext()).getProgress(); if (restoredQueue.size() > 0 && restoredPosition != -1) { this.playingQueue = restoredQueue; diff --git a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java b/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java index 945f3fba..c16c983d 100644 --- a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java +++ b/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java @@ -111,6 +111,26 @@ public class PreferenceUtil { editor.apply(); } + public int getPosition() { + return mPreferences.getInt(POSITION, -1); + } + + public void setPosition(int position) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putInt(POSITION, position); + editor.apply(); + } + + public int getProgress() { + return mPreferences.getInt(PROGRESS, -1); + } + + public void setProgress(int progress) { + final SharedPreferences.Editor editor = mPreferences.edit(); + editor.putInt(PROGRESS, progress); + editor.apply(); + } + public final int getImageCacheSize() { return Integer.parseInt(mPreferences.getString(IMAGE_CACHE_SIZE, "400000000")); }