diff --git a/app/src/main/java/io/legato/kazusa/constant/PreferKey.kt b/app/src/main/java/io/legato/kazusa/constant/PreferKey.kt index b2b5c02b2..cf01941ba 100644 --- a/app/src/main/java/io/legato/kazusa/constant/PreferKey.kt +++ b/app/src/main/java/io/legato/kazusa/constant/PreferKey.kt @@ -191,7 +191,7 @@ object PreferKey { const val mangaClickActionBL = "mangaClickActionBottomLeft" const val mangaClickActionBC = "mangaClickActionBottomCenter" const val mangaClickActionBR = "mangaClickActionBottomRight" - + const val mangaLongClick = "mangaLongClick" const val permissionChecked = "permissionChecked" const val notificationsPost = "notificationsPost" const val ignoreBatteryPermission = "ignoreBatteryPermission" @@ -205,6 +205,5 @@ object PreferKey { const val pureBlack = "pure_black" const val labelVisibilityMode = "labelVisibilityMode" const val menuAlpha = "menuAlpha" - const val colorImage = "colorImage" } diff --git a/app/src/main/java/io/legato/kazusa/help/config/AppConfig.kt b/app/src/main/java/io/legato/kazusa/help/config/AppConfig.kt index 5198ab0a0..b6e85c1de 100644 --- a/app/src/main/java/io/legato/kazusa/help/config/AppConfig.kt +++ b/app/src/main/java/io/legato/kazusa/help/config/AppConfig.kt @@ -749,11 +749,17 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { //漫画滚动方式 var mangaScrollMode: Int - get() = appCtx.getPrefInt(PreferKey.mangaScrollMode, MangaScrollMode.PAGE_RIGHT_TO_LEFT) + get() = appCtx.getPrefInt(PreferKey.mangaScrollMode, MangaScrollMode.WEBTOON) set(value) { appCtx.putPrefInt(PreferKey.mangaScrollMode, value) } + var mangaLongClick + get() = appCtx.getPrefBoolean(PreferKey.mangaLongClick, true) + set(value) { + appCtx.putPrefBoolean(PreferKey.mangaLongClick, value) + } + //漫画滤镜 var mangaColorFilter get() = appCtx.getPrefString(PreferKey.mangaColorFilter, "") 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 35f7c5ded..5289a9c46 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 @@ -24,6 +24,7 @@ import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL import com.bumptech.glide.util.FixedPreloadSizeProvider import com.google.android.material.transition.platform.MaterialContainerTransform +import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback import io.legato.kazusa.BuildConfig import io.legato.kazusa.R import io.legato.kazusa.base.VMBaseActivity @@ -163,6 +164,8 @@ class ReadMangaActivity : VMBaseActivity(AppConfig.mangaFooterConfig).getOrNull() ?: MangaFooterConfig() - onBackPressedDispatcher.addCallback(this) { - finish() - } } override fun observeLiveBus() { @@ -228,7 +228,6 @@ class ReadMangaActivity : VMBaseActivity @@ -622,7 +621,6 @@ class ReadMangaActivity : VMBaseActivity= Build.VERSION_CODES.P) { window.attributes = window.attributes.apply { @@ -834,11 +830,18 @@ class ReadMangaActivity : VMBaseActivity + callback?.onMangaLongClickChanged(isChecked) + } + } + binding.cbChapterLabel.run { isChecked = !config.hideChapterLabel setOnCheckedChangeListener { _, isChecked -> @@ -256,6 +268,7 @@ class MangaFooterSettingDialog : fun onMangaScaleDisabledChanged(disabled: Boolean) fun onHideMangaTitleChanged(hide: Boolean) fun onVolumeKeyPageChanged(enable: Boolean) + fun onMangaLongClickChanged(checked: Boolean) } } \ No newline at end of file diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonFrame.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonFrame.kt index f62656667..55ac149fa 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonFrame.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/recyclerview/WebtoonFrame.kt @@ -41,16 +41,18 @@ class WebtoonFrame : FrameLayout { private val recycler: WebtoonRecyclerView? get() = getChildAt(0) as? WebtoonRecyclerView - var disabledClickScroll = false var actionHandler: ClickActionHandler? = null private val gestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() { override fun onLongPress(e: MotionEvent) { - recycler?.let { - val centerPos = it.findCenterViewPosition() - if (centerPos != RecyclerView.NO_POSITION) { - longPressListener?.invoke(centerPos) + if (AppConfig.mangaLongClick) + { + recycler?.let { + val centerPos = it.findCenterViewPosition() + if (centerPos != RecyclerView.NO_POSITION) { + longPressListener?.invoke(centerPos) + } } } } diff --git a/app/src/main/res/layout/activity_manga.xml b/app/src/main/res/layout/activity_manga.xml index 71bcbaea8..9069f6a23 100644 --- a/app/src/main/res/layout/activity_manga.xml +++ b/app/src/main/res/layout/activity_manga.xml @@ -71,7 +71,7 @@ android:layout_height="match_parent" android:gravity="center" android:orientation="vertical" - android:visibility="visible"> + android:visibility="gone"> + /> diff --git a/app/src/main/res/layout/dialog_manga_footer_setting.xml b/app/src/main/res/layout/dialog_manga_footer_setting.xml index 51677205f..128965716 100644 --- a/app/src/main/res/layout/dialog_manga_footer_setting.xml +++ b/app/src/main/res/layout/dialog_manga_footer_setting.xml @@ -1,5 +1,6 @@ + + + + @@ -38,10 +39,12 @@ android:id="@+id/tv_seek_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingHorizontal="12dp" + android:textStyle="bold" + android:textSize="11sp" + android:paddingHorizontal="8dp" android:paddingVertical="4dp" android:singleLine="true" - android:text="" /> + tools:text="123" /> diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 799ffe7cd..60980641c 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1301,4 +1301,6 @@ 更改将在下次启动应用时生效 选择书源分组 深浅色模式开关 + 长按保存图片 + 长按设置为全局默认模式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8478aa313..4339f0c5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1302,4 +1302,6 @@ 稍后重启 选择书源分组 深浅色模式开关 + 长按保存图片 + 长按设置为全局默认模式