更新

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?) {

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 ->
+        seekBrightness.setOnSeekBarChangeListener(object : SeekBarChangeListener {
-            if (fromUser) {
-                setScreenBrightness(value)
-            }
-        }
-
-        seekBrightness.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-            override fun onStartTrackingTouch(slider: Slider) {
 
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    setScreenBrightness(progress.toFloat())
+                }
             }
 
-            override fun onStopTrackingTouch(slider: Slider) {
+            override fun onStopTrackingTouch(seekBar: SeekBar) {
-                AppConfig.readBrightness = slider.value.toInt()
+                AppConfig.readBrightness = seekBar.progress
             }
+
         })
 
         vwBrightnessPosAdjust.setOnClickListener {

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) {

app/src/main/res/layout/dialog_book_change_source.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    >
+    android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/tool_bar"
@@ -15,7 +15,6 @@
         app:contentInsetStartWithNavigation="0dp"
         app:displayHomeAsUp="false"
         app:fitStatusBar="false"
-        app:layout_constraintTop_toTopOf="parent"
         app:titleTextAppearance="@style/ToolbarTitle" />
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
@@ -28,10 +27,8 @@
     <io.legato.kazusa.ui.widget.recycler.scroller.FastScrollRecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-        app:layout_constraintBottom_toTopOf="@+id/ll_bottom_bar"
-        app:layout_constraintTop_toBottomOf="@+id/refresh_progress_bar" />
 
     <LinearLayout
         android:id="@+id/ll_bottom_bar"
@@ -40,8 +37,7 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingRight="10dp">
-        app:layout_constraintBottom_toBottomOf="parent">
 
         <TextView
             android:id="@+id/tv_dur"
@@ -78,4 +74,4 @@
     </LinearLayout>
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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" />
 
-        <com.google.android.material.slider.Slider
+        <io.legato.kazusa.ui.widget.seekbar.VerticalSeekBarWrapper
-            android:id="@+id/seek_brightness"
             android:layout_width="wrap_content"
-            android:layout_height="80dp"
+            android:layout_height="0dp"
-            android:rotation="270"
+            android:layout_weight="1">
-            android:valueFrom="0.0"
+
-            android:valueTo="255.0" />
+            <io.legato.kazusa.ui.widget.seekbar.VerticalSeekBar
+                android:id="@+id/seek_brightness"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:max="255"
+                app:seekBarRotation="CW270" />
+
+        </io.legato.kazusa.ui.widget.seekbar.VerticalSeekBarWrapper>
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/vw_brightness_pos_adjust"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_margin="8dp"
-            android:layout_gravity="bottom"
             android:contentDescription="@string/adjust_pos"
-            android:src="@drawable/ic_swap_horiz" />
+            android:src="@drawable/ic_swap_horiz"/>
+
     </LinearLayout>
 
     <LinearLayout