From a03a7bd31edd6eeb5ba57d738be3779e282c9adc Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Thu, 30 Oct 2025 14:56:12 +0800
Subject: [PATCH] =?UTF-8?q?toolbar=20=E5=88=9D=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VisualNovel/app/src/main/AndroidManifest.xml                 | 1 +
 .../com/remax/visualnovel/widget/toolbar/CommonToolbar.kt    | 5 +++--
 VisualNovel/app/src/main/res/layout/activity_actor_chat.xml  | 1 +
 .../{base_toolbar_layout.xml => common_toolbar_layout.xml}   | 2 +-
 VisualNovel/app/src/main/res/values/styles.xml               | 2 --
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename VisualNovel/app/src/main/res/layout/{base_toolbar_layout.xml => common_toolbar_layout.xml} (96%)

diff --git a/VisualNovel/app/src/main/AndroidManifest.xml b/VisualNovel/app/src/main/AndroidManifest.xml
index f247fad..225c85e 100644
--- a/VisualNovel/app/src/main/AndroidManifest.xml
+++ b/VisualNovel/app/src/main/AndroidManifest.xml
@@ -74,6 +74,7 @@
 
         <activity
             android:name=".ui.chat.ChatActivity"
+            android:windowSoftInputMode="adjustResize"
             android:exported="false" >
         </activity>
 
diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt
index caa6357..93796a5 100644
--- a/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt
+++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt
@@ -10,6 +10,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import com.remax.visualnovel.R
+import com.remax.visualnovel.widget.uitoken.view.UITokenFrameLayout
 import com.remax.visualnovel.widget.uitoken.view.UITokenImageView
 import com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout
 import com.remax.visualnovel.widget.uitoken.view.UITokenTextView
@@ -18,7 +19,7 @@ class CommonToolbar @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
+) : UITokenFrameLayout(context, attrs, defStyleAttr) {
 
     private val ivBack: UITokenImageView
     private val llCenter: UITokenLinearLayout
@@ -29,7 +30,7 @@ class CommonToolbar @JvmOverloads constructor(
     private var onChildClickListener: ((View) -> Unit)? = null
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.base_toolbar_layout, this, true)
+        LayoutInflater.from(context).inflate(R.layout.common_toolbar_layout, this, true)
         ivBack = findViewById(R.id.iv_left)
         llCenter = findViewById(R.id.ll_center)
         ivTitle = findViewById(R.id.iv_title)
diff --git a/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml b/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml
index d5a4031..f3777f8 100644
--- a/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml
+++ b/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml
@@ -23,6 +23,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             />
+
         <com.remax.visualnovel.widget.uitoken.view.UITokenConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
diff --git a/VisualNovel/app/src/main/res/layout/base_toolbar_layout.xml b/VisualNovel/app/src/main/res/layout/common_toolbar_layout.xml
similarity index 96%
rename from VisualNovel/app/src/main/res/layout/base_toolbar_layout.xml
rename to VisualNovel/app/src/main/res/layout/common_toolbar_layout.xml
index 88e50e7..1698d23 100644
--- a/VisualNovel/app/src/main/res/layout/base_toolbar_layout.xml
+++ b/VisualNovel/app/src/main/res/layout/common_toolbar_layout.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_50"
+    android:layout_height="@dimen/dp_68"
     android:paddingHorizontal="@dimen/dp_16"
     android:orientation="vertical">
 
diff --git a/VisualNovel/app/src/main/res/values/styles.xml b/VisualNovel/app/src/main/res/values/styles.xml
index 2f0a592..8076c4a 100644
--- a/VisualNovel/app/src/main/res/values/styles.xml
+++ b/VisualNovel/app/src/main/res/values/styles.xml
@@ -6,8 +6,6 @@
         <item name="colorPrimaryDark">@color/glo_color_grey_100</item>
         <item name="colorAccent">@color/glo_color_magenta_50</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
         <!-- 应付一下android15  16要重新适配导航栏和状态栏 -->
         <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>