Increase source add button size

master
Koitharu 2 years ago
parent 350f1521a6
commit 1f1309d934
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7

@ -29,7 +29,7 @@ fun Context.getThemeColor(
@Px @Px
fun Context.getThemeDimensionPixelSize( fun Context.getThemeDimensionPixelSize(
@AttrRes resId: Int, @AttrRes resId: Int,
@ColorInt fallback: Int = 0, @Px fallback: Int = 0,
) = obtainStyledAttributes(intArrayOf(resId)).use { ) = obtainStyledAttributes(intArrayOf(resId)).use {
it.getDimensionPixelSize(0, fallback) it.getDimensionPixelSize(0, fallback)
} }
@ -37,7 +37,7 @@ fun Context.getThemeDimensionPixelSize(
@Px @Px
fun Context.getThemeDimensionPixelOffset( fun Context.getThemeDimensionPixelOffset(
@AttrRes resId: Int, @AttrRes resId: Int,
@ColorInt fallback: Int = 0, @Px fallback: Int = 0,
) = obtainStyledAttributes(intArrayOf(resId)).use { ) = obtainStyledAttributes(intArrayOf(resId)).use {
it.getDimensionPixelOffset(0, fallback) it.getDimensionPixelOffset(0, fallback)
} }

@ -2,6 +2,7 @@ package org.koitharu.kotatsu.settings.sources.catalog
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.updatePaddingRelative
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import coil.ImageLoader import coil.ImageLoader
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding 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.crossfade
import org.koitharu.kotatsu.core.util.ext.drawableStart import org.koitharu.kotatsu.core.util.ext.drawableStart
import org.koitharu.kotatsu.core.util.ext.enqueueWith 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.newImageRequest
import org.koitharu.kotatsu.core.util.ext.setTextAndVisible import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
import org.koitharu.kotatsu.core.util.ext.source import org.koitharu.kotatsu.core.util.ext.source
import org.koitharu.kotatsu.databinding.ItemEmptyHintBinding import org.koitharu.kotatsu.databinding.ItemEmptyHintBinding
import org.koitharu.kotatsu.databinding.ItemSourceCatalogBinding import org.koitharu.kotatsu.databinding.ItemSourceCatalogBinding
import org.koitharu.kotatsu.list.ui.model.ListModel import org.koitharu.kotatsu.list.ui.model.ListModel
import com.google.android.material.R as materialR
fun sourceCatalogItemSourceAD( fun sourceCatalogItemSourceAD(
coil: ImageLoader, coil: ImageLoader,
@ -39,6 +42,13 @@ fun sourceCatalogItemSourceAD(
binding.root.setOnClickListener { v -> binding.root.setOnClickListener { v ->
listener.onItemClick(item, 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 { bind {
binding.textViewTitle.text = item.source.getTitle(context) binding.textViewTitle.text = item.source.getTitle(context)

@ -12,8 +12,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
app:liftOnScrollColor="@null" app:liftOnScroll="false"
app:liftOnScroll="false"> app:liftOnScrollColor="@null">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@id/toolbar" android:id="@id/toolbar"
@ -50,6 +50,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false" android:clipToPadding="false"
app:bubbleSize="normal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />

@ -9,9 +9,8 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="?listPreferredItemHeightSmall" android:minHeight="?listPreferredItemHeightSmall"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="@dimen/margin_small"
android:paddingStart="?listPreferredItemPaddingStart" android:paddingStart="?listPreferredItemPaddingStart"
android:paddingEnd="?listPreferredItemPaddingEnd"> tools:ignore="RtlSymmetry">
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/imageView_icon" android:id="@+id/imageView_icon"
@ -58,17 +57,16 @@
<View <View
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginVertical="4dp" android:layout_marginVertical="@dimen/margin_small"
android:background="?colorOutline" /> android:background="?colorOutline" />
<ImageView <ImageView
android:id="@+id/imageView_add" android:id="@+id/imageView_add"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/list_spacing_small"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/add" android:contentDescription="@string/add"
android:padding="@dimen/margin_small" android:padding="@dimen/margin_normal"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_add" android:src="@drawable/ic_add"
android:tooltipText="@string/add" /> android:tooltipText="@string/add" />

Loading…
Cancel
Save