From ea81af8617085b67a6cf5a6a67b47893ae579995 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 28 Feb 2023 22:56:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/book/read/config/ReadAloudDialog.kt    | 20 ++++++++++++---
 app/src/main/res/layout/dialog_read_aloud.xml | 25 +++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
index 1afdc469b..cb5f51127 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
@@ -1,5 +1,6 @@
 package io.legado.app.ui.book.read.config
 
+import android.annotation.SuppressLint
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.Gravity
@@ -20,10 +21,7 @@ import io.legado.app.model.ReadBook
 import io.legado.app.service.BaseReadAloudService
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.widget.seekbar.SeekBarChangeListener
-import io.legado.app.utils.ColorUtils
-import io.legado.app.utils.getPrefBoolean
-import io.legado.app.utils.observeEvent
-import io.legado.app.utils.toastOnUi
+import io.legado.app.utils.*
 import io.legado.app.utils.viewbindingdelegate.viewBinding
 
 
@@ -67,6 +65,7 @@ class ReadAloudDialog : BaseDialogFragment(R.layout.dialog_read_aloud) {
             tvTimer.setTextColor(textColor)
             ivTtsSpeechReduce.setColorFilter(textColor)
             tvTtsSpeed.setTextColor(textColor)
+            tvTtsSpeedValue.setTextColor(textColor)
             ivTtsSpeechAdd.setColorFilter(textColor)
             ivCatalog.setColorFilter(textColor)
             tvCatalog.setTextColor(textColor)
@@ -138,6 +137,12 @@ class ReadAloudDialog : BaseDialogFragment(R.layout.dialog_read_aloud) {
         //设置保存的默认值
         seekTtsSpeechRate.progress = AppConfig.ttsSpeechRate
         seekTtsSpeechRate.setOnSeekBarChangeListener(object : SeekBarChangeListener {
+
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                super.onProgressChanged(seekBar, progress, fromUser)
+                upTtsSpeechRateText(progress)
+            }
+
             override fun onStopTrackingTouch(seekBar: SeekBar) {
                 AppConfig.ttsSpeechRate = seekBar.progress
                 upTtsSpeechRate()
@@ -156,6 +161,8 @@ class ReadAloudDialog : BaseDialogFragment(R.layout.dialog_read_aloud) {
 
     private fun upTtsSpeechRateEnabled(enabled: Boolean) {
         binding.run {
+            upTtsSpeechRateText(AppConfig.ttsSpeechRate)
+            tvTtsSpeedValue.visible(enabled)
             seekTtsSpeechRate.isEnabled = enabled
             ivTtsSpeechReduce.isEnabled = enabled
             ivTtsSpeechAdd.isEnabled = enabled
@@ -194,6 +201,11 @@ class ReadAloudDialog : BaseDialogFragment(R.layout.dialog_read_aloud) {
         }
     }
 
+    @SuppressLint("SetTextI18n")
+    private fun upTtsSpeechRateText(value: Int) {
+        binding.tvTtsSpeedValue.text = ((value + 5) / 10f).toString()
+    }
+
     private fun upTtsSpeechRate() {
         ReadAloud.upTtsSpeechRate(requireContext())
         if (!BaseReadAloudService.pause) {
diff --git a/app/src/main/res/layout/dialog_read_aloud.xml b/app/src/main/res/layout/dialog_read_aloud.xml
index 5ac2f1962..c42e327fc 100644
--- a/app/src/main/res/layout/dialog_read_aloud.xml
+++ b/app/src/main/res/layout/dialog_read_aloud.xml
@@ -165,14 +165,28 @@
 
             <TextView
                 android:id="@+id/tv_tts_speed"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_weight="1"
                 android:text="@string/read_aloud_speed"
                 android:textColor="@color/primaryText"
                 android:textSize="14sp" />
 
+            <TextView
+                android:id="@+id/tv_tts_speed_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingHorizontal="3dp"
+                android:textColor="@color/primaryText"
+                android:textSize="14sp" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1"
+                android:layout_gravity="center" />
+
             <io.legado.app.lib.theme.view.ThemeSwitch
                 android:id="@+id/cb_tts_follow_sys"
                 android:layout_width="wrap_content"
@@ -279,7 +293,8 @@
             android:contentDescription="@string/read_aloud"
             android:focusable="true"
             android:orientation="vertical"
-            android:paddingBottom="7dp">
+            android:paddingBottom="7dp"
+            tools:ignore="TextSizeCheck">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_main_menu"
@@ -297,9 +312,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="3dp"
-                android:text="@string/main_menu"
-                android:singleLine="true"
                 android:ellipsize="middle"
+                android:singleLine="true"
+                android:text="@string/main_menu"
                 android:textColor="@color/primaryText"
                 android:textSize="12sp" />
         </LinearLayout>