From 64d4b908701bc429f4eeda1ff5ce43265ef3e2c8 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Fri, 16 Apr 2021 20:01:52 -0600
Subject: [PATCH] Fix tooltip display bug

Fix a problem where tooltips in dialogs would have a non-transparent background.
---
 .../java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt | 8 --------
 .../java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt | 6 ++++++
 app/src/main/res/values/styles.xml                        | 1 -
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
index 177ef3360..a5e1e49ce 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import org.oxycblt.auxio.detail.adapters.ArtistDetailAdapter
@@ -60,18 +59,11 @@ class ArtistDetailFragment : DetailFragment() {
 
         // --- UI SETUP ---
 
-        val imgLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) {
-        }
-
         binding.lifecycleOwner = this
 
         setupToolbar()
         setupRecycler(detailAdapter)
 
-        binding.detailToolbar.setOnClickListener {
-            imgLauncher.launch("image/*")
-        }
-
         // --- VIEWMODEL SETUP ---
 
         detailModel.artistSortMode.observe(viewLifecycleOwner) { mode ->
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt b/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt
index 2f722b013..cf4761e63 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/ui/LifecycleDialog.kt
@@ -7,6 +7,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.oxycblt.auxio.R
+import org.oxycblt.auxio.ui.toDrawable
 
 /**
  * A wrapper around [DialogFragment] that allows the usage of the standard Auxio lifecycle
@@ -16,6 +18,10 @@ abstract class LifecycleDialog : AppCompatDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val builder = MaterialAlertDialogBuilder(requireActivity(), theme)
 
+        // Setting the background in XML will also apply it to the tooltip for some inane reason
+        // so we have to do it programmatically instead.
+        builder.background = R.color.background.toDrawable(requireContext())
+
         onConfigDialog(builder)
 
         return builder.create()
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 70c251ea7..760507313 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -93,7 +93,6 @@
 
     <!-- Custom Dialog EntryNames -->
     <style name="Theme.CustomDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="android:background">@color/background</item>
         <item name="android:colorControlHighlight">@color/selection_color</item>
         <item name="android:checkedTextViewStyle">@style/Widget.CheckedTextView.Dialog</item>