From d1e46b2a62c728b510dff33f0e9a1bf0f3766712 Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Tue, 2 Sep 2025 03:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=98=85=E8=AF=BB=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E9=85=8D=E7=BD=AE=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legato/kazusa/ui/book/read/config/BgAdapter.kt | 3 +-- .../kazusa/ui/book/read/config/BgTextConfigDialog.kt | 5 +---- app/src/main/res/layout/item_bg_image.xml | 10 ++++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgAdapter.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgAdapter.kt index b98a6e236..b361801df 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgAdapter.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgAdapter.kt @@ -25,14 +25,13 @@ class BgAdapter(context: Context, val textColor: Int) : payloads: MutableList ) { binding.run { + tvName.text = item.substringBeforeLast(".") ImageLoader.load( context, context.assets.open("bg${File.separator}$item").readBytes() ) .centerCrop() .into(ivBg) - tvName.setTextColor(textColor) - tvName.text = item.substringBeforeLast(".") } } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgTextConfigDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgTextConfigDialog.kt index 1d5154e31..b112d61cf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgTextConfigDialog.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/read/config/BgTextConfigDialog.kt @@ -2,7 +2,6 @@ package io.legato.kazusa.ui.book.read.config import android.annotation.SuppressLint import android.content.DialogInterface -import android.graphics.PorterDuff import android.net.Uri import android.os.Bundle import android.view.View @@ -115,10 +114,8 @@ class BgTextConfigDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_bg recyclerView.adapter = adapter adapter.addHeaderView { ItemBgImageBinding.inflate(layoutInflater, it, false).apply { - tvName.setTextColor(secondaryTextColor) tvName.text = getString(R.string.select_image) - ivBg.setImageResource(R.drawable.ic_image) - ivBg.setColorFilter(primaryTextColor, PorterDuff.Mode.SRC_IN) + ivBg.setImageResource(R.drawable.ic_add) swUnderline.isGone = ReadBook.book?.isImage == true root.setOnClickListener { selectBgImage.launch() diff --git a/app/src/main/res/layout/item_bg_image.xml b/app/src/main/res/layout/item_bg_image.xml index f3b86a871..4f9996138 100644 --- a/app/src/main/res/layout/item_bg_image.xml +++ b/app/src/main/res/layout/item_bg_image.xml @@ -1,8 +1,7 @@ @@ -17,9 +16,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:contentDescription="@string/bg_image" - android:foreground="?android:attr/selectableItemBackground" + android:background="?android:attr/selectableItemBackground" android:scaleType="fitCenter" - tool:src="@drawable/ic_image" /> + android:src="@drawable/ic_add" /> @@ -27,6 +26,9 @@ android:id="@+id/tv_name" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:textSize="12sp" + android:textStyle="bold" android:text="@string/text" android:singleLine="true" android:gravity="center" />