From bd099aee7ba4905cabe8d72cef6002031ccd084d Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sun, 6 Feb 2022 09:08:10 -0700 Subject: [PATCH] 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 --- app/build.gradle | 4 ++-- app/src/main/java/org/oxycblt/auxio/MainFragment.kt | 2 +- .../main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt | 2 -- .../main/java/org/oxycblt/auxio/excluded/ExcludedDialog.kt | 1 - .../java/org/oxycblt/auxio/settings/SettingsListFragment.kt | 2 +- .../java/org/oxycblt/auxio/settings/pref/IntListPreference.kt | 4 +++- build.gradle | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e1c9cdf6e..f8c72d352 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,7 @@ dependencies { // General implementation "androidx.core:core-ktx:1.7.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 implementation "androidx.recyclerview:recyclerview:1.2.1" @@ -88,7 +88,7 @@ dependencies { implementation "androidx.media:media:1.4.3" // Preferences - implementation "androidx.preference:preference-ktx:1.1.1" + implementation "androidx.preference:preference-ktx:1.2.0" // --- THIRD PARTY --- diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index bab9092a7..0da9ef221 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -166,7 +166,7 @@ class MainFragment : Fragment() { if (!binding.playbackLayout.collapse()) { val navController = binding.exploreNavHost.findNavController() - if (navController.currentDestination?.id == navController.graph.startDestination) { + if (navController.currentDestination?.id == navController.graph.startDestinationId) { isEnabled = false requireActivity().onBackPressed() isEnabled = true diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt index e6f0585a4..689f8113d 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt @@ -45,8 +45,6 @@ import org.oxycblt.auxio.util.showToast /** * The [DetailFragment] for an album. * @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() { private val args: AlbumDetailFragmentArgs by navArgs() diff --git a/app/src/main/java/org/oxycblt/auxio/excluded/ExcludedDialog.kt b/app/src/main/java/org/oxycblt/auxio/excluded/ExcludedDialog.kt index 5949a5d47..bb339023d 100644 --- a/app/src/main/java/org/oxycblt/auxio/excluded/ExcludedDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/excluded/ExcludedDialog.kt @@ -122,7 +122,6 @@ class ExcludedDialog : LifecycleDialog() { if (path != null) { excludedModel.addPath(path) } else { - // TODO: Maybe tolerate this? requireContext().showToast(R.string.err_bad_dir) } } 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 21006df6e..e20a184fb 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt @@ -75,7 +75,7 @@ class SettingsListFragment : PreferenceFragmentCompat() { setPreferencesFromResource(R.xml.prefs_main, rootKey) } - override fun onDisplayPreferenceDialog(preference: Preference?) { + override fun onDisplayPreferenceDialog(preference: Preference) { if (preference is IntListPreference) { IntListPrefDialog.from(preference).show(childFragmentManager, IntListPrefDialog.TAG) } else { diff --git a/app/src/main/java/org/oxycblt/auxio/settings/pref/IntListPreference.kt b/app/src/main/java/org/oxycblt/auxio/settings/pref/IntListPreference.kt index 8f277d86b..6b163b8c2 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/pref/IntListPreference.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/pref/IntListPreference.kt @@ -18,6 +18,7 @@ package org.oxycblt.auxio.settings.pref +import android.annotation.SuppressLint import android.content.Context import android.content.res.TypedArray import android.util.AttributeSet @@ -95,8 +96,9 @@ class IntListPreference @JvmOverloads constructor( } } + @SuppressLint("PrivateResource") private inner class IntListSummaryProvider : SummaryProvider { - override fun provideSummary(preference: IntListPreference?): CharSequence { + override fun provideSummary(preference: IntListPreference): CharSequence { val index = getValueIndex() if (index != -1) { diff --git a/build.gradle b/build.gradle index 4219249e5..105788e01 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.3.5" + ext.navigation_version = "2.5.0-alpha01" // TODO: Downgrade back to 2.4.1 when it is out repositories { google()