Tune ui

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt

@@ -36,8 +36,7 @@ class ListItemTextView @JvmOverloads constructor(
 
 	init {
 		context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
-			val itemRippleColor = getColorStateList(R.styleable.ListItemTextView_rippleColor)
-				?: getRippleColorFallback(context)
+			val itemRippleColor = getRippleColor(context)
 			val shape = createShapeDrawable(this)
 			background = RippleDrawable(
 				RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
@@ -108,7 +107,7 @@ class ListItemTextView @JvmOverloads constructor(
 			ta.getResourceId(R.styleable.ListItemTextView_shapeAppearanceOverlay, 0),
 		).build()
 		val shapeDrawable = MaterialShapeDrawable(shapeAppearance)
-		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundTint)
+		shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundFillColor)
 		return InsetDrawable(
 			shapeDrawable,
 			ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetLeft, 0),
@@ -118,7 +117,7 @@ class ListItemTextView @JvmOverloads constructor(
 		)
 	}
 
-	private fun getRippleColorFallback(context: Context): ColorStateList {
+	private fun getRippleColor(context: Context): ColorStateList {
 		return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
 			?: ColorStateList.valueOf(Color.TRANSPARENT)
 	}

app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt

@@ -28,7 +28,7 @@ class FavouriteCategoriesBottomSheet :
 	BaseBottomSheet<DialogFavoriteCategoriesBinding>(),
 	OnListItemClickListener<MangaCategoryItem>,
 	CategoriesEditDelegate.CategoriesEditCallback,
-	Toolbar.OnMenuItemClickListener {
+	Toolbar.OnMenuItemClickListener, View.OnClickListener {
 
 	private val viewModel by viewModel<MangaCategoriesViewModel> {
 		parametersOf(requireNotNull(arguments?.getParcelableArrayList<ParcelableManga>(KEY_MANGA_LIST)).map { it.manga })
@@ -46,6 +46,7 @@ class FavouriteCategoriesBottomSheet :
 		adapter = MangaCategoriesAdapter(this)
 		binding.recyclerViewCategories.adapter = adapter
 		binding.toolbar.setOnMenuItemClickListener(this)
+		binding.itemCreate.setOnClickListener(this)
 
 		viewModel.content.observe(viewLifecycleOwner, this::onContentChanged)
 		viewModel.onError.observe(viewLifecycleOwner, ::onError)
@@ -58,14 +59,20 @@ class FavouriteCategoriesBottomSheet :
 
 	override fun onMenuItemClick(item: MenuItem): Boolean {
 		return when (item.itemId) {
-			R.id.action_create -> {
-				startActivity(FavouritesCategoryEditActivity.newIntent(requireContext()))
+			R.id.action_done -> {
+				dismiss()
 				true
 			}
 			else -> false
 		}
 	}
 
+	override fun onClick(v: View) {
+		when (v.id) {
+			R.id.item_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext()))
+		}
+	}
+
 	override fun onItemClick(item: MangaCategoryItem, view: View) {
 		viewModel.setChecked(item.id, !item.isChecked)
 	}

app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt

@@ -9,6 +9,7 @@ import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.ItemTouchHelper
 import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.databinding.FragmentSearchSuggestionBinding
 import org.koitharu.kotatsu.main.ui.AppBarOwner
@@ -43,11 +44,10 @@ class SearchSuggestionFragment :
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
+		val extraPadding = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 		binding.root.updatePadding(
-			top = headerHeight,
-			// left = insets.left,
-			// right = insets.right,
-			bottom = insets.bottom,
+			top = headerHeight + extraPadding,
+			bottom = insets.bottom + extraPadding,
 		)
 	}