From 3b853fd28f641a858084ca202d052d5326d84d06 Mon Sep 17 00:00:00 2001 From: Zyrouge Date: Fri, 15 Nov 2024 01:21:06 +0530 Subject: [PATCH] chore: lint --- .../zyrouge/symphony/services/radio/Radio.kt | 4 ++-- .../services/radio/RadioObservatory.kt | 2 +- .../symphony/services/radio/RadioQueue.kt | 24 +++++++++---------- .../symphony/services/radio/RadioSession.kt | 12 ++++------ .../zyrouge/symphony/ui/view/NowPlaying.kt | 4 ++-- .../symphony/ui/view/nowPlaying/BottomBar.kt | 6 ++--- 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/radio/Radio.kt b/app/src/main/java/io/github/zyrouge/symphony/services/radio/Radio.kt index 3cd17b2f..5c553ca3 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/services/radio/Radio.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/services/radio/Radio.kt @@ -355,7 +355,7 @@ class Radio(private val symphony: Symphony) : Symphony.Hooks { var autostart: Boolean var nextSongIndex: Int when (queue.currentLoopMode) { - RadioLoopMode.Song -> { + RadioQueue.LoopMode.Song -> { nextSongIndex = queue.currentSongIndex autostart = source == SongFinishSource.Finish if (!queue.hasSongAt(nextSongIndex)) { @@ -372,7 +372,7 @@ class Radio(private val symphony: Symphony) : Symphony.Hooks { autostart = true if (!queue.hasSongAt(nextSongIndex)) { nextSongIndex = 0 - autostart = queue.currentLoopMode == RadioLoopMode.Queue + autostart = queue.currentLoopMode == RadioQueue.LoopMode.Queue } } } diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioObservatory.kt b/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioObservatory.kt index 021bcd03..eceb69e7 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioObservatory.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioObservatory.kt @@ -18,7 +18,7 @@ class RadioObservatory(private val symphony: Symphony) { val queueIndex = _queueIndex.asStateFlow() private val _queue = MutableStateFlow(emptyList()) val queue = _queue.asStateFlow() - private val _loopMode = MutableStateFlow(RadioLoopMode.None) + private val _loopMode = MutableStateFlow(RadioQueue.LoopMode.None) val loopMode = _loopMode.asStateFlow() private val _shuffleMode = MutableStateFlow(false) val shuffleMode = _shuffleMode.asStateFlow() diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioQueue.kt b/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioQueue.kt index 60b642bb..7bbefbf5 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioQueue.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioQueue.kt @@ -3,17 +3,17 @@ package io.github.zyrouge.symphony.services.radio import io.github.zyrouge.symphony.Symphony import io.github.zyrouge.symphony.utils.ConcurrentList -enum class RadioLoopMode { - None, - Queue, - Song; +class RadioQueue(private val symphony: Symphony) { + enum class LoopMode { + None, + Queue, + Song; - companion object { - val values = enumValues() + companion object { + val values = enumValues() + } } -} -class RadioQueue(private val symphony: Symphony) { val originalQueue = ConcurrentList() val currentQueue = ConcurrentList() @@ -29,7 +29,7 @@ class RadioQueue(private val symphony: Symphony) { symphony.radio.onUpdate.dispatch(Radio.Events.QueueOption.ShuffleModeChanged) } - var currentLoopMode = RadioLoopMode.None + var currentLoopMode = LoopMode.None set(value) { field = value symphony.radio.onUpdate.dispatch(Radio.Events.QueueOption.LoopModeChanged) @@ -110,13 +110,13 @@ class RadioQueue(private val symphony: Symphony) { } } - fun setLoopMode(loopMode: RadioLoopMode) { + fun setLoopMode(loopMode: LoopMode) { currentLoopMode = loopMode } fun toggleLoopMode() { - val next = (currentLoopMode.ordinal + 1) % RadioLoopMode.values.size - setLoopMode(RadioLoopMode.values[next]) + val next = (currentLoopMode.ordinal + 1) % LoopMode.values.size + setLoopMode(LoopMode.values[next]) } fun toggleShuffleMode() = setShuffleMode(!currentShuffleMode) diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioSession.kt b/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioSession.kt index d8ce526a..10e2a5ce 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioSession.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioSession.kt @@ -28,12 +28,9 @@ class RadioSession(val symphony: Symphony) { val isPlaying: Boolean, ) - val artworkCacher = RadioArtworkCacher(symphony) - val mediaSession = MediaSessionCompat( - symphony.applicationContext, - MEDIA_SESSION_ID - ) - val notification = RadioNotification(symphony) + internal val mediaSession = MediaSessionCompat(symphony.applicationContext, MEDIA_SESSION_ID) + private val artworkCacher = RadioArtworkCacher(symphony) + private val notification = RadioNotification(symphony) private var currentSongId: String? = null private var receiver = object : BroadcastReceiver() { @@ -46,7 +43,6 @@ class RadioSession(val symphony: Symphony) { fun start() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - // As per Tiramisu requirements, we need to add Context attributes. symphony.applicationContext.registerReceiver( receiver, IntentFilter().apply { @@ -55,7 +51,7 @@ class RadioSession(val symphony: Symphony) { addAction(ACTION_NEXT) addAction(ACTION_STOP) }, - Context.RECEIVER_EXPORTED + Context.RECEIVER_EXPORTED, // https://developer.android.com/reference/android/content/Context#RECEIVER_EXPORTED // really, RECEIVER_EXPORTED and RECEIVER_NOT_EXPORTED makes no difference. // the notification appears perfectly, Pano Scrobbler sees it, diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/view/NowPlaying.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/view/NowPlaying.kt index 60d0b982..1c32d921 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/ui/view/NowPlaying.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/ui/view/NowPlaying.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import io.github.zyrouge.symphony.services.groove.Song -import io.github.zyrouge.symphony.services.radio.RadioLoopMode +import io.github.zyrouge.symphony.services.radio.RadioQueue import io.github.zyrouge.symphony.ui.helpers.ViewContext import io.github.zyrouge.symphony.ui.view.nowPlaying.NothingPlaying import io.github.zyrouge.symphony.ui.view.nowPlaying.NowPlayingBody @@ -20,7 +20,7 @@ data class NowPlayingData( val isPlaying: Boolean, val currentSongIndex: Int, val queueSize: Int, - val currentLoopMode: RadioLoopMode, + val currentLoopMode: RadioQueue.LoopMode, val currentShuffleMode: Boolean, val currentSpeed: Float, val currentPitch: Float, diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/view/nowPlaying/BottomBar.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/view/nowPlaying/BottomBar.kt index e4698a93..6880397b 100644 --- a/app/src/main/java/io/github/zyrouge/symphony/ui/view/nowPlaying/BottomBar.kt +++ b/app/src/main/java/io/github/zyrouge/symphony/ui/view/nowPlaying/BottomBar.kt @@ -46,7 +46,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import io.github.zyrouge.symphony.services.radio.RadioLoopMode +import io.github.zyrouge.symphony.services.radio.RadioQueue import io.github.zyrouge.symphony.ui.helpers.ViewContext import io.github.zyrouge.symphony.ui.view.LyricsViewRoute import io.github.zyrouge.symphony.ui.view.NowPlayingData @@ -141,12 +141,12 @@ fun NowPlayingBodyBottomBar( ) { Icon( when (currentLoopMode) { - RadioLoopMode.Song -> Icons.Filled.RepeatOne + RadioQueue.LoopMode.Song -> Icons.Filled.RepeatOne else -> Icons.Filled.Repeat }, null, tint = when (currentLoopMode) { - RadioLoopMode.None -> LocalContentColor.current + RadioQueue.LoopMode.None -> LocalContentColor.current else -> MaterialTheme.colorScheme.primary } )