From 46250d4a5271b382b5b8dc1c71d74888d0e06f09 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Fri, 21 Oct 2022 11:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/bg_room_bottom.xml       | 12 ++++++++++++
 .../main/res/drawable/bg_room_say_something.xml    | 14 ++++++++++++++
 .../res/layout/fragment_chatroom_game_main.xml     |  9 +--------
 app/src/main/res/layout/layout_bottom_view.xml     |  9 +++++----
 .../res/layout/fragment_av_room_game.xml           |  3 +--
 .../res/layout/fragment_game_room.xml              |  3 +--
 .../res/layout/fragment_single_room.xml            |  1 -
 7 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_room_bottom.xml
 create mode 100644 app/src/main/res/drawable/bg_room_say_something.xml

diff --git a/app/src/main/res/drawable/bg_room_bottom.xml b/app/src/main/res/drawable/bg_room_bottom.xml
new file mode 100644
index 000000000..aecc24eca
--- /dev/null
+++ b/app/src/main/res/drawable/bg_room_bottom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#26ffffff" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_room_say_something.xml b/app/src/main/res/drawable/bg_room_say_something.xml
new file mode 100644
index 000000000..8e8a263ee
--- /dev/null
+++ b/app/src/main/res/drawable/bg_room_say_something.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:angle="180"
+        android:endColor="#303E59"
+        android:centerColor="#3A355B"
+        android:startColor="#363E5A"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners android:radius="@dimen/dp_16" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml
index 27313456f..f06385125 100644
--- a/app/src/main/res/layout/fragment_chatroom_game_main.xml
+++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml
@@ -112,12 +112,6 @@
                         android:visibility="gone"
                         tools:visibility="visible" />
 
-                    <View
-                        android:layout_width="3dp"
-                        android:layout_height="3dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="@drawable/shape_circle_3efed7" />
-
                     <TextView
                         android:id="@+id/room_nums"
                         android:layout_width="wrap_content"
@@ -133,7 +127,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="5dp"
                         android:textColor="@color/white_transparent_50"
-                        android:textSize="10sp"
+                        android:textSize="@dimen/sp_10"
                         tools:text="ID:8888" />
 
                 </LinearLayout>
@@ -150,7 +144,6 @@
                 android:paddingEnd="@dimen/dp_10"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
-                android:includeFontPadding="false"
                 android:layout_marginTop="@dimen/dp_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/layout_bottom_view.xml b/app/src/main/res/layout/layout_bottom_view.xml
index 1f095489c..ad7088cc4 100644
--- a/app/src/main/res/layout/layout_bottom_view.xml
+++ b/app/src/main/res/layout/layout_bottom_view.xml
@@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="52dp"
+    android:background="@drawable/bg_room_bottom"
     android:orientation="horizontal">
 
     <HorizontalScrollView
@@ -28,7 +29,7 @@
                 android:id="@+id/tv_room_send_msg_input"
                 android:layout_width="100dp"
                 android:layout_height="30dp"
-                android:background="@drawable/bg_room_msg_input"
+                android:background="@drawable/bg_room_say_something"
                 android:gravity="center_vertical"
                 android:paddingStart="13dp"
                 android:paddingEnd="0dp"
@@ -36,7 +37,7 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_14"
                 android:visibility="visible"
-                tools:visibility="gone" />
+                tools:visibility="visible" />
 
             <LinearLayout
                 android:id="@+id/room_mic_layout"
@@ -123,7 +124,7 @@
         android:id="@+id/icon_room_send_gift"
         android:layout_width="38dp"
         android:layout_height="38dp"
-        android:layout_gravity="end"
+        android:layout_gravity="center_vertical|end"
         android:layout_marginEnd="@dimen/dp_15"
         android:scaleType="fitXY"
         android:src="@drawable/icon_room_send_gift" />
diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
index 16d74e351..68be1f3f9 100644
--- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
+++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
@@ -161,8 +161,7 @@
             android:id="@+id/bottom_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="10dp" />
+            android:layout_alignParentBottom="true" />
 
         <com.yizhuan.erban.avroom.widget.MessageView
             android:id="@+id/message_view"
diff --git a/app/src/module_mini_world/res/layout/fragment_game_room.xml b/app/src/module_mini_world/res/layout/fragment_game_room.xml
index 62df6c6b9..1ce005f13 100644
--- a/app/src/module_mini_world/res/layout/fragment_game_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_game_room.xml
@@ -124,8 +124,7 @@
             android:id="@+id/bottom_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="10dp" />
+            android:layout_alignParentBottom="true" />
 
         <com.yizhuan.erban.avroom.widget.MessageView
             android:id="@+id/message_view"
diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/module_mini_world/res/layout/fragment_single_room.xml
index 8ffc124aa..9765ebd89 100644
--- a/app/src/module_mini_world/res/layout/fragment_single_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_single_room.xml
@@ -190,7 +190,6 @@
             android:id="@+id/bottom_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />