From 1ae4d21b185e468fbee8cfb53f55d6ca10ca25b7 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Thu, 14 Jan 2021 07:42:56 -0700
Subject: [PATCH] Create dedicated app object

Create a dedicated app object to fix issues with settings initialization & image loading.
---
 app/proguard-rules.pro                        |  1 +
 app/src/main/AndroidManifest.xml              |  1 +
 .../main/java/org/oxycblt/auxio/AuxioApp.kt   | 29 +++++++++++++++++
 .../main/java/org/oxycblt/auxio/LogUtils.kt   |  2 +-
 .../java/org/oxycblt/auxio/MainActivity.kt    | 10 +-----
 .../java/org/oxycblt/auxio/MainFragment.kt    |  8 ++---
 .../java/org/oxycblt/auxio/coil/CoilUtils.kt  | 31 -------------------
 7 files changed, 35 insertions(+), 47 deletions(-)
 create mode 100644 app/src/main/java/org/oxycblt/auxio/AuxioApp.kt

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 161f13dd3..7c8201051 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -22,4 +22,5 @@
 
 -dontobfuscate
 
+-keep class org.oxycblt.auxio.AuxioApp
 -keep class org.oxycblt.auxio.settings.SettingsListFragment
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 037771b66..808e1d476 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <queries />
 
     <application
+        android:name="org.oxycblt.auxio.AuxioApp"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
new file mode 100644
index 000000000..1940999ec
--- /dev/null
+++ b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
@@ -0,0 +1,29 @@
+package org.oxycblt.auxio
+
+import android.app.Application
+import androidx.appcompat.app.AppCompatDelegate
+import coil.ImageLoader
+import coil.ImageLoaderFactory
+import coil.request.CachePolicy
+import org.oxycblt.auxio.settings.SettingsManager
+
+@Suppress("UNUSED")
+class AuxioApp : Application(), ImageLoaderFactory {
+    override fun onCreate() {
+        super.onCreate()
+
+        // Init SettingsManager here so that there aren't any race conditions
+        // [e,g Service starts/gets SettingsManager before activity can init SettingsManager]
+        val settingsManager = SettingsManager.init(applicationContext)
+
+        AppCompatDelegate.setDefaultNightMode(settingsManager.theme)
+    }
+
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(applicationContext)
+            .diskCachePolicy(CachePolicy.DISABLED)
+            .crossfade(true)
+            .placeholder(android.R.color.transparent)
+            .build()
+    }
+}
diff --git a/app/src/main/java/org/oxycblt/auxio/LogUtils.kt b/app/src/main/java/org/oxycblt/auxio/LogUtils.kt
index dde8b5bb3..481fb24ba 100644
--- a/app/src/main/java/org/oxycblt/auxio/LogUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/LogUtils.kt
@@ -3,7 +3,7 @@ package org.oxycblt.auxio
 import android.util.Log
 
 // Shortcut functions for logging.
-// Yes, I know timber exists but it does too much.
+// Yes, I know timber exists but this does what I need.
 
 /**
  * Shortcut method for logging a debug statement, handles debug builds and anonymous objects
diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 4f8c12e67..a28c3ee79 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -6,10 +6,8 @@ import android.os.Bundle
 import android.view.View
 import android.view.WindowInsets
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.databinding.DataBindingUtil
 import coil.Coil
-import org.oxycblt.auxio.coil.createImageLoader
 import org.oxycblt.auxio.databinding.ActivityMainBinding
 import org.oxycblt.auxio.playback.PlaybackService
 import org.oxycblt.auxio.settings.SettingsManager
@@ -28,9 +26,7 @@ class MainActivity : AppCompatActivity() {
             this, R.layout.activity_main
         )
 
-        val settingsManager = SettingsManager.init(applicationContext)
-
-        AppCompatDelegate.setDefaultNightMode(settingsManager.theme)
+        val settingsManager = SettingsManager.getInstance()
 
         accent = settingsManager.accent
 
@@ -40,10 +36,6 @@ class MainActivity : AppCompatActivity() {
         if (isEdgeOn()) {
             doEdgeToEdgeSetup(binding)
         }
-
-        createImageLoader(applicationContext)?.let {
-            Coil.setImageLoader(it)
-        }
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index e3a247c2c..2c1e6024f 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -93,13 +93,9 @@ class MainFragment : Fragment() {
             if (it != null && navController != null) {
                 val curDest = navController.currentDestination?.id
 
-                var isOk = false
-
+                // SongsFragment and SettingsFragment have no navigation pathways, so correct
+                // them to the library tab instead.
                 if (curDest == R.id.songs_fragment || curDest == R.id.settings_fragment) {
-                    isOk = true
-                }
-
-                if (isOk) {
                     binding.navBar.selectedItemId = R.id.library_fragment
                 }
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt b/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt
index 72095d5f9..1cf256963 100644
--- a/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt
@@ -3,13 +3,10 @@ package org.oxycblt.auxio.coil
 import android.content.Context
 import android.graphics.Bitmap
 import android.net.Uri
-import android.util.Log
 import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
 import androidx.databinding.BindingAdapter
 import coil.Coil
-import coil.ImageLoader
-import coil.request.CachePolicy
 import coil.request.ImageRequest
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.logE
@@ -25,34 +22,6 @@ val settingsManager: SettingsManager by lazy {
     SettingsManager.getInstance()
 }
 
-/**
- * Create the custom [ImageLoader] used by Auxio. Primarily handles whether disk-caching should be done.
- * @return A new [ImageLoader], null if the current loader already satisfies what is needed.
- */
-fun createImageLoader(context: Context): ImageLoader? {
-    Log.d("createImageLoader", "Creating image loader.")
-
-    val builder = ImageLoader.Builder(context)
-    val currentLoader = Coil.imageLoader(context)
-
-    // Enable disk caching if quality covers are being used so that its more efficient.
-    // Don't bother if not however, as the covers are already cached on-disk.
-    if (settingsManager.useQualityCovers) {
-        if (currentLoader.defaults.diskCachePolicy != CachePolicy.ENABLED) {
-            builder.diskCachePolicy(CachePolicy.ENABLED)
-
-            return builder.build()
-        }
-    } else {
-        if (currentLoader.defaults.diskCachePolicy != CachePolicy.DISABLED) {
-            builder.diskCachePolicy(CachePolicy.DISABLED)
-
-            return builder.build()
-        }
-    }
-    return null
-}
-
 /**
  * Get a bitmap for a song. onDone will be called when the bitmap is loaded.
  * **Do not use this on the UI elements, instead use the Binding Adapters.**