From a645c3a217ed8985c71635b091b2c678e901125b Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Fri, 29 Apr 2022 20:01:32 -0600 Subject: [PATCH] deps: upgrade deps aaaaaaa coil -> 2.0.0-rc03 material -> 1.7.0-alpha01 leakcanary -> 2.9.1 navigation -> 2.4.2 kotlin -> 1.6.21 agp -> 7.1.3 --- app/build.gradle | 8 ++++---- app/src/main/java/org/oxycblt/auxio/MainActivity.kt | 4 +++- app/src/main/java/org/oxycblt/auxio/music/Indexer.kt | 3 +++ app/src/main/java/org/oxycblt/auxio/music/Music.kt | 1 - .../org/oxycblt/auxio/playback/PlaybackPanelFragment.kt | 2 ++ .../oxycblt/auxio/playback/state/PlaybackStateDatabase.kt | 2 +- .../auxio/playback/system/MediaSessionComponent.kt | 2 +- .../org/oxycblt/auxio/playback/system/PlaybackService.kt | 6 ++---- .../org/oxycblt/auxio/settings/SettingsListFragment.kt | 3 +++ .../java/org/oxycblt/auxio/settings/SettingsManager.kt | 1 - app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt | 2 ++ app/src/main/res/values/integers.xml | 2 +- build.gradle | 6 +++--- 13 files changed, 25 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 259cd2476..dc0ba647e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { // Media // TODO: Dumpster this for Media3 - implementation "androidx.media:media:1.5.0" + implementation "androidx.media:media:1.6.0" // Preferences implementation "androidx.preference:preference-ktx:1.2.0" @@ -99,13 +99,13 @@ dependencies { implementation fileTree(dir: "libs", include: ["extension-*.aar"]) // Image loading - implementation "io.coil-kt:coil:2.0.0-rc02" + implementation "io.coil-kt:coil:2.0.0-rc03" // Material - implementation "com.google.android.material:material:1.6.0-beta01" + implementation "com.google.android.material:material:1.7.0-alpha01" // LeakCanary - debugImplementation "com.squareup.leakcanary:leakcanary-android:2.8.1" + debugImplementation "com.squareup.leakcanary:leakcanary-android:2.9.1" } spotless { diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt index 856094f26..a3b314362 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt @@ -46,9 +46,11 @@ 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: Phase out m for _ * * TODO: Fix how selection works in the RecyclerViews (doing it poorly right now) + * + * TODO: Rework padding ethos */ class MainActivity : AppCompatActivity() { private val playbackModel: PlaybackViewModel by viewModels() diff --git a/app/src/main/java/org/oxycblt/auxio/music/Indexer.kt b/app/src/main/java/org/oxycblt/auxio/music/Indexer.kt index bf12b5485..418af00ab 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Indexer.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/Indexer.kt @@ -88,6 +88,9 @@ import org.oxycblt.auxio.util.logD * I wish I was born in the neolithic. * * @author OxygenCobalt + * + * TODO: Experiment with making the exoplayer metadata system more effificent so that we could + * leverage it here (maybe) */ object Indexer { /** diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt index 1856588f7..2de01acc9 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt @@ -21,7 +21,6 @@ import android.content.ContentUris import android.content.Context import android.net.Uri import android.provider.MediaStore -import android.text.TextUtils.isDigitsOnly import androidx.core.text.isDigitsOnly import org.oxycblt.auxio.R import org.oxycblt.auxio.ui.Item diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt index 2cda9fed0..c85d749d6 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt @@ -49,6 +49,8 @@ import org.oxycblt.auxio.util.textSafe * @author OxygenCobalt * * TODO: Handle RTL correctly in the playback buttons + * + * TODO: Make seek thumb grow when selected */ class PlaybackPanelFragment : ViewBindingFragment(), diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt index dcfd271c6..f84929c77 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateDatabase.kt @@ -102,7 +102,7 @@ class PlaybackStateDatabase(context: Context) : /** * Read the stored [SavedState] from the database, if there is one. - * @param musicStore Required to transform database songs/parents into actual instances + * @param library Required to transform database songs/parents into actual instances * @return The stored [SavedState], null if there isn't one. */ fun readState(library: MusicStore.Library): SavedState? { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt index ce0c618a0..ca1e24a8e 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt @@ -127,7 +127,7 @@ class MediaSessionComponent(private val context: Context, private val player: Pl onSongChanged(playbackManager.song) } - fun onSongChanged(song: Song?) { + private fun onSongChanged(song: Song?) { if (song == null) { mediaSession.setMetadata(emptyMetadata) return 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 777781e00..8dbd206a0 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 @@ -166,9 +166,9 @@ class PlaybackService : unregisterReceiver(systemReceiver) serviceJob.cancel() - player.release() mediaSessionComponent.release() widgets.release() + player.release() playbackManager.removeCallback(this) settingsManager.removeCallback(this) @@ -385,7 +385,6 @@ class PlaybackService : private fun stopAndSave() { stopForeground(true) isForeground = false - saveScope.launch { playbackManager.saveStateToDatabase(this@PlaybackService) } } @@ -406,8 +405,7 @@ class PlaybackService : // a non-starter since both require me to display a permission prompt // 4. Some weird internal framework thing that also handles bluetooth headsets??? // - // They should have just stopped at ACTION_HEADSET_PLUG. Just use 1 and 2 so that - // *something* fills in the role. + // They should have just stopped at ACTION_HEADSET_PLUG. AudioManager.ACTION_HEADSET_PLUG -> { when (intent.getIntExtra("state", -1)) { 0 -> pauseFromPlug() diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt index 6cebf3dfa..e52385717 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt @@ -45,6 +45,9 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat /** * The actual fragment containing the settings menu. Inherits [PreferenceFragmentCompat]. * @author OxygenCobalt + * + * TODO: Add option to restore state + * TODO: Add option to not restore state */ @Suppress("UNUSED") class SettingsListFragment : PreferenceFragmentCompat() { diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt index a26024a1b..e2be76cc3 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt @@ -247,7 +247,6 @@ class SettingsManager private constructor(context: Context) : */ interface Callback { fun onLibTabsUpdate(libTabs: Array) {} - fun onColorizeNotifUpdate(doColorize: Boolean) {} fun onNotifActionUpdate(useAltAction: Boolean) {} fun onShowCoverUpdate(showCovers: Boolean) {} fun onQualityCoverUpdate(doQualityCovers: Boolean) {} diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt index eb643a12e..3a482b246 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt @@ -26,6 +26,8 @@ import org.oxycblt.auxio.playback.system.PlaybackService import org.oxycblt.auxio.util.newBroadcastIntent import org.oxycblt.auxio.util.newMainIntent +// TODO: Still need to change the default cover here + /** * The default widget is displayed whenever there is no music playing. It just shows the message "No * music playing". diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml index 262953ae6..37925a9ee 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -2,7 +2,7 @@ 150 - + @string/set_theme_auto diff --git a/build.gradle b/build.gradle index cc6d5fc5f..5489e4e00 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.10' - ext.navigation_version = "2.4.1" + ext.kotlin_version = '1.6.21' + ext.navigation_version = "2.4.2" repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" classpath "com.diffplug.spotless:spotless-plugin-gradle:6.3.0"