From fcac40c3cd076e38aad087d49e4a775d22a6b88c Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Fri, 17 Dec 2021 23:50:03 +0100
Subject: [PATCH] Adjust EditFavoritesView label style

---
 .../ui/legacy/component/EditFavoritesView.kt  | 21 +++++++------------
 .../main/res/layout/edit_favorites_title.xml  | 21 +++++++++++++++++++
 ui/src/main/res/values/EditFavoritesView.xml  |  9 --------
 3 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 ui/src/main/res/layout/edit_favorites_title.xml
 delete mode 100644 ui/src/main/res/values/EditFavoritesView.xml

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesView.kt
index aac088de..88d1a03f 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesView.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/EditFavoritesView.kt
@@ -8,9 +8,11 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateMargins
 import androidx.core.widget.TextViewCompat
+import com.google.android.material.textview.MaterialTextView
 import de.mm20.launcher2.favorites.FavoritesItem
 import de.mm20.launcher2.favorites.FavoritesViewModel
 import de.mm20.launcher2.ktx.dp
@@ -18,6 +20,8 @@ import de.mm20.launcher2.ktx.lifecycleScope
 import de.mm20.launcher2.ktx.setPadding
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.databinding.DialogEditFavoritesBinding
+import de.mm20.launcher2.ui.databinding.EditFavoritesRowBinding
+import de.mm20.launcher2.ui.databinding.EditFavoritesTitleBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -125,20 +129,9 @@ class EditFavoritesView @JvmOverloads constructor(
     }
 
     private fun getLabel(@StringRes label: Int): FrameLayout {
-        return FrameLayout(context).also {
-            it.addView(TextView(context).also {
-                TextViewCompat.setTextAppearance(it, R.style.TextAppearance_EditFavorites)
-                it.setText(label)
-                it.setPadding((8 * dp).toInt(), (4 * dp).toInt())
-                it.layoutParams = MarginLayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).also {
-                    it.updateMargins(top = (2 * dp).toInt())
-                }
-                it.setBackgroundColor(ContextCompat.getColor(context, R.color.color_divider))
-            })
-            it.addView(View(context).also {
-                it.visibility = View.GONE
-            })
-        }
+        return EditFavoritesTitleBinding.inflate(LayoutInflater.from(context)).also {
+            it.text.setText(label)
+        }.root
 
     }
 }
\ No newline at end of file
diff --git a/ui/src/main/res/layout/edit_favorites_title.xml b/ui/src/main/res/layout/edit_favorites_title.xml
new file mode 100644
index 00000000..d5d0b1ef
--- /dev/null
+++ b/ui/src/main/res/layout/edit_favorites_title.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="?colorOnSecondaryContainer"
+        android:layout_marginTop="4dp"
+        android:background="?colorSecondaryContainer"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="8dp"
+        android:textAppearance="?textAppearanceLabelMedium" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone" />
+</FrameLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/values/EditFavoritesView.xml b/ui/src/main/res/values/EditFavoritesView.xml
deleted file mode 100644
index 1a2b80af..00000000
--- a/ui/src/main/res/values/EditFavoritesView.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="TextAppearance_EditFavorites">
-        <item name="android:color">@color/text_color_primary</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
-</resources>