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-07-21 15:21:24 +08:00
parent 1701285d33
commit 47274f13d4
12 changed files with 103 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt
+12 -36
View File
@@ -520,30 +520,6 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
}
}
R.id.menu_manga_color_filter -> {
binding.mangaMenu.runMenuOut()
showDialogFragment(MangaColorFilterDialog())
}
R.id.menu_hide_manga_title -> {
item.isChecked = !item.isChecked
AppConfig.hideMangaTitle = item.isChecked
ReadManga.loadContent()
}
R.id.menu_disable_horizontal_animation -> {
item.isChecked = !item.isChecked
AppConfig.disableHorizontalAnimator = item.isChecked
if (item.isChecked) {
mPagerSnapHelper.attachToRecyclerView(null)
} else {
mPagerSnapHelper.attachToRecyclerView(binding.recyclerView)
}
}
}
return super.onCompatOptionsItemSelected(item)
}
@@ -557,7 +533,6 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
override fun showFooterConfig() {
showDialogFragment(MangaFooterSettingDialog().apply {
initialAutoPageEnabled = enableAutoScrollPage
initialAutoPageSpeed = AppConfig.mangaAutoPageSpeed
callback = this@ReadMangaActivity
})
}
@@ -569,7 +544,6 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
override fun showScrollModeDialog() {
showDialogFragment(MangaScrollModeDialog().apply {
initialScrollMode = AppConfig.mangaScrollMode
callback = this@ReadMangaActivity
})
}
@@ -617,6 +591,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
//自动翻页
override fun onAutoPageToggle(enabled: Boolean) {
enableAutoScroll = enabled
setAutoReadEnabled(enabled)
}
@@ -631,6 +606,11 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
// }
}
override fun onHideMangaTitleChanged(hide: Boolean) {
AppConfig.hideMangaTitle = hide
ReadManga.loadContent()
}
override fun openBookInfoActivity() {
ReadManga.book?.let {
bookInfoActivity.launch {
@@ -693,6 +673,10 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
return super.dispatchKeyEvent(event)
}
/**
* 调整漫画类型
* @param mode 漫画类型
*/
@SuppressLint("NotifyDataSetChanged")
private fun setScrollMode(mode: Int) {
scrollMode = mode
@@ -729,12 +713,12 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
mPagerSnapHelper.attachToRecyclerView(null)
}
mAdapter.notifyDataSetChanged()
mAdapter.notifyItemRangeChanged(0, mAdapter.itemCount)
}
/**
* 调整条漫侧边留白设置
* @param paddingDp 侧边留白距离，单位dp，默认16dp
* @param paddingDp 侧边留白距离，单位dp
*/
private fun updateWebtoonSidePadding(paddingDp: Int) {
if (scrollMode != MangaScrollMode.WEBTOON && scrollMode != MangaScrollMode.WEBTOON_WITH_GAP) {
@@ -772,14 +756,6 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
this.mMenu = menu
menu.findItem(R.id.menu_pre_manga_number).title =
getString(R.string.pre_download_m, AppConfig.mangaPreDownloadNum)
menu.findItem(R.id.menu_hide_manga_title).isChecked = AppConfig.hideMangaTitle
menu.findItem(R.id.menu_disable_horizontal_animation).run {
isVisible =
AppConfig.enableMangaHorizontalScroll
isChecked = AppConfig.disableHorizontalAnimator
}
}
private fun setDisableMangaScale(disable: Boolean) {
app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaFooterSettingDialog.kt
+16 -3
View File
@@ -2,8 +2,8 @@ package io.legato.kazusa.ui.book.manga.config
import android.content.DialogInterface
import android.os.Bundle
import android.view.Gravity
import android.view.View
import androidx.transition.TransitionManager
import io.legato.kazusa.R
import io.legato.kazusa.base.BaseBottomSheetDialogFragment
import io.legato.kazusa.constant.EventBus
@@ -24,7 +24,6 @@ class MangaFooterSettingDialog :
var callback: Callback? = null
var initialAutoPageEnabled: Boolean = false
var initialAutoPageSpeed: Int = 3
private val binding by viewBinding(DialogMangaFooterSettingBinding::bind)
@@ -126,6 +125,7 @@ class MangaFooterSettingDialog :
config.hideFooter = true
}
}
updateChapterText()
postEvent(EventBus.UP_MANGA_CONFIG, config)
}
@@ -143,6 +143,20 @@ class MangaFooterSettingDialog :
}
private fun updateChapterText() {
if (config.hideFooter) {
binding.tvChapter.visibility = View.INVISIBLE
return
} else {
binding.tvChapter.visibility = View.VISIBLE
}
binding.tvChapter.gravity = when (config.footerOrientation) {
ReaderInfoBarView.ALIGN_LEFT -> Gravity.START or Gravity.CENTER_VERTICAL
ReaderInfoBarView.ALIGN_CENTER -> Gravity.CENTER
else -> Gravity.START
}
val label = if (!config.hideChapterLabel) "章节" else ""
val chapter = if (!config.hideChapter) "1/45 " else ""
val name = if (!config.hideChapterName) "第三话 " else ""
@@ -162,7 +176,6 @@ class MangaFooterSettingDialog :
progressLabel,
progress
).filter { it.isNotEmpty() }
TransitionManager.beginDelayedTransition(binding.rootView)
binding.tvChapter.text = parts.joinToString(" ")
}
app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt
+11 -13
View File
@@ -2,7 +2,6 @@ package io.legato.kazusa.ui.book.manga.config
import android.os.Bundle
import android.view.View
import androidx.transition.TransitionManager
import com.google.android.material.chip.Chip
import io.legato.kazusa.R
import io.legato.kazusa.base.BaseBottomSheetDialogFragment
@@ -14,9 +13,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
private val binding by viewBinding(DialogMangaScrollModeBinding::bind)
var initialScrollMode: Int = AppConfig.mangaScrollMode
var initialAutoPageSpeed: Int = AppConfig.mangaAutoPageSpeed
var initialSidePadding: Int = AppConfig.webtoonSidePaddingDp
var initialAutoPageEnabled: Boolean = false
var callback: Callback? = null
@@ -31,10 +27,9 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
binding.chipGroupScrollMode.addView(Chip(requireContext()).apply {
text = MangaScrollMode.labelOf(mode)
isCheckable = true
isChecked = (mode == initialScrollMode)
isChecked = (mode == AppConfig.mangaScrollMode)
setOnClickListener {
AppConfig.mangaScrollMode = mode
callback?.onScrollModeChanged(mode)
binding.chipAutoPage.isChecked = false
}
@@ -52,7 +47,6 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
binding.checkboxDisableClickScroll.apply {
isChecked = AppConfig.disableClickScroll
setOnCheckedChangeListener { _, isChecked ->
AppConfig.disableClickScroll = isChecked
callback?.onClickScrollDisabledChanged(isChecked)
}
}
@@ -60,17 +54,22 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
binding.checkboxDisableMangaScale.apply {
isChecked = AppConfig.disableMangaScale
setOnCheckedChangeListener { _, isChecked ->
AppConfig.disableMangaScale = isChecked
callback?.onMangaScaleDisabledChanged(isChecked)
}
}
binding.checkboxHideMangaTitle.apply {
isChecked = AppConfig.hideMangaTitle
setOnCheckedChangeListener { _, isChecked ->
callback?.onHideMangaTitleChanged(isChecked)
}
}
binding.scvPadding.apply {
valueFormat = { "$it %" }
progress = initialSidePadding
progress = AppConfig.webtoonSidePaddingDp
onChanged = { newValue ->
callback?.upSidePadding(newValue)
initialSidePadding = newValue
}
}
@@ -78,15 +77,13 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
}
private fun initAutoPageSpeed(boolean: Boolean) {
TransitionManager.beginDelayedTransition(binding.rootView)
binding.scvAutoPageSpeed.run {
isEnabled = boolean
valueFormat = { "$it 秒" }
progress = initialAutoPageSpeed
progress = AppConfig.mangaAutoPageSpeed
onChanged = { newValue ->
callback?.onAutoPageSpeedChanged(newValue)
initialAutoPageSpeed = newValue
}
}
}
@@ -98,6 +95,7 @@ class MangaScrollModeDialog : BaseBottomSheetDialogFragment(R.layout.dialog_mang
fun onClickScrollDisabledChanged(disabled: Boolean)
fun onMangaScaleDisabledChanged(disabled: Boolean)
fun upSidePadding(padding: Int)
fun onHideMangaTitleChanged(hide: Boolean)
}
}
app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt
+2
View File
@@ -7,3 +7,5 @@ data class ReaderLoading(
val isVolume: Boolean = false
) : BaseMangaPage
app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt
+8
View File
@@ -30,6 +30,7 @@ import io.legato.kazusa.ui.book.manga.entities.EpaperTransformation
import io.legato.kazusa.ui.book.manga.entities.GrayscaleTransformation
import io.legato.kazusa.ui.book.manga.entities.MangaPage
import io.legato.kazusa.ui.book.manga.entities.ReaderLoading
import io.legato.kazusa.utils.dpToPx
class MangaAdapter(private val context: Context) :
@@ -141,6 +142,13 @@ class MangaAdapter(private val context: Context) :
binding.text.text = message
binding.textChapter.text = ""
}
itemView.updateLayoutParams {
height = if (isHorizontal) {
MATCH_PARENT
} else {
96.dpToPx()
}
}
}
}
app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt
+2 -2
View File
@@ -36,7 +36,7 @@ open class MangaVH<VB : ViewBinding>(val binding: VB, private val context: Conte
protected lateinit var mFlProgress: FrameLayout
protected var mRetry: Button? = null
private val minHeight = context.resources.displayMetrics.heightPixels * 2 / 3
//private val minHeight = context.resources.displayMetrics.heightPixels * 2 / 3
fun initComponent(
loading: ProgressBar,
@@ -111,7 +111,7 @@ open class MangaVH<VB : ViewBinding>(val binding: VB, private val context: Conte
mImage.updateLayoutParams<FrameLayout.LayoutParams> {
height = ViewGroup.LayoutParams.WRAP_CONTENT
}
itemView.minimumHeight = minHeight
itemView.minimumHeight = 0
} else {
mImage.updateLayoutParams<FrameLayout.LayoutParams> {
height = ViewGroup.LayoutParams.MATCH_PARENT