From 4d993cfba8a1b60945155894105a79c5508cb0ee Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Thu, 5 Jun 2025 00:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../changesource/ChangeBookSourceDialog.kt | 5 ++--
.../io/legato/kazusa/ui/book/read/ReadMenu.kt | 20 +++++++--------
.../ui/book/read/config/AutoReadDialog.kt | 2 +-
.../res/layout/dialog_book_change_source.xml | 16 +++++-------
app/src/main/res/layout/view_read_menu.xml | 25 ++++++++++++-------
5 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
index d1b662c21..8a358c558 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt
@@ -16,6 +16,7 @@ import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import io.legato.kazusa.R
+import io.legato.kazusa.base.BaseBottomSheetDialogFragment
import io.legato.kazusa.base.BaseDialogFragment
import io.legato.kazusa.constant.AppLog
import io.legato.kazusa.constant.EventBus
@@ -52,7 +53,7 @@ import kotlinx.coroutines.launch
/**
* 换源界面
*/
-class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_source),
+class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_book_change_source),
Toolbar.OnMenuItemClickListener,
ChangeBookSourceAdapter.CallBack {
@@ -95,7 +96,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
override fun onStart() {
super.onStart()
- setLayout(1f, ViewGroup.LayoutParams.MATCH_PARENT)
+ //setLayout(1f, ViewGroup.LayoutParams.MATCH_PARENT)
}
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
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 0c7247d5f..d030c7c9a 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
@@ -211,7 +211,7 @@ class ReadMenu @JvmOverloads constructor(
// vwBrightnessPosAdjust.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
llBrightness.setOnClickListener(null)
seekBrightness.post {
- seekBrightness.value = AppConfig.readBrightness.toFloat()
+ seekBrightness.progress = AppConfig.readBrightness
}
if (AppConfig.showReadTitleBarAddition) {
titleBarAddition.visible()
@@ -378,20 +378,18 @@ class ReadMenu @JvmOverloads constructor(
upBrightnessState()
}
//亮度调节
- seekBrightness.addOnChangeListener { slider, value, fromUser ->
- if (fromUser) {
- setScreenBrightness(value)
- }
- }
-
- seekBrightness.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
- override fun onStartTrackingTouch(slider: Slider) {
+ seekBrightness.setOnSeekBarChangeListener(object : SeekBarChangeListener {
+ override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+ if (fromUser) {
+ setScreenBrightness(progress.toFloat())
+ }
}
- override fun onStopTrackingTouch(slider: Slider) {
- AppConfig.readBrightness = slider.value.toInt()
+ override fun onStopTrackingTouch(seekBar: SeekBar) {
+ AppConfig.readBrightness = seekBar.progress
}
+
})
vwBrightnessPosAdjust.setOnClickListener {
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/AutoReadDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/config/AutoReadDialog.kt
index 01276a783..2de8aec09 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/AutoReadDialog.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/config/AutoReadDialog.kt
@@ -82,7 +82,7 @@ class AutoReadDialog : BaseBottomSheetDialogFragment(R.layout.dialog_auto_read)
binding.seekAutoRead.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
override fun onStartTrackingTouch(slider: Slider) {
- // 开始滑动时的操作
+
}
override fun onStopTrackingTouch(slider: Slider) {
diff --git a/app/src/main/res/layout/dialog_book_change_source.xml b/app/src/main/res/layout/dialog_book_change_source.xml
index f26027276..279090fb5 100644
--- a/app/src/main/res/layout/dialog_book_change_source.xml
+++ b/app/src/main/res/layout/dialog_book_change_source.xml
@@ -1,10 +1,10 @@
-
+ android:orientation="vertical">
+ android:layout_height="wrap_content"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+ android:paddingRight="10dp">
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml
index be5a487d1..76f1234e0 100644
--- a/app/src/main/res/layout/view_read_menu.xml
+++ b/app/src/main/res/layout/view_read_menu.xml
@@ -74,8 +74,9 @@
android:id="@+id/ll_brightness"
android:layout_width="wrap_content"
android:layout_height="0dp"
+ android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
- android:gravity="left"
+ android:gravity="center_horizontal"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/bottom_menu"
app:layout_constraintLeft_toLeftOf="parent"
@@ -91,22 +92,28 @@
android:src="@drawable/ic_brightness_auto"
tools:ignore="ImageContrastCheck" />
-
+ android:layout_height="0dp"
+ android:layout_weight="1">
+
+
+
+
+ android:src="@drawable/ic_swap_horiz"/>
+