diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index bcd7e8a08..856094f26 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -47,6 +47,8 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat * TODO: Rework some fragments to use listeners *even more* * * TODO: Unify all member variables under an m prefix + * + * TODO: Fix how selection works in the RecyclerViews (doing it poorly right now) */ class MainActivity : AppCompatActivity() { private val playbackModel: PlaybackViewModel by viewModels() 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 9195ae628..dc5fbcd6a 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 @@ -198,7 +198,6 @@ class PlaybackStateManager private constructor() { /** Shuffle all songs. */ fun shuffleAll() { - logD("RETARD. ${musicStore.library}") val library = musicStore.library ?: return mQueue = library.songs.toMutableList() 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 c42d3a0b6..26241b973 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 @@ -447,12 +447,6 @@ class PlaybackService : initialHeadsetPlugEventHandled = true } - AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED -> { - when (intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, -1)) { - AudioManager.SCO_AUDIO_STATE_DISCONNECTED -> pauseFromPlug() - AudioManager.SCO_AUDIO_STATE_CONNECTED -> maybeResumeFromPlug() - } - } AudioManager.ACTION_AUDIO_BECOMING_NOISY -> pauseFromPlug() // --- AUXIO EVENTS --- diff --git a/info/ARCHITECTURE.md b/info/ARCHITECTURE.md index b22772293..418fea2d1 100644 --- a/info/ARCHITECTURE.md +++ b/info/ARCHITECTURE.md @@ -104,7 +104,7 @@ objects. - `sortName` is used in the fast scroller indicators and sorting. Avoid it wherever else. - `resolveName()` should be used when displaying any kind of music data to the user. - For songs, `individualArtistRawName` and `resolveIndividualArtistName` should always be used when displaying the artist of -a song, as it will always show collaborator information first before deatiling to the album artist. +a song, as it will always show collaborator information first before defaulting to the album artist. #### Music Access All music on a system is asynchronously loaded into the shared object `MusicStore`. Because of this, **`MusicStore` may not be available at all times**. @@ -175,7 +175,7 @@ an accent. This should be enough to cover most use cases in Auxio. -Internally, multiple fetchers are provided to transform `Music` instances into images. All of these fetchers inherit `AuxioFetcher`, which implements +Internally, multiple fetchers are provided to transform `Music` instances into images. All of these fetchers inherit `BaseFetcher`, which implements the necessary methods for loading album artwork and creating the mosaics shown in artist/genre images. #### `.detail` diff --git a/info/LICENSES.md b/info/LICENSES.md index 6be91b8ac..7af1226a0 100644 --- a/info/LICENSES.md +++ b/info/LICENSES.md @@ -5,5 +5,5 @@ Auxio uses a number of third-party libraries, which are listed below with their |--------------|-----------|---------|---------| | [ExoPlayer](https://github.com/google/ExoPlayer) | [Google](https://github.com/google) | Music Playback | Apache-2.0 | | [Coil](https://github.com/coil-kt/coil) | [Square](https://github.com/coil-kt) | Image Loading | Apache-2.0 | -| [Spotless](https://github.com/diffplug/spotless) | [CiffPlug](https://github.com/diffplug) | Formatting | Apache-2.0 | +| [Spotless](https://github.com/diffplug/spotless) | [DiffPlug](https://github.com/diffplug) | Formatting | Apache-2.0 | | [ktfmt](https://github.com/facebookincubator/ktfmt) | [Meta](https://github.com/facebookincubator) | Formatting | Apache-2.0 |