From edfdfb341faa237e7306945b89c52b92b625c7fa Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sun, 30 Nov 2025 14:14:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=90=AC=E4=B9=A6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E4=B8=8E=E4=BC=98=E5=8C=96=20#398?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/audio/AudioPlayActivity.kt    | 14 +++-
 .../main/res/layout/activity_audio_play.xml   | 80 +++++++++++--------
 2 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
index dec6eec66..fd9865061 100644
--- a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
@@ -538,7 +538,19 @@ class AudioPlayActivity :
         binding.cdTimer.setCardBackgroundColor(colorSurfaceContainer)
         binding.cdSpeed.setCardBackgroundColor(colorSurfaceContainer)
 
-        val stateList = ColorStateList.valueOf(colorOnSurface)
+        val states = arrayOf(
+            intArrayOf(android.R.attr.state_enabled, android.R.attr.state_checked),
+            intArrayOf(android.R.attr.state_enabled, -android.R.attr.state_checked),
+            intArrayOf(-android.R.attr.state_enabled)
+        )
+
+        val colors = intArrayOf(
+            colorSurface,
+            colorOnSurface,
+            colorOnSurface.copy(alpha = 0.3f)
+        )
+
+        val stateList = ColorStateList(states, colors)
         listOf(
             binding.ivSkipNext, binding.ivSkipPrevious, binding.ivPlayMode, binding.ivTimer,
             binding.ivChapter, binding.ivFastForward, binding.btnReset, binding.fabPlayStop
diff --git a/app/src/main/res/layout/activity_audio_play.xml b/app/src/main/res/layout/activity_audio_play.xml
index f91c2a353..36d0a2622 100644
--- a/app/src/main/res/layout/activity_audio_play.xml
+++ b/app/src/main/res/layout/activity_audio_play.xml
@@ -40,9 +40,10 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:cardElevation="16dp"
-        android:layout_marginHorizontal="44dp"
+        android:layout_marginHorizontal="32dp"
+        android:layout_marginBottom="16dp"
         app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintBottom_toTopOf="@+id/tv_title"
+        app:layout_constraintBottom_toTopOf="@+id/ll_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title_bar"
@@ -122,39 +123,50 @@
             tools:ignore="SmallSp" />
     </com.google.android.material.card.MaterialCardView>
 
-
-    <TextView
-        android:id="@+id/tv_title"
+    <LinearLayout
+        android:id="@+id/ll_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:scrollbars="none"
-        android:layout_marginBottom="4dp"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/tv_sub_title"
-        tools:text="@string/text" />
+        android:orientation="vertical"
+        android:layout_marginHorizontal="28dp"
+        app:layout_constraintTop_toBottomOf="@+id/cd_cover"
+        app:layout_constraintBottom_toTopOf="@+id/player_progress">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:gravity="center"
+            android:scrollbars="none"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/tv_sub_title"
+            tools:text="@string/text" />
+
+        <TextView
+            android:id="@+id/tv_sub_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:scrollbars="none"
+            android:textColor="?attr/colorOnSurfaceVariant"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/player_progress"
+            tools:text="@string/text" />
+
+    </LinearLayout>
+
+
 
-    <TextView
-        android:id="@+id/tv_sub_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:scrollbars="none"
-        android:textColor="?attr/colorOnSurfaceVariant"
-        android:textSize="17sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/player_progress"
-        tools:text="@string/text" />
 
 
     <TextView
         android:id="@+id/tv_dur_time"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
+        android:layout_marginStart="32dp"
         android:layout_marginBottom="8dp"
         android:text="@string/text"
         android:textStyle="bold"
@@ -168,22 +180,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginHorizontal="14dp"
+        android:layout_marginHorizontal="16dp"
         android:value="0"
         android:valueFrom="0"
         android:valueTo="100000"
         app:tickColorInactive="@android:color/transparent"
         app:layout_constraintBottom_toTopOf="@id/tv_all_time"
         app:thumbElevation="0dp"
-        app:thumbHeight="20dp"
+        app:thumbHeight="12dp"
         app:thumbWidth="4dp"
-        app:trackHeight="5dp" />
+        app:trackHeight="2dp" />
 
     <TextView
         android:id="@+id/tv_all_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="28dp"
+        android:layout_marginEnd="32dp"
         android:layout_marginBottom="8dp"
         android:text="@string/text"
         android:textStyle="bold"
@@ -205,7 +217,7 @@
         <View
             android:layout_width="0dp"
             android:layout_height="1dp"
-            android:layout_weight="1" />
+            android:layout_weight="2" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/iv_skip_previous"
@@ -231,9 +243,9 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/fab_play_stop"
                 style="@style/Widget.Material3Expressive.Button.IconButton"
-                android:layout_width="90dp"
+                android:layout_width="80dp"
                 android:contentDescription="@string/audio_play"
-                android:layout_height="90dp"
+                android:layout_height="80dp"
                 app:backgroundTint="?attr/colorSecondaryContainer"
                 app:icon="@drawable/play_anim"
                 app:iconGravity="textStart"
@@ -279,7 +291,7 @@
         <View
             android:layout_width="0dp"
             android:layout_height="1dp"
-            android:layout_weight="1" />
+            android:layout_weight="2" />
 
     </LinearLayout>