From 5e3569d1734ea3dfee1bae3170efbf4f6e6d5900 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sun, 9 Jan 2022 08:22:14 -0700 Subject: [PATCH] all: general cleanup General cleanup. About to do another major playback change, so push these changes now so they are not changed later. --- .../java/org/oxycblt/auxio/playback/PlaybackFragment.kt | 1 - .../java/org/oxycblt/auxio/playback/PlaybackViewModel.kt | 2 +- .../oxycblt/auxio/playback/state/PlaybackStateManager.kt | 5 ++--- .../java/org/oxycblt/auxio/playback/system/AudioReactor.kt | 2 +- .../org/oxycblt/auxio/playback/system/PlaybackService.kt | 6 +++--- .../auxio/playback/system/PlaybackSessionConnector.kt | 2 +- .../main/java/org/oxycblt/auxio/widgets/WidgetController.kt | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt index 0be138126..ca8d0f7b6 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt @@ -39,7 +39,6 @@ import org.oxycblt.auxio.util.systemBarsCompat /** * A [Fragment] that displays more information about the song, along with more media controls. * Instantiation is done by the navigation component, **do not instantiate this fragment manually.** - * TODO: Show playing from on this screen now * @author OxygenCobalt */ class PlaybackFragment : Fragment() { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt index 5e11a9f4d..361aa7c0d 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt @@ -80,7 +80,7 @@ class PlaybackViewModel : ViewModel(), PlaybackStateManager.Callback { /** The current [PlaybackMode] that also determines the queue */ val playbackMode: LiveData get() = mMode - private val playbackManager = PlaybackStateManager.maybeGetInstance() + private val playbackManager = PlaybackStateManager.getInstance() private val settingsManager = SettingsManager.getInstance() init { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt index 76733d06e..db4e5669d 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt @@ -40,7 +40,7 @@ import kotlin.math.min * - If you want to use the playback state in the UI, use [org.oxycblt.auxio.playback.PlaybackViewModel] as it can withstand volatile UIs. * - If you want to use the playback state with the ExoPlayer instance or system-side things, use [org.oxycblt.auxio.playback.system.PlaybackService]. * - * All access should be done with [PlaybackStateManager.maybeGetInstance]. + * All access should be done with [PlaybackStateManager.getInstance]. * @author OxygenCobalt */ class PlaybackStateManager private constructor() { @@ -522,7 +522,6 @@ class PlaybackStateManager private constructor() { ) ) - // TODO: Re-add state saving database.writeQueue(mQueue) this@PlaybackStateManager.logD( @@ -643,7 +642,7 @@ class PlaybackStateManager private constructor() { /** * Get/Instantiate the single instance of [PlaybackStateManager]. */ - fun maybeGetInstance(): PlaybackStateManager { + fun getInstance(): PlaybackStateManager { val currentInstance = INSTANCE if (currentInstance != null) { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt index dfc2ac6a1..85c65267a 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt @@ -43,7 +43,7 @@ class AudioReactor( ) : AudioManager.OnAudioFocusChangeListener, SettingsManager.Callback { private data class Gain(val track: Float, val album: Float) - private val playbackManager = PlaybackStateManager.maybeGetInstance() + private val playbackManager = PlaybackStateManager.getInstance() private val settingsManager = SettingsManager.getInstance() private val audioManager = context.getSystemServiceSafe(AudioManager::class) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt index d3e7598f7..cae752440 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt @@ -46,8 +46,9 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.flow.takeWhile import kotlinx.coroutines.launch import org.oxycblt.auxio.BuildConfig @@ -74,7 +75,6 @@ import org.oxycblt.auxio.widgets.WidgetProvider * @author OxygenCobalt */ class PlaybackService : Service(), Player.Listener, PlaybackStateManager.Callback, SettingsManager.Callback { - // Player components private lateinit var player: ExoPlayer private lateinit var mediaSession: MediaSessionCompat @@ -90,7 +90,7 @@ class PlaybackService : Service(), Player.Listener, PlaybackStateManager.Callbac private val systemReceiver = SystemEventReceiver() // Managers - private val playbackManager = PlaybackStateManager.maybeGetInstance() + private val playbackManager = PlaybackStateManager.getInstance() private val settingsManager = SettingsManager.getInstance() // State diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt index e2cd189c2..c9ffb31e0 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackSessionConnector.kt @@ -39,7 +39,7 @@ class PlaybackSessionConnector( private val player: Player, private val mediaSession: MediaSessionCompat ) : PlaybackStateManager.Callback, Player.Listener, MediaSessionCompat.Callback() { - private val playbackManager = PlaybackStateManager.maybeGetInstance() + private val playbackManager = PlaybackStateManager.getInstance() private val emptyMetadata = MediaMetadataCompat.Builder().build() init { diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetController.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetController.kt index 734405cb4..c28a5b560 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetController.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetController.kt @@ -33,7 +33,7 @@ import org.oxycblt.auxio.settings.SettingsManager class WidgetController(private val context: Context) : PlaybackStateManager.Callback, SettingsManager.Callback { - private val playbackManager = PlaybackStateManager.maybeGetInstance() + private val playbackManager = PlaybackStateManager.getInstance() private val settingsManager = SettingsManager.getInstance() private val widget = WidgetProvider() diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f01725fbe..c450cfbc3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -66,7 +66,7 @@ "Preferovat akci náhodného přehrávání" "Zvuk" "Zaměření zvuku" - "Pozastavit při přehrávání jiného zvuku [např. hovor]" + Pozastavit při přehrávání jiného zvuku (např. hovor) "Zaměření sluchátek" "Přehrát/pozastavit při změně připojení sluchátek" "Chování" diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 725ba8f28..52c0ca205 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -71,7 +71,7 @@ Audio Audiofocus - Pauze wanneer andere audio speelt [ex. Gesprekken] + Pauze wanneer andere audio speelt (ex. Gesprekken) Headset-pluggen Afspelen/Pauzeren wanneer de headsetaansluiting verandert diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 22449240a..d4b83a1ea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -82,7 +82,7 @@ Audio Audio focus - Pause when other audio plays [ex. Calls] + Pause when other audio plays (ex. Calls) Headset focus Play/Pause when the headset connection changes ReplayGain (MP3/FLAC Only)