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
This commit is contained in:
parent
d57f980148
commit
a645c3a217
13 changed files with 25 additions and 17 deletions
|
@ -84,7 +84,7 @@ dependencies {
|
||||||
|
|
||||||
// Media
|
// Media
|
||||||
// TODO: Dumpster this for Media3
|
// TODO: Dumpster this for Media3
|
||||||
implementation "androidx.media:media:1.5.0"
|
implementation "androidx.media:media:1.6.0"
|
||||||
|
|
||||||
// Preferences
|
// Preferences
|
||||||
implementation "androidx.preference:preference-ktx:1.2.0"
|
implementation "androidx.preference:preference-ktx:1.2.0"
|
||||||
|
@ -99,13 +99,13 @@ dependencies {
|
||||||
implementation fileTree(dir: "libs", include: ["extension-*.aar"])
|
implementation fileTree(dir: "libs", include: ["extension-*.aar"])
|
||||||
|
|
||||||
// Image loading
|
// Image loading
|
||||||
implementation "io.coil-kt:coil:2.0.0-rc02"
|
implementation "io.coil-kt:coil:2.0.0-rc03"
|
||||||
|
|
||||||
// Material
|
// Material
|
||||||
implementation "com.google.android.material:material:1.6.0-beta01"
|
implementation "com.google.android.material:material:1.7.0-alpha01"
|
||||||
|
|
||||||
// LeakCanary
|
// LeakCanary
|
||||||
debugImplementation "com.squareup.leakcanary:leakcanary-android:2.8.1"
|
debugImplementation "com.squareup.leakcanary:leakcanary-android:2.9.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
spotless {
|
spotless {
|
||||||
|
|
|
@ -46,9 +46,11 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat
|
||||||
*
|
*
|
||||||
* TODO: Rework some fragments to use listeners *even more*
|
* 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: Fix how selection works in the RecyclerViews (doing it poorly right now)
|
||||||
|
*
|
||||||
|
* TODO: Rework padding ethos
|
||||||
*/
|
*/
|
||||||
class MainActivity : AppCompatActivity() {
|
class MainActivity : AppCompatActivity() {
|
||||||
private val playbackModel: PlaybackViewModel by viewModels()
|
private val playbackModel: PlaybackViewModel by viewModels()
|
||||||
|
|
|
@ -88,6 +88,9 @@ import org.oxycblt.auxio.util.logD
|
||||||
* I wish I was born in the neolithic.
|
* I wish I was born in the neolithic.
|
||||||
*
|
*
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
|
*
|
||||||
|
* TODO: Experiment with making the exoplayer metadata system more effificent so that we could
|
||||||
|
* leverage it here (maybe)
|
||||||
*/
|
*/
|
||||||
object Indexer {
|
object Indexer {
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -21,7 +21,6 @@ import android.content.ContentUris
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.MediaStore
|
import android.provider.MediaStore
|
||||||
import android.text.TextUtils.isDigitsOnly
|
|
||||||
import androidx.core.text.isDigitsOnly
|
import androidx.core.text.isDigitsOnly
|
||||||
import org.oxycblt.auxio.R
|
import org.oxycblt.auxio.R
|
||||||
import org.oxycblt.auxio.ui.Item
|
import org.oxycblt.auxio.ui.Item
|
||||||
|
|
|
@ -49,6 +49,8 @@ import org.oxycblt.auxio.util.textSafe
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
*
|
*
|
||||||
* TODO: Handle RTL correctly in the playback buttons
|
* TODO: Handle RTL correctly in the playback buttons
|
||||||
|
*
|
||||||
|
* TODO: Make seek thumb grow when selected
|
||||||
*/
|
*/
|
||||||
class PlaybackPanelFragment :
|
class PlaybackPanelFragment :
|
||||||
ViewBindingFragment<FragmentPlaybackPanelBinding>(),
|
ViewBindingFragment<FragmentPlaybackPanelBinding>(),
|
||||||
|
|
|
@ -102,7 +102,7 @@ class PlaybackStateDatabase(context: Context) :
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read the stored [SavedState] from the database, if there is one.
|
* 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.
|
* @return The stored [SavedState], null if there isn't one.
|
||||||
*/
|
*/
|
||||||
fun readState(library: MusicStore.Library): SavedState? {
|
fun readState(library: MusicStore.Library): SavedState? {
|
||||||
|
|
|
@ -127,7 +127,7 @@ class MediaSessionComponent(private val context: Context, private val player: Pl
|
||||||
onSongChanged(playbackManager.song)
|
onSongChanged(playbackManager.song)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onSongChanged(song: Song?) {
|
private fun onSongChanged(song: Song?) {
|
||||||
if (song == null) {
|
if (song == null) {
|
||||||
mediaSession.setMetadata(emptyMetadata)
|
mediaSession.setMetadata(emptyMetadata)
|
||||||
return
|
return
|
||||||
|
|
|
@ -166,9 +166,9 @@ class PlaybackService :
|
||||||
unregisterReceiver(systemReceiver)
|
unregisterReceiver(systemReceiver)
|
||||||
|
|
||||||
serviceJob.cancel()
|
serviceJob.cancel()
|
||||||
player.release()
|
|
||||||
mediaSessionComponent.release()
|
mediaSessionComponent.release()
|
||||||
widgets.release()
|
widgets.release()
|
||||||
|
player.release()
|
||||||
|
|
||||||
playbackManager.removeCallback(this)
|
playbackManager.removeCallback(this)
|
||||||
settingsManager.removeCallback(this)
|
settingsManager.removeCallback(this)
|
||||||
|
@ -385,7 +385,6 @@ class PlaybackService :
|
||||||
private fun stopAndSave() {
|
private fun stopAndSave() {
|
||||||
stopForeground(true)
|
stopForeground(true)
|
||||||
isForeground = false
|
isForeground = false
|
||||||
|
|
||||||
saveScope.launch { playbackManager.saveStateToDatabase(this@PlaybackService) }
|
saveScope.launch { playbackManager.saveStateToDatabase(this@PlaybackService) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -406,8 +405,7 @@ class PlaybackService :
|
||||||
// a non-starter since both require me to display a permission prompt
|
// a non-starter since both require me to display a permission prompt
|
||||||
// 4. Some weird internal framework thing that also handles bluetooth headsets???
|
// 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
|
// They should have just stopped at ACTION_HEADSET_PLUG.
|
||||||
// *something* fills in the role.
|
|
||||||
AudioManager.ACTION_HEADSET_PLUG -> {
|
AudioManager.ACTION_HEADSET_PLUG -> {
|
||||||
when (intent.getIntExtra("state", -1)) {
|
when (intent.getIntExtra("state", -1)) {
|
||||||
0 -> pauseFromPlug()
|
0 -> pauseFromPlug()
|
||||||
|
|
|
@ -45,6 +45,9 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat
|
||||||
/**
|
/**
|
||||||
* The actual fragment containing the settings menu. Inherits [PreferenceFragmentCompat].
|
* The actual fragment containing the settings menu. Inherits [PreferenceFragmentCompat].
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
|
*
|
||||||
|
* TODO: Add option to restore state
|
||||||
|
* TODO: Add option to not restore state
|
||||||
*/
|
*/
|
||||||
@Suppress("UNUSED")
|
@Suppress("UNUSED")
|
||||||
class SettingsListFragment : PreferenceFragmentCompat() {
|
class SettingsListFragment : PreferenceFragmentCompat() {
|
||||||
|
|
|
@ -247,7 +247,6 @@ class SettingsManager private constructor(context: Context) :
|
||||||
*/
|
*/
|
||||||
interface Callback {
|
interface Callback {
|
||||||
fun onLibTabsUpdate(libTabs: Array<Tab>) {}
|
fun onLibTabsUpdate(libTabs: Array<Tab>) {}
|
||||||
fun onColorizeNotifUpdate(doColorize: Boolean) {}
|
|
||||||
fun onNotifActionUpdate(useAltAction: Boolean) {}
|
fun onNotifActionUpdate(useAltAction: Boolean) {}
|
||||||
fun onShowCoverUpdate(showCovers: Boolean) {}
|
fun onShowCoverUpdate(showCovers: Boolean) {}
|
||||||
fun onQualityCoverUpdate(doQualityCovers: Boolean) {}
|
fun onQualityCoverUpdate(doQualityCovers: Boolean) {}
|
||||||
|
|
|
@ -26,6 +26,8 @@ import org.oxycblt.auxio.playback.system.PlaybackService
|
||||||
import org.oxycblt.auxio.util.newBroadcastIntent
|
import org.oxycblt.auxio.util.newBroadcastIntent
|
||||||
import org.oxycblt.auxio.util.newMainIntent
|
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
|
* The default widget is displayed whenever there is no music playing. It just shows the message "No
|
||||||
* music playing".
|
* music playing".
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<resources>
|
<resources>
|
||||||
<integer name="detail_app_bar_title_anim_duration">150</integer>
|
<integer name="detail_app_bar_title_anim_duration">150</integer>
|
||||||
|
|
||||||
<!-- FIXME: Unify this with the integer table object by simply defining a class for each dependency. Will reduce bugs. -->
|
<!-- FIXME: Unify this with the integer table object by simply defining a class for each setting. -->
|
||||||
<!-- Preference values -->
|
<!-- Preference values -->
|
||||||
<string-array name="entries_theme">
|
<string-array name="entries_theme">
|
||||||
<item>@string/set_theme_auto</item>
|
<item>@string/set_theme_auto</item>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.6.10'
|
ext.kotlin_version = '1.6.21'
|
||||||
ext.navigation_version = "2.4.1"
|
ext.navigation_version = "2.4.2"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
|
@ -9,7 +9,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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 "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
|
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
|
||||||
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.3.0"
|
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.3.0"
|
||||||
|
|
Loading…
Reference in a new issue