Update dependencies
Update multiple dependencies to newer versions: RecyclerView 1.2.0 -> 1.3.0 Coil 1.1.1 -> 1.2.0 Media 1.2.1 -> 1.3.0 Navigation 2.3.4 -> 2.3.5 ExoPlayer 2.13.2 -> 2.13.3 This commit also removes all dependence on JCenter. Woohoo.
This commit is contained in:
parent
17e5aed131
commit
732b89a0b1
7 changed files with 14 additions and 31 deletions
|
@ -68,7 +68,7 @@ dependencies {
|
||||||
implementation "androidx.fragment:fragment-ktx:1.3.2"
|
implementation "androidx.fragment:fragment-ktx:1.3.2"
|
||||||
|
|
||||||
// UI
|
// UI
|
||||||
implementation "androidx.recyclerview:recyclerview:1.1.0"
|
implementation "androidx.recyclerview:recyclerview:1.2.0"
|
||||||
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
|
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
|
||||||
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
|
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ dependencies {
|
||||||
|
|
||||||
// Media
|
// Media
|
||||||
// TODO: Migrate to media2 when I can figure out how to use it
|
// TODO: Migrate to media2 when I can figure out how to use it
|
||||||
implementation "androidx.media:media:1.2.1"
|
implementation "androidx.media:media:1.3.0"
|
||||||
|
|
||||||
// Preferences
|
// Preferences
|
||||||
implementation "androidx.preference:preference-ktx:1.1.1"
|
implementation "androidx.preference:preference-ktx:1.1.1"
|
||||||
|
@ -93,7 +93,7 @@ dependencies {
|
||||||
// --- THIRD PARTY ---
|
// --- THIRD PARTY ---
|
||||||
|
|
||||||
// ExoPlayer
|
// ExoPlayer
|
||||||
def exoplayer_version = "2.13.2"
|
def exoplayer_version = "2.13.3"
|
||||||
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
|
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
|
||||||
implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version"
|
implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version"
|
||||||
|
|
||||||
|
|
|
@ -58,14 +58,14 @@ class QueueDragCallback(private val playbackModel: PlaybackViewModel) : ItemTouc
|
||||||
target: RecyclerView.ViewHolder
|
target: RecyclerView.ViewHolder
|
||||||
): Boolean {
|
): Boolean {
|
||||||
return playbackModel.moveQueueDataItems(
|
return playbackModel.moveQueueDataItems(
|
||||||
viewHolder.adapterPosition,
|
viewHolder.bindingAdapterPosition,
|
||||||
target.adapterPosition,
|
target.bindingAdapterPosition,
|
||||||
queueAdapter
|
queueAdapter
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
|
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
|
||||||
playbackModel.removeQueueDataItem(viewHolder.adapterPosition, queueAdapter)
|
playbackModel.removeQueueDataItem(viewHolder.bindingAdapterPosition, queueAdapter)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -59,7 +59,7 @@ class AboutDialog : BottomSheetDialogFragment() {
|
||||||
|
|
||||||
if (pkgName != null) {
|
if (pkgName != null) {
|
||||||
if (pkgName == "android") {
|
if (pkgName == "android") {
|
||||||
// No default browser [Must open app chooser, may not be supported
|
// No default browser [Must open app chooser, may not be supported]
|
||||||
openAppChooser(browserIntent)
|
openAppChooser(browserIntent)
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -20,11 +20,8 @@ class SettingsManager private constructor(context: Context) :
|
||||||
private val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context)
|
private val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context)
|
||||||
|
|
||||||
init {
|
init {
|
||||||
// If needed, we need to touch the song mode pref so that it migrates before something
|
// Poke the song playback mode pref so that it migrates [if it hasnt already]
|
||||||
// else is written by the Preference.
|
|
||||||
if (!sharedPrefs.contains(KEY_SONG_PLAYBACK_MODE)) {
|
|
||||||
handleSongPlayModeCompat(sharedPrefs)
|
handleSongPlayModeCompat(sharedPrefs)
|
||||||
}
|
|
||||||
|
|
||||||
sharedPrefs.registerOnSharedPreferenceChangeListener(this)
|
sharedPrefs.registerOnSharedPreferenceChangeListener(this)
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,15 +78,15 @@
|
||||||
<string name="setting_audio">Audio</string>
|
<string name="setting_audio">Audio</string>
|
||||||
<string name="setting_audio_focus">Audiofokus</string>
|
<string name="setting_audio_focus">Audiofokus</string>
|
||||||
<string name="setting_audio_focus_desc">Pausieren wenn anderes Audio abspielt [Bsp. Anrufe]</string>
|
<string name="setting_audio_focus_desc">Pausieren wenn anderes Audio abspielt [Bsp. Anrufe]</string>
|
||||||
<string name="setting_audio_plug_mgt">Kopfhöreranschluss</string>
|
<string name="setting_audio_plug_mgt">Kopfhörerafokus</string>
|
||||||
<string name="setting_audio_plug_mgt_desc">Abspielen/Pausieren wenn der Kopfhöreranschluss ändern</string>
|
<string name="setting_audio_plug_mgt_desc">Abspielen/Pausieren wenn der Kopfhöreranschluss ändern</string>
|
||||||
|
|
||||||
<string name="setting_behavior">Verhalten</string>
|
<string name="setting_behavior">Verhalten</string>
|
||||||
<string name="setting_behavior_song_playback_mode">Wenn ein Lied ausgewählt hat</string>
|
<string name="setting_behavior_song_playback_mode">Wenn ein Lied ausgewählt hat</string>
|
||||||
<string name="setting_behavior_keep_shuffle">Zufällig-Einstellung merken</string>
|
<string name="setting_behavior_keep_shuffle">Zufällig-Einstellung merken</string>
|
||||||
<string name="setting_behavior_keep_shuffle_desc">Lassen zufällig an, wenn ein neues Lied anspielen</string>
|
<string name="setting_behavior_keep_shuffle_desc">Lassen zufällig an, wenn ein neues Lied anspielen</string>
|
||||||
<string name="setting_behavior_rewind_prev">Zurückspulen, bevor zurück springen</string>
|
<string name="setting_behavior_rewind_prev">Zurückspulen bevor zurück springen</string>
|
||||||
<string name="setting_behavior_rewind_prev_desc">Zurückspulen, bevor zum vorheriger Lied springen</string>
|
<string name="setting_behavior_rewind_prev_desc">Zurückspulen bevor zum vorheriger Lied springen</string>
|
||||||
|
|
||||||
<string name="setting_content">Content</string>
|
<string name="setting_content">Content</string>
|
||||||
<string name="setting_content_save">Wiedergabezustand abspeichern</string>
|
<string name="setting_content_save">Wiedergabezustand abspeichern</string>
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
<string name="setting_audio">Audio</string>
|
<string name="setting_audio">Audio</string>
|
||||||
<string name="setting_audio_focus">Audio Focus</string>
|
<string name="setting_audio_focus">Audio Focus</string>
|
||||||
<string name="setting_audio_focus_desc">Pause when other audio plays [ex. Calls]</string>
|
<string name="setting_audio_focus_desc">Pause when other audio plays [ex. Calls]</string>
|
||||||
<string name="setting_audio_plug_mgt">Headset plug management</string>
|
<string name="setting_audio_plug_mgt">Headset focus</string>
|
||||||
<string name="setting_audio_plug_mgt_desc">Play/Pause when the headset connection changes</string>
|
<string name="setting_audio_plug_mgt_desc">Play/Pause when the headset connection changes</string>
|
||||||
|
|
||||||
<string name="setting_behavior">Behavior</string>
|
<string name="setting_behavior">Behavior</string>
|
||||||
|
|
16
build.gradle
16
build.gradle
|
@ -1,17 +1,11 @@
|
||||||
// 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.4.32"
|
ext.kotlin_version = "1.4.32"
|
||||||
ext.navigation_version = "2.3.4"
|
ext.navigation_version = "2.3.5"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|
||||||
jcenter {
|
|
||||||
content {
|
|
||||||
includeGroup("org.jetbrains.trove4j")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -28,14 +22,6 @@ allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|
||||||
// TODO: Eliminate Exoplayer when it migrates to GMaven
|
|
||||||
jcenter {
|
|
||||||
content {
|
|
||||||
includeGroup("com.google.android.exoplayer")
|
|
||||||
includeGroup("org.jetbrains.trove4j")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue