From 824ac56bfac5f4209ef6702c5b9ab7e7284efe59 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sat, 20 Mar 2021 19:54:41 -0600
Subject: [PATCH] Update libraries

Update libs to new versions, including the nav framework from 1.0.0 -> 2.3.4.
---
 app/build.gradle                                         | 9 +++------
 app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt | 1 +
 .../org/oxycblt/auxio/playback/system/PlaybackService.kt | 1 -
 .../oxycblt/auxio/settings/blacklist/BlacklistDialog.kt  | 9 +++++++--
 build.gradle                                             | 6 ++++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bbef156ef..6bb23e81b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,6 @@ android {
         buildFeatures {
             dataBinding true
         }
-
-        vectorDrawables.useSupportLibrary = true
     }
 
     buildTypes {
@@ -63,8 +61,8 @@ dependencies {
 
     // General
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.activity:activity-ktx:1.3.0-alpha03'
-    implementation 'androidx.fragment:fragment-ktx:1.3.0'
+    implementation 'androidx.activity:activity-ktx:1.3.0-alpha04'
+    implementation 'androidx.fragment:fragment-ktx:1.3.1'
 
     // Layout
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
@@ -73,7 +71,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
     // Navigation
-    def navigation_version = "2.3.3"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 
@@ -90,7 +87,7 @@ dependencies {
     // --- THIRD PARTY ---
 
     // ExoPlayer
-    def exoplayer_version = "2.12.3"
+    def exoplayer_version = "2.13.2"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
     implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version"
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
index 21a5bf1ab..d50647869 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt
@@ -42,6 +42,7 @@ class MusicLoader(private val context: Context) {
         linkGenres()
     }
 
+    @Suppress("DEPRECATION")
     private fun buildSelector() {
         val blacklistDatabase = BlacklistDatabase.getInstance(context)
 
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 1c389968f..cd3523c35 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
@@ -58,7 +58,6 @@ import org.oxycblt.auxio.ui.getSystemServiceSafe
  */
 class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Callback, SettingsManager.Callback {
     private val player: SimpleExoPlayer by lazy(::newPlayer)
-
     private val playbackManager = PlaybackStateManager.getInstance()
     private val settingsManager = SettingsManager.getInstance()
 
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
index 70a0f6889..329615078 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
@@ -98,7 +98,7 @@ class BlacklistDialog : BottomSheetDialogFragment() {
 
             folderChooser(
                 requireContext(),
-                initialDirectory = File(Environment.getExternalStorageDirectory().absolutePath),
+                initialDirectory = File(getRootPath()),
                 emptyTextRes = R.string.label_no_dirs
             )
 
@@ -122,7 +122,7 @@ class BlacklistDialog : BottomSheetDialogFragment() {
             // Due to how Auxio's navigation flow works, dont allow the main root directory
             // to be excluded, as that would lead to the user being stuck at the "No Music Found"
             // screen.
-            if (path == Environment.getExternalStorageDirectory().absolutePath) {
+            if (path == getRootPath()) {
                 getString(R.string.error_brick_dir).createToast(requireContext())
 
                 return
@@ -149,4 +149,9 @@ class BlacklistDialog : BottomSheetDialogFragment() {
 
         exitProcess(0)
     }
+
+    @Suppress("DEPRECATION")
+    private fun getRootPath(): String {
+        return Environment.getExternalStorageDirectory().absolutePath
+    }
 }
diff --git a/build.gradle b/build.gradle
index cc2ef9de1..75abc7ac9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = '1.4.31'
+    ext.navigation_version = "2.3.4"
 
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files