Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Converted PreferencUtil to Kotlin class

Browse source
This commit is contained in:
Hemanth S 2020-05-23 14:57:55 +05:30
parent df225e179f
commit e9bd24872f
108 changed files with 1855 additions and 2099 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
View file

@ -29,7 +29,7 @@ import androidx.annotation.Nullable;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.service.playback.Playback;
import code.name.monkey.retromusic.util.PreferenceUtil;
import code.name.monkey.retromusic.util.PreferenceUtilKT;
/**
* @author Andrew Neal, Karim Abou Zeid (kabouzeid)
@ -130,7 +130,7 @@ public class MultiPlayer implements Playback, MediaPlayer.OnErrorListener, Media
if (path == null) {
return;
}
if (PreferenceUtil.getInstance(context).gaplessPlayback()) {
if (PreferenceUtilKT.INSTANCE.isGapLessPlayback()) {
mNextMediaPlayer = new MediaPlayer();
mNextMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
mNextMediaPlayer.setAudioSessionId(getAudioSessionId());

37
app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
View file

@ -81,9 +81,16 @@ import code.name.monkey.retromusic.service.notification.PlayingNotificationImpl;
import code.name.monkey.retromusic.service.notification.PlayingNotificationOreo;
import code.name.monkey.retromusic.service.playback.Playback;
import code.name.monkey.retromusic.util.MusicUtil;
import code.name.monkey.retromusic.util.PreferenceUtil;
import code.name.monkey.retromusic.util.PreferenceUtilKT;
import code.name.monkey.retromusic.util.RetroUtil;
import static code.name.monkey.retromusic.ConstantsKt.ALBUM_ART_ON_LOCKSCREEN;
import static code.name.monkey.retromusic.ConstantsKt.BLURRED_ALBUM_ART;
import static code.name.monkey.retromusic.ConstantsKt.CLASSIC_NOTIFICATION;
import static code.name.monkey.retromusic.ConstantsKt.COLORED_NOTIFICATION;
import static code.name.monkey.retromusic.ConstantsKt.GAPLESS_PLAYBACK;
import static code.name.monkey.retromusic.ConstantsKt.TOGGLE_HEADSET;
/**
* @author Karim Abou Zeid (kabouzeid), Andrew Neal
*/
@ -250,7 +257,7 @@ public class MusicService extends Service implements
String action = intent.getAction();
if (action != null) {
if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action) &&
PreferenceUtil.getInstance(context).bluetoothSpeaker()) {
PreferenceUtilKT.INSTANCE.isBluetoothSpeaker()) {
if (VERSION.SDK_INT >= VERSION_CODES.M) {
if (getAudioManager().getDevices(AudioManager.GET_DEVICES_OUTPUTS).length > 0) {
play();
@ -381,7 +388,7 @@ public class MusicService extends Service implements
getContentResolver()
.registerContentObserver(MediaStore.Audio.Playlists.INTERNAL_CONTENT_URI, true, mediaStoreObserver);
PreferenceUtil.getInstance(this).registerOnSharedPreferenceChangedListener(this);
PreferenceUtilKT.INSTANCE.registerOnSharedPreferenceChangedListener(this);
restoreState();
@ -411,7 +418,7 @@ public class MusicService extends Service implements
quit();
releaseResources();
getContentResolver().unregisterContentObserver(mediaStoreObserver);
PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this);
PreferenceUtilKT.INSTANCE.unregisterOnSharedPreferenceChangedListener(this);
wakeLock.release();
sendBroadcast(new Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_DESTROYED"));
@ -656,8 +663,8 @@ public class MusicService extends Service implements
}
public void initNotification() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !PreferenceUtil.getInstance(this)
.classicNotification()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
!PreferenceUtilKT.INSTANCE.isClassicNotification()) {
playingNotification = new PlayingNotificationImpl();
} else {
playingNotification = new PlayingNotificationOreo();
@ -719,7 +726,7 @@ public class MusicService extends Service implements
@Override
public void onSharedPreferenceChanged(@NonNull SharedPreferences sharedPreferences, @NonNull String key) {
switch (key) {
case PreferenceUtil.GAPLESS_PLAYBACK:
case GAPLESS_PLAYBACK:
if (sharedPreferences.getBoolean(key, false)) {
prepareNext();
} else {
@ -728,18 +735,18 @@ public class MusicService extends Service implements
}
}
break;
case PreferenceUtil.ALBUM_ART_ON_LOCKSCREEN:
case PreferenceUtil.BLURRED_ALBUM_ART:
case ALBUM_ART_ON_LOCKSCREEN:
case BLURRED_ALBUM_ART:
updateMediaSessionMetaData();
break;
case PreferenceUtil.COLORED_NOTIFICATION:
case COLORED_NOTIFICATION:
updateNotification();
break;
case PreferenceUtil.CLASSIC_NOTIFICATION:
case CLASSIC_NOTIFICATION:
initNotification();
updateNotification();
break;
case PreferenceUtil.TOGGLE_HEADSET:
case TOGGLE_HEADSET:
registerHeadsetEvents();
break;
}
@ -1103,13 +1110,13 @@ public class MusicService extends Service implements
.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, null)
.putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, getPlayingQueue().size());
if (PreferenceUtil.getInstance(this).albumArtOnLockscreen()) {
if (PreferenceUtilKT.INSTANCE.isAlbumArtOnLockScreen()) {
final Point screenSize = RetroUtil.getScreenSize(MusicService.this);
final BitmapRequestBuilder<?, Bitmap> request = SongGlideRequest.Builder
.from(Glide.with(MusicService.this), song)
.checkIgnoreMediaStore(MusicService.this)
.asBitmap().build();
if (PreferenceUtil.getInstance(this).blurredAlbumArt()) {
if (PreferenceUtilKT.INSTANCE.isBlurredAlbumArt()) {
request.transform(new BlurTransformation.Builder(MusicService.this).build());
}
runOnUiThread(new Runnable() {
@ -1252,7 +1259,7 @@ public class MusicService extends Service implements
}
private void registerHeadsetEvents() {
if (!headsetReceiverRegistered && PreferenceUtil.getInstance(this).getHeadsetPlugged()) {
if (!headsetReceiverRegistered && PreferenceUtilKT.INSTANCE.isHeadsetPlugged()) {
registerReceiver(headsetReceiver, headsetReceiverIntentFilter);
headsetReceiverRegistered = true;
}

6
app/src/main/java/code/name/monkey/retromusic/service/PlaybackHandler.java
View file

@ -23,7 +23,7 @@ import androidx.annotation.NonNull;
import java.lang.ref.WeakReference;
import code.name.monkey.retromusic.util.PreferenceUtil;
import code.name.monkey.retromusic.util.PreferenceUtilKT;
import static code.name.monkey.retromusic.service.MusicService.DUCK;
import static code.name.monkey.retromusic.service.MusicService.META_CHANGED;
@ -52,7 +52,7 @@ class PlaybackHandler extends Handler {
switch (msg.what) {
case MusicService.DUCK:
if (PreferenceUtil.getInstance(service).audioDucking()) {
if (PreferenceUtilKT.INSTANCE.isAudioDucking()) {
currentDuckVolume -= .05f;
if (currentDuckVolume > .2f) {
sendEmptyMessageDelayed(DUCK, 10);
@ -66,7 +66,7 @@ class PlaybackHandler extends Handler {
break;
case MusicService.UNDUCK:
if (PreferenceUtil.getInstance(service).audioDucking()) {
if (PreferenceUtilKT.INSTANCE.isAudioDucking()) {
currentDuckVolume += .03f;
if (currentDuckVolume < 1f) {
sendEmptyMessageDelayed(MusicService.UNDUCK, 10);

7
app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
View file

@ -32,7 +32,7 @@ import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
import code.name.monkey.retromusic.service.MusicService
import code.name.monkey.retromusic.service.MusicService.*
import code.name.monkey.retromusic.util.MusicUtil
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtilKT
import code.name.monkey.retromusic.util.RetroColorUtil
import com.bumptech.glide.Glide
import com.bumptech.glide.request.animation.GlideAnimation
@ -149,9 +149,8 @@ class PlayingNotificationImpl : PlayingNotification() {
.setShowActionsInCompactView(1, 2, 3)
)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O && PreferenceUtil.getInstance(
service
).coloredNotification()
if (Build.VERSION.SDK_INT <=
Build.VERSION_CODES.O && PreferenceUtilKT.isColoredNotification
) {
builder.color = color
}

11
app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
View file

@ -23,7 +23,7 @@ import android.graphics.Color
import android.graphics.drawable.Drawable
import android.widget.RemoteViews
import androidx.core.app.NotificationCompat
import code.name.monkey.appthemehelper.util.ATHUtil
import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
import code.name.monkey.appthemehelper.util.ColorUtil
import code.name.monkey.appthemehelper.util.MaterialValueHelper
import code.name.monkey.retromusic.R
@ -33,7 +33,7 @@ import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.service.MusicService
import code.name.monkey.retromusic.service.MusicService.*
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtilKT
import code.name.monkey.retromusic.util.RetroUtil
import code.name.monkey.retromusic.util.RetroUtil.createBitmap
import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
@ -123,7 +123,7 @@ class PlayingNotificationOreo : PlayingNotification() {
super.onLoadFailed(e, errorDrawable)
update(
null,
ATHUtil.resolveColor(service, R.attr.colorSurface, Color.WHITE)
resolveColor(service, R.attr.colorSurface, Color.WHITE)
)
}
@ -143,9 +143,8 @@ class PlayingNotificationOreo : PlayingNotification() {
)
}
if (!PreferenceUtil.getInstance(service).coloredNotification()) {
bgColorFinal =
ATHUtil.resolveColor(service, R.attr.colorPrimary, Color.WHITE)
if (!PreferenceUtilKT.isColoredNotification) {
bgColorFinal = resolveColor(service, R.attr.colorPrimary, Color.WHITE)
}
setBackgroundColor(bgColorFinal)
setNotificationContent(ColorUtil.isColorLight(bgColorFinal))