yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

更新命名

Browse Source
This commit is contained in:
HapeLee
2025-09-05 03:38:27 +08:00
parent 863d8f59a2
commit 081e3e2311
13 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legato/kazusa/service/BaseReadAloudService.kt
+2 -2
View File
@@ -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)
)
app/src/main/java/io/legato/kazusa/ui/book/cache/CacheActivity.kt
Vendored
+1 -1
View File
@@ -300,7 +300,7 @@ class CacheActivity : VMBaseActivity<ActivityCacheBookBinding, CacheViewModel>()
observeEvent<String>(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)
app/src/main/java/io/legato/kazusa/ui/book/cache/CacheAdapter.kt
Vendored
+2 -2
View File
@@ -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)
}
}
}
app/src/main/java/io/legato/kazusa/ui/book/read/BaseReadBookActivity.kt
+5
View File
@@ -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<ReadSpacingDialog>()
}
fun showPaddingConfig() {
showDialogFragment<PaddingConfigDialog>()
}
app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt
+3 -3
View File
@@ -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() } }
)
)
}
app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt
+10 -5
View File
@@ -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)
}
app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt
+1 -1
View File
@@ -452,7 +452,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
binding.refreshProgressBar.gone()
binding.cdProgress.gone()
if (!isManualStopSearch && viewModel.hasMore) {
binding.fbStartStop.setImageResource(R.drawable.ic_play_24dp)
binding.fbStartStop.setImageResource(R.drawable.ic_play)
} else {
binding.fbStartStop.invisible()
}
app/src/main/res/drawable/ic_pause_24dp.xml
-3
View File
@@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">
<path android:fillColor="@android:color/white" android:pathData="M520,760L520,200L760,200L760,760L520,760ZM200,760L200,200L440,200L440,760L200,760ZM600,680L680,680L680,280L600,280L600,680ZM280,680L360,680L360,280L280,280L280,680ZM280,280L280,280L280,680L280,680L280,280ZM600,280L600,280L600,680L600,680L600,280Z"/>
</vector>
app/src/main/res/drawable/ic_play_24dp.xml → app/src/main/res/drawable/ic_play.xml
View File
app/src/main/res/layout/dialog_read_aloud.xml
+6 -7
View File
@@ -32,7 +32,7 @@
</LinearLayout>
<LinearLayout
<com.google.android.material.button.MaterialButtonGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@@ -57,7 +57,7 @@
android:layout_marginHorizontal="6dp"
android:contentDescription="@string/audio_play"
android:tooltipText="@string/audio_play"
app:icon="@drawable/ic_play_24dp"
app:icon="@drawable/ic_play"
tools:ignore="UnusedAttribute" />
<com.google.android.material.button.MaterialButton
@@ -81,7 +81,7 @@
app:icon="@drawable/ic_skip_next"
tools:ignore="UnusedAttribute" />
</LinearLayout>
</com.google.android.material.button.MaterialButtonGroup>
<LinearLayout
android:layout_width="match_parent"
@@ -110,10 +110,9 @@
</LinearLayout>
<LinearLayout
<com.google.android.material.button.MaterialButtonGroup
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3"
android:layout_marginVertical="6dp"
@@ -156,7 +155,7 @@
android:text="@string/next_chapter"
android:textSize="14sp" />
</LinearLayout>
</com.google.android.material.button.MaterialButtonGroup>
<LinearLayout
android:layout_width="match_parent"
app/src/main/res/layout/dialog_select_section_export.xml
+1 -1
View File
@@ -65,7 +65,7 @@
android:hint="@string/export_file_name"
app:endIconCheckable="true"
app:endIconContentDescription="Execute script"
app:endIconDrawable="@drawable/ic_play_24dp"
app:endIconDrawable="@drawable/ic_play"
app:endIconMode="custom"
app:helperText="Variable: name, author, epubIndex">
app/src/main/res/layout/item_download.xml
+1 -1
View File
@@ -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" />
app/src/main/res/menu/book_cache.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<item
android:id="@+id/menu_download"
android:icon="@drawable/ic_play_24dp"
android:icon="@drawable/ic_play"
android:title="@string/action_download"
app:showAsAction="always" />