From bec02efd3dd429be17402806f04e34b80509c388 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Thu, 8 Jun 2023 10:27:43 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E5=8E=BB=E6=8E=89loading=E5=BA=95?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/ButtonItemFactory.java       |  2 +-
 app/src/main/res/layout/dialog_loading.xml    |  9 --------
 .../main/res/layout/dialog_user_card_item.xml |  9 ++++----
 app/src/main/res/layout/dialog_user_info.xml  | 21 +++++++++----------
 .../res/layout/layout_progress_dialog.xml     |  7 +------
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java b/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java
index c488d321e..fe58f8a03 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java
@@ -161,7 +161,7 @@ public class ButtonItemFactory {
 
         //关注
         buttonItems.add(createAttentItem());
-        //关注
+        //@Ta
         buttonItems.add(createAtItem());
 
         final RoomInfo currentRoom = AvRoomDataManager.get().mCurrentRoomInfo;
diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml
index bd876743e..59230bbbe 100644
--- a/app/src/main/res/layout/dialog_loading.xml
+++ b/app/src/main/res/layout/dialog_loading.xml
@@ -13,13 +13,4 @@
         app:autoPlay="true"
         app:source="svga/loading.svga" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="16dp"
-        android:text="@string/layout_dialog_loading_01"
-        android:textColor="#ffc9bcf2"
-        android:textSize="16sp" />
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_user_card_item.xml b/app/src/main/res/layout/dialog_user_card_item.xml
index 4449ee538..584171de9 100644
--- a/app/src/main/res/layout/dialog_user_card_item.xml
+++ b/app/src/main/res/layout/dialog_user_card_item.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="70dp"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:gravity="center_horizontal"
-    tools:layout_width="75dp" >
+    android:orientation="vertical"
+    tools:layout_width="75dp">
 
     <ImageView
         android:id="@+id/image"
         android:layout_width="40dp"
-        android:layout_height="40dp"
-        />
+        android:layout_height="40dp" />
 
     <TextView
         android:id="@+id/text"
diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml
index 00ac00768..8beaf8750 100644
--- a/app/src/main/res/layout/dialog_user_info.xml
+++ b/app/src/main/res/layout/dialog_user_info.xml
@@ -57,8 +57,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:paddingTop="@dimen/dp_10"
-                android:layout_marginStart="@dimen/dp_10">
+                android:layout_marginStart="@dimen/dp_10"
+                android:paddingTop="@dimen/dp_10">
 
                 <ImageView
                     android:id="@+id/avatar"
@@ -79,9 +79,9 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="2dp"
-                android:paddingTop="@dimen/dp_10"
                 android:layout_toEndOf="@id/fl_avatar_layout"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingTop="@dimen/dp_10">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -250,10 +250,10 @@
 
                     <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/iv_copy"
-                        android:src="@drawable/ic_room_user_copy"
-                        android:layout_marginStart="@dimen/dp_4"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_4"
+                        android:src="@drawable/ic_room_user_copy" />
 
                 </LinearLayout>
 
@@ -338,14 +338,13 @@
         android:orientation="vertical">
 
         <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerview_skill_card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:id="@+id/recyclerview_skill_card"
             android:layout_marginTop="@dimen/dp_8"
-            android:layout_marginBottom="@dimen/dp_8"
-            />
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="@dimen/dp_8" />
 
         <LinearLayout
             android:id="@+id/layout_grid_button"
diff --git a/app/src/main/res/layout/layout_progress_dialog.xml b/app/src/main/res/layout/layout_progress_dialog.xml
index a0cc799bb..85fddccb6 100644
--- a/app/src/main/res/layout/layout_progress_dialog.xml
+++ b/app/src/main/res/layout/layout_progress_dialog.xml
@@ -16,12 +16,6 @@
         app:autoPlay="true"
         app:source="svga/loading.svga" />
 
-<!--    <ProgressBar-->
-<!--        android:layout_width="240dp"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginTop="@dimen/dp_10"-->
-<!--        android:layout_marginBottom="@dimen/dp_10" />-->
-
     <TextView
         android:id="@+id/tv_tip"
         android:layout_width="wrap_content"
@@ -29,6 +23,7 @@
         android:layout_marginTop="@dimen/dp_16"
         android:gravity="center_horizontal"
         android:singleLine="true"
+        android:visibility="gone"
         android:text="@string/common_loading_tips"
         android:textColor="#C9BCF2"
         android:textSize="14sp" />