From ec6b8224aec1beb27231c0e120f662b13986cb99 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 29 Mar 2022 08:23:15 +0300
Subject: [PATCH] Update favourite bottom sheet

---
 .../org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt   |  4 ++--
 .../ui/categories/select/FavouriteCategoriesDialog.kt |  6 ++++--
 .../ui/categories/select/adapter/MangaCaegoryAD.kt    |  8 ++++----
 .../main/res/layout/dialog_favorite_categories.xml    | 11 ++---------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
index b2146c3ba..0672b880f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
@@ -9,11 +9,11 @@ import android.view.ViewGroup.LayoutParams
 import androidx.appcompat.app.AppCompatDialog
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.R as materialR
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
-import com.google.android.material.R as materialR
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
@@ -60,4 +60,4 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		}
 		b.isDraggable = !isLocked
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
index a7918e362..3ee1f8c17 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
@@ -22,8 +22,10 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class FavouriteCategoriesDialog : BaseBottomSheet<DialogFavoriteCategoriesBinding>(),
-	OnListItemClickListener<MangaCategoryItem>, CategoriesEditDelegate.CategoriesEditCallback,
+class FavouriteCategoriesDialog :
+	BaseBottomSheet<DialogFavoriteCategoriesBinding>(),
+	OnListItemClickListener<MangaCategoryItem>,
+	CategoriesEditDelegate.CategoriesEditCallback,
 	View.OnClickListener {
 
 	private val viewModel by viewModel<MangaCategoriesViewModel> {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt
index c231cc2cd..c9ce1e8b2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt
@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.favourites.ui.categories.select.adapter
 
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.ItemCategoryCheckableBinding
+import org.koitharu.kotatsu.databinding.ItemCheckableNewBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
 
 fun mangaCategoryAD(
 	clickListener: OnListItemClickListener<MangaCategoryItem>
-) = adapterDelegateViewBinding<MangaCategoryItem, MangaCategoryItem, ItemCategoryCheckableBinding>(
-	{ inflater, parent -> ItemCategoryCheckableBinding.inflate(inflater, parent, false) }
+) = adapterDelegateViewBinding<MangaCategoryItem, MangaCategoryItem, ItemCheckableNewBinding>(
+	{ inflater, parent -> ItemCheckableNewBinding.inflate(inflater, parent, false) }
 ) {
 
 	itemView.setOnClickListener {
@@ -16,7 +16,7 @@ fun mangaCategoryAD(
 	}
 
 	bind {
-		with(binding.checkedTextView) {
+		with(binding.root) {
 			text = item.name
 			isChecked = item.isChecked
 		}
diff --git a/app/src/main/res/layout/dialog_favorite_categories.xml b/app/src/main/res/layout/dialog_favorite_categories.xml
index a510d4c8c..00001e5fb 100644
--- a/app/src/main/res/layout/dialog_favorite_categories.xml
+++ b/app/src/main/res/layout/dialog_favorite_categories.xml
@@ -14,10 +14,6 @@
 		android:padding="16dp"
 		android:text="@string/add_to_favourites" />
 
-	<com.google.android.material.divider.MaterialDivider
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content" />
-
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView_categories"
 		android:layout_width="match_parent"
@@ -28,10 +24,6 @@
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_category_checkable" />
 
-	<com.google.android.material.divider.MaterialDivider
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content" />
-
 	<TextView
 		android:id="@+id/textView_add"
 		android:layout_width="match_parent"
@@ -41,7 +33,8 @@
 		android:paddingStart="?android:listPreferredItemPaddingStart"
 		android:paddingEnd="?android:listPreferredItemPaddingEnd"
 		android:text="@string/add_new_category"
-		android:textAppearance="?attr/textAppearanceBodyLarge"
+		android:textAppearance="?attr/textAppearanceButton"
+		android:textColor="?colorOnSurfaceVariant"
 		app:drawableEndCompat="@drawable/ic_list_add" />
 
 </LinearLayout>