diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/MangaMenu.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/MangaMenu.kt
index 1be0644fd..8a676bd2f 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/MangaMenu.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/MangaMenu.kt
@@ -210,9 +210,10 @@ class MangaMenu @JvmOverloads constructor(
seekReadPage.addOnChangeListener { slider, value, fromUser ->
if (fromUser) {
- callBack.skipToPage(value.toInt())
+ callBack.skipToPage(value.toInt() - 1)
}
}
+
seekReadPage.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
override fun onStartTrackingTouch(slider: Slider) {
vwMenuBg.setOnClickListener(null)
@@ -223,13 +224,12 @@ class MangaMenu @JvmOverloads constructor(
}
})
-
}
fun upSeekBar(value: Int, count: Int) {
binding.seekReadPage.apply {
- valueFrom = 0f
- valueTo = (count - 1).toFloat()
+ valueFrom = 1f
+ valueTo = (count).toFloat()
this.value = value.toFloat()
stepSize = 1f
}
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 d648ba1db..0c7247d5f 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.progress = AppConfig.readBrightness
+ seekBrightness.value = AppConfig.readBrightness.toFloat()
}
if (AppConfig.showReadTitleBarAddition) {
titleBarAddition.visible()
@@ -378,19 +378,22 @@ class ReadMenu @JvmOverloads constructor(
upBrightnessState()
}
//亮度调节
- seekBrightness.setOnSeekBarChangeListener(object : SeekBarChangeListener {
+ seekBrightness.addOnChangeListener { slider, value, fromUser ->
+ 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(seekBar: SeekBar) {
- AppConfig.readBrightness = seekBar.progress
+ override fun onStopTrackingTouch(slider: Slider) {
+ AppConfig.readBrightness = slider.value.toInt()
}
-
})
+
vwBrightnessPosAdjust.setOnClickListener {
AppConfig.brightnessVwPos = !AppConfig.brightnessVwPos
upBrightnessVwPos()
@@ -524,26 +527,29 @@ class ReadMenu @JvmOverloads constructor(
ReadBook.curTextChapter?.let { chapter ->
if (chapter.pageSize > 0) {
valueFrom = 1f
- valueTo = chapter.pageSize.toFloat()
+ valueTo = chapter.pageSize.toFloat().coerceAtLeast(2f)
value = (ReadBook.durPageIndex).coerceIn(1, chapter.pageSize).toFloat()
stepSize = 1f
} else {
valueFrom = 1f
- valueTo = 1f
+ valueTo = 2f
value = 1f
}
- } ?: run {
- valueFrom = 1f
- valueTo = 1f
- value = 1f
}
}
"chapter" -> {
- valueFrom = 1f
- valueTo = ReadBook.simulatedChapterSize.toFloat()
- value = (ReadBook.durChapterIndex).coerceIn(1, ReadBook.simulatedChapterSize).toFloat()
- stepSize = 1f
+ if (ReadBook.simulatedChapterSize > 0)
+ {
+ valueFrom = 1f
+ valueTo = ReadBook.simulatedChapterSize.toFloat().coerceAtLeast(2f)
+ value = (ReadBook.durChapterIndex).coerceIn(1, ReadBook.simulatedChapterSize).toFloat()
+ stepSize = 1f
+ } else {
+ valueFrom = 1f
+ valueTo = 2f
+ value = 1f
+ }
}
}
}
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 51cc5b9a0..01276a783 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
@@ -93,20 +93,20 @@ class AutoReadDialog : BaseBottomSheetDialogFragment(R.layout.dialog_auto_read)
}
private fun initEvent() {
- binding.llMainMenu.setOnClickListener {
+ binding.btnMainMenu.setOnClickListener {
callBack?.showMenuBar()
dismissAllowingStateLoss()
}
- binding.llSetting.setOnClickListener {
+ binding.btnSetting.setOnClickListener {
(activity as BaseReadBookActivity).showPageAnimConfig {
(activity as ReadBookActivity).upPageAnim()
ReadBook.loadContent(false)
}
}
- binding.llCatalog.setOnClickListener { callBack?.openChapterList() }
- binding.llAutoPageStop.setOnClickListener {
+ binding.btnCatalog.setOnClickListener { callBack?.openChapterList() }
+ binding.btnAutoPageStop.setOnClickListener {
callBack?.autoPageStop()
- binding.llAutoPageStop.post {
+ binding.btnAutoPageStop.post {
dismissAllowingStateLoss()
}
}
diff --git a/app/src/main/res/layout/dialog_auto_read.xml b/app/src/main/res/layout/dialog_auto_read.xml
index f96a58dcb..77a27e22d 100644
--- a/app/src/main/res/layout/dialog_auto_read.xml
+++ b/app/src/main/res/layout/dialog_auto_read.xml
@@ -4,10 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingTop="6dp"
- android:paddingBottom="6dp"
+ android:padding="16dp"
android:orientation="vertical">
+ android:gravity="center_horizontal"
+ android:orientation="horizontal">
+ style="@style/ChapterNameText"
+ android:text="@string/auto_page_speed" />
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:textSize="16sp"/>
-
@@ -53,158 +48,65 @@
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:icon="@drawable/ic_toc"
+ android:text="@string/chapter_list"
+ android:textSize="12sp"
+ android:padding="0dp"
+ app:iconGravity="textTop"
+ app:iconPadding="4dp"
+ />
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:icon="@drawable/ic_menu"
+ android:text="@string/main_menu"
+ android:textSize="12sp"
+ android:padding="0dp"
+ app:iconGravity="textTop"
+ app:iconPadding="4dp"
+ />
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:icon="@drawable/ic_auto_page_stop"
+ android:text="@string/stop"
+ android:textSize="12sp"
+ android:padding="0dp"
+ app:iconGravity="textTop"
+ app:iconPadding="4dp"
+ />
-
-
-
-
+
diff --git a/app/src/main/res/layout/view_manga_menu.xml b/app/src/main/res/layout/view_manga_menu.xml
index 4a387fa1a..d6b67e5bd 100644
--- a/app/src/main/res/layout/view_manga_menu.xml
+++ b/app/src/main/res/layout/view_manga_menu.xml
@@ -91,39 +91,27 @@
android:importantForAccessibility="no"
android:orientation="horizontal">
-
-
-
diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml
index 1ad23fb11..a9dd43f05 100644
--- a/app/src/main/res/layout/view_read_menu.xml
+++ b/app/src/main/res/layout/view_read_menu.xml
@@ -76,8 +76,7 @@
android:layout_height="0dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
- android:background="@color/transparent30"
- android:gravity="center_horizontal"
+ android:gravity="left"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/bottom_menu"
app:layout_constraintLeft_toLeftOf="parent"
@@ -93,28 +92,22 @@
android:src="@drawable/ic_brightness_auto"
tools:ignore="ImageContrastCheck" />
-
-
-
-
-
+ android:layout_height="80dp"
+ android:rotation="270"
+ android:valueFrom="0.0"
+ android:valueTo="255.0" />
-
@@ -242,7 +229,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_weight="1" />
+ android:layout_weight="1"
+ android:valueTo="2.0"
+ android:valueFrom="1.0"
+ android:value="1.0"/>
@@ -296,7 +284,6 @@
android:contentDescription="@string/chapter_list"
android:maxHeight="24dp"
android:src="@drawable/ic_toc"
- app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
@@ -340,7 +326,6 @@
android:contentDescription="@string/read_aloud"
android:maxHeight="24dp"
android:src="@drawable/ic_read_aloud"
- app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
@@ -384,7 +368,6 @@
android:contentDescription="@string/interface_setting"
android:maxHeight="24dp"
android:src="@drawable/ic_interface_setting"
- app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
@@ -428,7 +410,6 @@
android:contentDescription="@string/setting"
android:maxHeight="24dp"
android:src="@drawable/ic_settings"
- app:tint="@color/primaryText"
tools:ignore="NestedWeights" />