From 887868ff9ca9ca566f4d904e59d92e7a103d01e3 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sun, 4 Apr 2021 09:46:58 -0600
Subject: [PATCH] Remove custom title UIs from dialogs

Replace the custom title TextViews in AccentDialog/BlacklistDialog with the built-in title text.
---
 app/src/main/AndroidManifest.xml              |  1 -
 .../auxio/settings/accent/AccentDialog.kt     |  3 ++
 .../settings/blacklist/BlacklistDialog.kt     | 15 +++----
 app/src/main/res/layout/dialog_accent.xml     | 44 +++++--------------
 app/src/main/res/layout/dialog_blacklist.xml  | 14 +-----
 app/src/main/res/values/styles.xml            |  2 +-
 6 files changed, 23 insertions(+), 56 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a403aaab..3e6be47d6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,6 @@
         </activity>
         <service
             android:name=".playback.system.PlaybackService"
-            android:description="@string/info_service_desc"
             android:foregroundServiceType="mediaPlayback"
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher_round" />
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/accent/AccentDialog.kt b/app/src/main/java/org/oxycblt/auxio/settings/accent/AccentDialog.kt
index 8efb79d36..1531967b4 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/accent/AccentDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/accent/AccentDialog.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
+import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogAccentBinding
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.settings.SettingsManager
@@ -56,6 +57,8 @@ class AccentDialog : LifecycleDialog() {
     }
 
     override fun onConfigDialog(builder: AlertDialog.Builder) {
+        builder.setTitle(R.string.setting_accent)
+
         builder.setPositiveButton(android.R.string.ok) { _, _ ->
             if (pendingAccent != Accent.get()) {
                 settingsManager.accent = pendingAccent
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 2c30f52ee..6fed9dd82 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
@@ -1,6 +1,5 @@
 package org.oxycblt.auxio.settings.blacklist
 
-import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -86,14 +85,9 @@ class BlacklistDialog : LifecycleDialog() {
         return binding.root
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-
-        // If we have dismissed the dialog, then just drop any path changes.
-        blacklistModel.loadDatabasePaths()
-    }
-
     override fun onConfigDialog(builder: AlertDialog.Builder) {
+        builder.setTitle(R.string.setting_content_blacklist)
+
         // Dont set the click listener here, we do some custom black magic in onCreateView instead.
         builder.setNeutralButton(R.string.label_add, null)
         builder.setPositiveButton(R.string.label_save, null)
@@ -101,7 +95,10 @@ class BlacklistDialog : LifecycleDialog() {
     }
 
     private fun addDocTreePath(uri: Uri?) {
-        uri ?: return
+        // A null URI means that the user left the file picker without picking a directory
+        if (uri == null) {
+            return
+        }
 
         val path = parseDocTreePath(uri)
 
diff --git a/app/src/main/res/layout/dialog_accent.xml b/app/src/main/res/layout/dialog_accent.xml
index 6891e38ad..ad153077e 100644
--- a/app/src/main/res/layout/dialog_accent.xml
+++ b/app/src/main/res/layout/dialog_accent.xml
@@ -3,39 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <LinearLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/accent_recycler"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/background"
-        android:orientation="vertical"
-        android:theme="@style/Theme.Neutral">
+        android:layout_height="match_parent"
+        android:paddingTop="@dimen/margin_medium"
+        android:foregroundGravity="center"
+        android:overScrollMode="never"
+        app:layoutManager="org.oxycblt.auxio.settings.accent.AutoGridLayoutManager"
+        app:layout_constraintBottom_toTopOf="@+id/accent_cancel"
+        app:layout_constraintTop_toBottomOf="@+id/accent_header"
+        tools:itemCount="18"
+        tools:listitem="@layout/item_accent" />
 
-        <TextView
-            android:id="@+id/accent_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/inter_exbold"
-            android:padding="@dimen/padding_medium"
-            android:text="@string/setting_accent"
-            android:paddingHorizontal="10dp"
-            android:textAlignment="viewStart"
-            android:textColor="?attr/colorPrimary"
-            android:textSize="@dimen/text_size_toolbar_header"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/accent_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:foregroundGravity="center"
-            android:overScrollMode="never"
-            app:layoutManager="org.oxycblt.auxio.settings.accent.AutoGridLayoutManager"
-            app:layout_constraintBottom_toTopOf="@+id/accent_cancel"
-            app:layout_constraintTop_toBottomOf="@+id/accent_header"
-            tools:itemCount="18"
-            tools:listitem="@layout/item_accent" />
-
-    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_blacklist.xml b/app/src/main/res/layout/dialog_blacklist.xml
index b607506dc..1c6efdd4f 100644
--- a/app/src/main/res/layout/dialog_blacklist.xml
+++ b/app/src/main/res/layout/dialog_blacklist.xml
@@ -9,26 +9,16 @@
         android:layout_height="wrap_content"
         android:background="@color/background"
         android:orientation="vertical"
+        android:paddingTop="@dimen/margin_medium"
         android:theme="@style/Theme.Neutral">
 
-        <TextView
-            android:id="@+id/blacklist_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/inter_exbold"
-            android:padding="@dimen/padding_medium"
-            android:text="@string/setting_content_blacklist"
-            android:textAlignment="viewStart"
-            android:textColor="?attr/colorPrimary"
-            android:textSize="@dimen/text_size_toolbar_header" />
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/blacklist_recycler"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_gravity="center"
             android:layout_weight="1"
-            android:overScrollMode="never"
+            android:overScrollMode="always"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:itemCount="1"
             tools:listitem="@layout/item_blacklist_entry" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 19c1ebd76..70c251ea7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,9 +9,9 @@
     <style name="Theme.Base" parent="Theme.Template">
         <item name="android:windowBackground">@color/background</item>
         <item name="android:fontFamily">@font/inter</item>
-        <item name="android:textCursorDrawable">@drawable/ui_cursor</item>
         <item name="android:scrollbars">none</item>
         <item name="android:windowIsFloating">false</item>
+        <item name="android:textCursorDrawable">@drawable/ui_cursor</item>
 
         <!-- Interim default values for the accents. -->
         <item name="colorPrimary">@color/design_default_color_primary</item>