From 353d856bf5b95f47b9f09a6179039b82ac289870 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 12 Dec 2023 14:18:49 +0200
Subject: [PATCH] Fix chips style

---
 .../koitharu/kotatsu/core/ui/widgets/ChipsView.kt   | 12 +++++-------
 app/src/main/res/layout/sheet_filter.xml            |  4 ++--
 app/src/main/res/values/styles.xml                  | 13 ++-----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ChipsView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ChipsView.kt
index 51353a640..f8a8eb6f6 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ChipsView.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ChipsView.kt
@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.ui.widgets
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View.OnClickListener
@@ -27,6 +26,7 @@ class ChipsView @JvmOverloads constructor(
 	private val chipOnCloseListener = OnClickListener {
 		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
 	}
+	private val chipStyle: Int
 	var onChipClickListener: OnChipClickListener? = null
 		set(value) {
 			field = value
@@ -41,10 +41,9 @@ class ChipsView @JvmOverloads constructor(
 		}
 
 	init {
-		@SuppressLint("CustomViewStyleable")
-		val a = context.obtainStyledAttributes(null, com.google.android.material.R.styleable.Chip, 0, R.style.Widget_Kotatsu_Chip)
-		a.recycle()
-
+		chipStyle = context.obtainStyledAttributes(attrs, R.styleable.ChipsView, defStyleAttr, 0).use {
+			it.getResourceId(R.styleable.ChipsView_chipStyle, R.style.Widget_Kotatsu_Chip)
+		}
 		if (isInEditMode) {
 			setChips(
 				List(5) {
@@ -104,12 +103,11 @@ class ChipsView @JvmOverloads constructor(
 
 	private fun addChip(): Chip {
 		val chip = Chip(context)
-		val drawable = ChipDrawable.createFromAttributes(context, null, 0, R.style.Widget_Kotatsu_Chip)
+		val drawable = ChipDrawable.createFromAttributes(context, null, 0, chipStyle)
 		chip.setChipDrawable(drawable)
 		chip.isCheckedIconVisible = true
 		chip.isChipIconVisible = false
 		chip.setCheckedIconResource(R.drawable.ic_check)
-		// chip.checkedIconTint = chip.ic
 		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
diff --git a/app/src/main/res/layout/sheet_filter.xml b/app/src/main/res/layout/sheet_filter.xml
index e906dbad5..d2dfc559e 100644
--- a/app/src/main/res/layout/sheet_filter.xml
+++ b/app/src/main/res/layout/sheet_filter.xml
@@ -114,10 +114,10 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="8dp"
-				android:paddingVertical="8dp"
 				android:drawablePadding="16dp"
-				android:paddingHorizontal="@dimen/margin_normal"
 				android:gravity="center_vertical"
+				android:paddingHorizontal="@dimen/margin_normal"
+				android:paddingVertical="8dp"
 				android:textAppearance="?textAppearanceBodySmall"
 				android:visibility="gone"
 				app:drawableStartCompat="@drawable/ic_error_small"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b798ee9f2..af2f217b9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -120,18 +120,9 @@
 		<item name="trackCornerRadius">@dimen/mtrl_progress_indicator_full_rounded_corner_radius</item>
 	</style>
 
-	<style name="Widget.Kotatsu.Chip" parent="Widget.Material3.Chip.Suggestion">
-		<!--<item name="chipBackgroundColor">?attr/m3ColorBackground</item>-->
-		<item name="rippleColor">?attr/colorControlHighlight</item>
+	<style name="Widget.Kotatsu.Chip" parent="Widget.Material3.Chip.Suggestion" />
 
-		<!-- Custom chip states -->
-		<item name="android:clickable">true</item>
-		<item name="android:focusable">true</item>
-	</style>
-
-	<style name="Widget.Kotatsu.Chip.Filter" parent="Widget.Material3.Chip.Filter">
-
-	</style>
+	<style name="Widget.Kotatsu.Chip.Filter" parent="Widget.Material3.Chip.Filter" />
 
 	<style name="Widget.Kotatsu.Button.More" parent="Widget.Material3.Button.TextButton">
 		<item name="android:minWidth">48dp</item>