From 081e3e23113b60e35d5ecefd5da69a87d15c02b9 Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Thu, 4 Sep 2025 05:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../legato/kazusa/service/BaseReadAloudService.kt | 4 ++-- .../legato/kazusa/ui/book/cache/CacheActivity.kt | 2 +- .../legato/kazusa/ui/book/cache/CacheAdapter.kt | 4 ++-- .../kazusa/ui/book/read/BaseReadBookActivity.kt | 5 +++++ .../io/legato/kazusa/ui/book/read/ReadMenu.kt | 6 +++--- .../kazusa/ui/book/read/config/ReadAloudDialog.kt | 15 ++++++++++----- .../kazusa/ui/book/search/SearchActivity.kt | 2 +- app/src/main/res/drawable/ic_pause_24dp.xml | 3 --- .../drawable/{ic_play_24dp.xml => ic_play.xml} | 0 app/src/main/res/layout/dialog_read_aloud.xml | 13 ++++++------- .../res/layout/dialog_select_section_export.xml | 2 +- app/src/main/res/layout/item_download.xml | 2 +- app/src/main/res/menu/book_cache.xml | 2 +- 13 files changed, 33 insertions(+), 27 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_pause_24dp.xml rename app/src/main/res/drawable/{ic_play_24dp.xml => ic_play.xml} (100%) diff --git a/app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt b/app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt index 5646ee3da..b86950421 100644 --- a/app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt +++ b/app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt @@ -624,13 +624,13 @@ abstract class BaseReadAloudService : BaseService(), ) if (pause) { builder.addAction( - R.drawable.ic_play_24dp, + R.drawable.ic_play, getString(R.string.resume), aloudServicePendingIntent(IntentAction.resume) ) } else { builder.addAction( - R.drawable.ic_pause_24dp, + R.drawable.ic_pause, getString(R.string.pause), aloudServicePendingIntent(IntentAction.pause) ) diff --git a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt index 0a41d9124..99b48a844 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt @@ -300,7 +300,7 @@ class CacheActivity : VMBaseActivity() observeEvent(EventBus.UP_DOWNLOAD) { if (!CacheBook.isRun) { menu?.findItem(R.id.menu_download)?.let { item -> - item.setIcon(R.drawable.ic_play_24dp) + item.setIcon(R.drawable.ic_play) item.setTitle(R.string.download_start) } menu?.applyTint(this) diff --git a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt b/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt index 5935d4904..d8f40a05d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt @@ -141,10 +141,10 @@ class CacheAdapter(context: Context, private val callBack: CallBack) : if (!it.isStop()) { button.icon = ContextCompat.getDrawable(context, R.drawable.ic_stop_black_24dp) } else { - button.icon = ContextCompat.getDrawable(context, R.drawable.ic_play_24dp) + button.icon = ContextCompat.getDrawable(context, R.drawable.ic_play) } } ?: run { - button.icon = ContextCompat.getDrawable(context, R.drawable.ic_play_24dp) + button.icon = ContextCompat.getDrawable(context, R.drawable.ic_play) } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt index 8df6c6cca..5ef6e5933 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt @@ -34,6 +34,7 @@ import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog import io.legato.kazusa.ui.book.read.config.ClickActionConfigDialog import io.legato.kazusa.ui.book.read.config.PaddingConfigDialog import io.legato.kazusa.ui.book.read.config.PageKeyDialog +import io.legato.kazusa.ui.book.read.config.ReadSpacingDialog import io.legato.kazusa.ui.file.HandleFileContract import io.legato.kazusa.utils.ColorUtils import io.legato.kazusa.utils.FileDoc @@ -124,6 +125,10 @@ abstract class BaseReadBookActivity : } + fun showSpacingDialog() { + showDialogFragment() + } + fun showPaddingConfig() { showDialogFragment() } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt index 9c3bf2682..6900faedf 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt @@ -500,7 +500,7 @@ class ReadMenu @JvmOverloads constructor( id = "catalog", iconRes = R.drawable.ic_toc, description = context.getString(R.string.chapter_list), - onClick = { callBack.openChapterList() } + onClick = { runMenuOut { callBack.openChapterList() } } ), ToolButton( id = "read_aloud", @@ -513,13 +513,13 @@ class ReadMenu @JvmOverloads constructor( id = "setting", iconRes = R.drawable.ic_settings, description = context.getString(R.string.setting), - onClick = { callBack.showReadStyle() } + onClick = { runMenuOut { callBack.showReadStyle() } } ), ToolButton( id = "addBookmark", iconRes = R.drawable.ic_bookmark, description = context.getString(R.string.bookmark), - onClick = { callBack.addBookmark() } + onClick = { runMenuOut { callBack.addBookmark() } } ) ) } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt index 6defc7ff4..c924a8ea1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt @@ -1,5 +1,7 @@ package io.legato.kazusa.ui.book.read.config +//import io.legado.app.lib.theme.bottomBackground +//import io.legado.app.lib.theme.getPrimaryTextColor import android.annotation.SuppressLint import android.content.DialogInterface import android.os.Bundle @@ -12,14 +14,15 @@ import io.legato.kazusa.constant.EventBus import io.legato.kazusa.databinding.DialogReadAloudBinding import io.legato.kazusa.help.config.AppConfig import io.legato.kazusa.lib.dialogs.selector -//import io.legado.app.lib.theme.bottomBackground -//import io.legado.app.lib.theme.getPrimaryTextColor import io.legato.kazusa.model.ReadAloud import io.legato.kazusa.model.ReadBook import io.legato.kazusa.service.BaseReadAloudService import io.legato.kazusa.ui.book.read.ReadBookActivity -import io.legato.kazusa.utils.* +import io.legato.kazusa.utils.getPrefBoolean +import io.legato.kazusa.utils.observeEvent +import io.legato.kazusa.utils.toastOnUi import io.legato.kazusa.utils.viewbindingdelegate.viewBinding +import io.legato.kazusa.utils.visible class ReadAloudDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_aloud) { @@ -193,10 +196,12 @@ class ReadAloudDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_aloud private fun upPlayState() { if (!BaseReadAloudService.pause) { - binding.ivPlayPause.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_pause_24dp) + binding.ivPlayPause.icon = + ContextCompat.getDrawable(requireContext(), R.drawable.ic_pause) binding.ivPlayPause.contentDescription = getString(R.string.pause) } else { - binding.ivPlayPause.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_play_24dp) + binding.ivPlayPause.icon = + ContextCompat.getDrawable(requireContext(), R.drawable.ic_play) binding.ivPlayPause.contentDescription = getString(R.string.audio_play) } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt index da2c13d33..d270f1855 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt @@ -452,7 +452,7 @@ class SearchActivity : VMBaseActivity - - diff --git a/app/src/main/res/drawable/ic_play_24dp.xml b/app/src/main/res/drawable/ic_play.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_24dp.xml rename to app/src/main/res/drawable/ic_play.xml diff --git a/app/src/main/res/layout/dialog_read_aloud.xml b/app/src/main/res/layout/dialog_read_aloud.xml index a932213f4..80cd2cd63 100644 --- a/app/src/main/res/layout/dialog_read_aloud.xml +++ b/app/src/main/res/layout/dialog_read_aloud.xml @@ -32,7 +32,7 @@ - - + - - - + diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml index 803f1eafd..23b306559 100644 --- a/app/src/main/res/layout/item_download.xml +++ b/app/src/main/res/layout/item_download.xml @@ -75,7 +75,7 @@ android:layout_height="40dp" android:contentDescription="@string/start" android:layout_marginEnd="4dp" - app:icon="@drawable/ic_play_24dp" + app:icon="@drawable/ic_play" app:iconGravity="textStart" app:layout_constraintRight_toLeftOf="@+id/tv_export" app:layout_constraintTop_toTopOf="@id/tv_author" /> diff --git a/app/src/main/res/menu/book_cache.xml b/app/src/main/res/menu/book_cache.xml index 7ed22ae77..1eae49aba 100644 --- a/app/src/main/res/menu/book_cache.xml +++ b/app/src/main/res/menu/book_cache.xml @@ -6,7 +6,7 @@