From 1f1309d93486427ff1f4a194a241ab5de9ef80fa Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 3 Oct 2024 14:32:34 +0300
Subject: [PATCH] Increase source add button size

---
 .../kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt |  4 ++--
 .../settings/sources/catalog/SourceCatalogItemAD.kt    | 10 ++++++++++
 app/src/main/res/layout/activity_sources_catalog.xml   |  5 +++--
 app/src/main/res/layout/item_source_catalog.xml        |  8 +++-----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt
index e5b713d8f..185c3af4a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Theme.kt
@@ -29,7 +29,7 @@ fun Context.getThemeColor(
 @Px
 fun Context.getThemeDimensionPixelSize(
 	@AttrRes resId: Int,
-	@ColorInt fallback: Int = 0,
+	@Px fallback: Int = 0,
 ) = obtainStyledAttributes(intArrayOf(resId)).use {
 	it.getDimensionPixelSize(0, fallback)
 }
@@ -37,7 +37,7 @@ fun Context.getThemeDimensionPixelSize(
 @Px
 fun Context.getThemeDimensionPixelOffset(
 	@AttrRes resId: Int,
-	@ColorInt fallback: Int = 0,
+	@Px fallback: Int = 0,
 ) = obtainStyledAttributes(intArrayOf(resId)).use {
 	it.getDimensionPixelOffset(0, fallback)
 }
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt
index 035437529..35c94f045 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.settings.sources.catalog
 
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updatePaddingRelative
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -16,12 +17,14 @@ import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.crossfade
 import org.koitharu.kotatsu.core.util.ext.drawableStart
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.getThemeDimensionPixelOffset
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemEmptyHintBinding
 import org.koitharu.kotatsu.databinding.ItemSourceCatalogBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import com.google.android.material.R as materialR
 
 fun sourceCatalogItemSourceAD(
 	coil: ImageLoader,
@@ -39,6 +42,13 @@ fun sourceCatalogItemSourceAD(
 	binding.root.setOnClickListener { v ->
 		listener.onItemClick(item, v)
 	}
+	val basePadding = context.getThemeDimensionPixelOffset(
+		materialR.attr.listPreferredItemPaddingEnd,
+		binding.root.paddingStart,
+	)
+	binding.root.updatePaddingRelative(
+		end = (basePadding - context.resources.getDimensionPixelOffset(R.dimen.margin_small)).coerceAtLeast(0),
+	)
 
 	bind {
 		binding.textViewTitle.text = item.source.getTitle(context)
diff --git a/app/src/main/res/layout/activity_sources_catalog.xml b/app/src/main/res/layout/activity_sources_catalog.xml
index e2c1a7b09..4e9273ec6 100644
--- a/app/src/main/res/layout/activity_sources_catalog.xml
+++ b/app/src/main/res/layout/activity_sources_catalog.xml
@@ -12,8 +12,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:fitsSystemWindows="true"
-		app:liftOnScrollColor="@null"
-		app:liftOnScroll="false">
+		app:liftOnScroll="false"
+		app:liftOnScrollColor="@null">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
@@ -50,6 +50,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:clipToPadding="false"
+		app:bubbleSize="normal"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
diff --git a/app/src/main/res/layout/item_source_catalog.xml b/app/src/main/res/layout/item_source_catalog.xml
index e770233b4..8618bd413 100644
--- a/app/src/main/res/layout/item_source_catalog.xml
+++ b/app/src/main/res/layout/item_source_catalog.xml
@@ -9,9 +9,8 @@
 	android:gravity="center_vertical"
 	android:minHeight="?listPreferredItemHeightSmall"
 	android:orientation="horizontal"
-	android:paddingVertical="@dimen/margin_small"
 	android:paddingStart="?listPreferredItemPaddingStart"
-	android:paddingEnd="?listPreferredItemPaddingEnd">
+	tools:ignore="RtlSymmetry">
 
 	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/imageView_icon"
@@ -58,17 +57,16 @@
 	<View
 		android:layout_width="1dp"
 		android:layout_height="match_parent"
-		android:layout_marginVertical="4dp"
+		android:layout_marginVertical="@dimen/margin_small"
 		android:background="?colorOutline" />
 
 	<ImageView
 		android:id="@+id/imageView_add"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/list_spacing_small"
 		android:background="?selectableItemBackgroundBorderless"
 		android:contentDescription="@string/add"
-		android:padding="@dimen/margin_small"
+		android:padding="@dimen/margin_normal"
 		android:scaleType="center"
 		android:src="@drawable/ic_add"
 		android:tooltipText="@string/add" />