diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt index 83b09b1f0..90438ee06 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt @@ -520,30 +520,6 @@ class ReadMangaActivity : VMBaseActivity { - 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 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(" ") } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt index f6ff9cb01..99f0f01a4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/config/MangaScrollModeDialog.kt @@ -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) } } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt index 7c12f1f2f..51d578200 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/entities/ReaderLoading.kt @@ -7,3 +7,5 @@ data class ReaderLoading( val isVolume: Boolean = false ) : BaseMangaPage + + diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt index 94472a5ef..ebfc847cb 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaAdapter.kt @@ -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() + } + } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt index 1e4cdc5aa..16f3da5f4 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/MangaVH.kt @@ -36,7 +36,7 @@ open class MangaVH(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(val binding: VB, private val context: Conte mImage.updateLayoutParams { height = ViewGroup.LayoutParams.WRAP_CONTENT } - itemView.minimumHeight = minHeight + itemView.minimumHeight = 0 } else { mImage.updateLayoutParams { height = ViewGroup.LayoutParams.MATCH_PARENT diff --git a/app/src/main/res/layout/activity_manga.xml b/app/src/main/res/layout/activity_manga.xml index 64790df08..2e09bbdbc 100644 --- a/app/src/main/res/layout/activity_manga.xml +++ b/app/src/main/res/layout/activity_manga.xml @@ -44,7 +44,8 @@ @@ -61,7 +62,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textColor="?attr/colorSurface" android:text="@string/loading" /> @@ -73,19 +73,29 @@ android:orientation="vertical" android:visibility="gone"> + + + android:layout_height="wrap_content" + android:textColor="@color/white" /> diff --git a/app/src/main/res/layout/dialog_manga_scroll_mode.xml b/app/src/main/res/layout/dialog_manga_scroll_mode.xml index 493c9d91a..331e1ccb7 100644 --- a/app/src/main/res/layout/dialog_manga_scroll_mode.xml +++ b/app/src/main/res/layout/dialog_manga_scroll_mode.xml @@ -131,6 +131,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/disable_manga_scale" /> + + diff --git a/app/src/main/res/layout/item_book_manga_edge.xml b/app/src/main/res/layout/item_book_manga_edge.xml index 213543cdf..54c6ba73a 100644 --- a/app/src/main/res/layout/item_book_manga_edge.xml +++ b/app/src/main/res/layout/item_book_manga_edge.xml @@ -1,38 +1,38 @@ - - + android:autoSizeMaxTextSize="12sp" + android:autoSizeMinTextSize="8sp" + android:autoSizePresetSizes="12sp" + android:autoSizeStepGranularity="2dp" + android:autoSizeTextType="uniform" + android:text="已读完" + android:textColor="@color/white" + android:textStyle="bold" /> - - - - - + - + diff --git a/app/src/main/res/menu/book_manga.xml b/app/src/main/res/menu/book_manga.xml index b7789339d..9f6a7c88d 100644 --- a/app/src/main/res/menu/book_manga.xml +++ b/app/src/main/res/menu/book_manga.xml @@ -25,24 +25,4 @@ app:showAsAction="never" /> - - - - - - diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 116a6c83a..f5ab9bbaa 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1215,7 +1215,7 @@ 居中 水平滚动 滤镜 - 隐藏漫画列表标题 + 隐藏章节过渡界面 刷新发现 未分组 动态取色 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index dd3eed654..68eea8383 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -165,7 +165,6 @@ - @string/default_version @string/official_version @string/beta_release_version @string/beta_releaseA_version @@ -179,7 +178,6 @@ - default_version official_version beta_release_version beta_releaseA_version