deps: upgrade
Like a while loop with no escape Navigation -> 2.5.0-alpha01 [workaround for AGP 7.1] Preference -> 1.2.0 Fragment -> 1.4.1
This commit is contained in:
parent
0209e526e1
commit
bd099aee7b
7 changed files with 8 additions and 9 deletions
|
@ -64,7 +64,7 @@ dependencies {
|
||||||
// General
|
// General
|
||||||
implementation "androidx.core:core-ktx:1.7.0"
|
implementation "androidx.core:core-ktx:1.7.0"
|
||||||
implementation "androidx.activity:activity-ktx:1.4.0"
|
implementation "androidx.activity:activity-ktx:1.4.0"
|
||||||
implementation 'androidx.fragment:fragment-ktx:1.4.0'
|
implementation 'androidx.fragment:fragment-ktx:1.4.1'
|
||||||
|
|
||||||
// UI
|
// UI
|
||||||
implementation "androidx.recyclerview:recyclerview:1.2.1"
|
implementation "androidx.recyclerview:recyclerview:1.2.1"
|
||||||
|
@ -88,7 +88,7 @@ dependencies {
|
||||||
implementation "androidx.media:media:1.4.3"
|
implementation "androidx.media:media:1.4.3"
|
||||||
|
|
||||||
// Preferences
|
// Preferences
|
||||||
implementation "androidx.preference:preference-ktx:1.1.1"
|
implementation "androidx.preference:preference-ktx:1.2.0"
|
||||||
|
|
||||||
// --- THIRD PARTY ---
|
// --- THIRD PARTY ---
|
||||||
|
|
||||||
|
|
|
@ -166,7 +166,7 @@ class MainFragment : Fragment() {
|
||||||
if (!binding.playbackLayout.collapse()) {
|
if (!binding.playbackLayout.collapse()) {
|
||||||
val navController = binding.exploreNavHost.findNavController()
|
val navController = binding.exploreNavHost.findNavController()
|
||||||
|
|
||||||
if (navController.currentDestination?.id == navController.graph.startDestination) {
|
if (navController.currentDestination?.id == navController.graph.startDestinationId) {
|
||||||
isEnabled = false
|
isEnabled = false
|
||||||
requireActivity().onBackPressed()
|
requireActivity().onBackPressed()
|
||||||
isEnabled = true
|
isEnabled = true
|
||||||
|
|
|
@ -45,8 +45,6 @@ import org.oxycblt.auxio.util.showToast
|
||||||
/**
|
/**
|
||||||
* The [DetailFragment] for an album.
|
* The [DetailFragment] for an album.
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
* TODO: Disable queue adding when there is no playback here too, however make it so that
|
|
||||||
* it updates when the song changes.
|
|
||||||
*/
|
*/
|
||||||
class AlbumDetailFragment : DetailFragment() {
|
class AlbumDetailFragment : DetailFragment() {
|
||||||
private val args: AlbumDetailFragmentArgs by navArgs()
|
private val args: AlbumDetailFragmentArgs by navArgs()
|
||||||
|
|
|
@ -122,7 +122,6 @@ class ExcludedDialog : LifecycleDialog() {
|
||||||
if (path != null) {
|
if (path != null) {
|
||||||
excludedModel.addPath(path)
|
excludedModel.addPath(path)
|
||||||
} else {
|
} else {
|
||||||
// TODO: Maybe tolerate this?
|
|
||||||
requireContext().showToast(R.string.err_bad_dir)
|
requireContext().showToast(R.string.err_bad_dir)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,7 +75,7 @@ class SettingsListFragment : PreferenceFragmentCompat() {
|
||||||
setPreferencesFromResource(R.xml.prefs_main, rootKey)
|
setPreferencesFromResource(R.xml.prefs_main, rootKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDisplayPreferenceDialog(preference: Preference?) {
|
override fun onDisplayPreferenceDialog(preference: Preference) {
|
||||||
if (preference is IntListPreference) {
|
if (preference is IntListPreference) {
|
||||||
IntListPrefDialog.from(preference).show(childFragmentManager, IntListPrefDialog.TAG)
|
IntListPrefDialog.from(preference).show(childFragmentManager, IntListPrefDialog.TAG)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
package org.oxycblt.auxio.settings.pref
|
package org.oxycblt.auxio.settings.pref
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.res.TypedArray
|
import android.content.res.TypedArray
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
|
@ -95,8 +96,9 @@ class IntListPreference @JvmOverloads constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("PrivateResource")
|
||||||
private inner class IntListSummaryProvider : SummaryProvider<IntListPreference> {
|
private inner class IntListSummaryProvider : SummaryProvider<IntListPreference> {
|
||||||
override fun provideSummary(preference: IntListPreference?): CharSequence {
|
override fun provideSummary(preference: IntListPreference): CharSequence {
|
||||||
val index = getValueIndex()
|
val index = getValueIndex()
|
||||||
|
|
||||||
if (index != -1) {
|
if (index != -1) {
|
||||||
|
|
|
@ -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.10'
|
||||||
ext.navigation_version = "2.3.5"
|
ext.navigation_version = "2.5.0-alpha01" // TODO: Downgrade back to 2.4.1 when it is out
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
|
|
Loading…
Reference in a new issue