From ab9b3a47d7d222d1fc418ec1d1f84fb2234fcf24 Mon Sep 17 00:00:00 2001
From: zoe <mengsifan@xuanyinyy.com>
Date: Wed, 29 Jul 2020 22:09:05 +0800
Subject: [PATCH] fix name plate in layout_official_mask.xml

---
 app/src/main/res/layout/activity_user_info_old.xml    |  2 +-
 app/src/main/res/layout/dialog_user_info.xml          |  4 ++--
 app/src/main/res/layout/item_boss_micro.xml           |  2 +-
 app/src/main/res/layout/item_home_hall_left.xml       |  2 +-
 app/src/main/res/layout/item_home_hall_right.xml      |  2 +-
 app/src/main/res/layout/item_user.xml                 |  2 +-
 app/src/main/res/layout/layout_official_mask.xml      | 11 +++++++----
 app/src/main/res/layout/list_item_online_user.xml     |  4 ++--
 .../res/layout/item_message_public_chat_hall.xml      |  2 +-
 9 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/activity_user_info_old.xml b/app/src/main/res/layout/activity_user_info_old.xml
index 7d02650c4..d63752018 100644
--- a/app/src/main/res/layout/activity_user_info_old.xml
+++ b/app/src/main/res/layout/activity_user_info_old.xml
@@ -189,7 +189,7 @@
                             android:id="@+id/in_official_mask"
                             android:layout_marginStart="5dp"
                             android:layout_width="wrap_content"
-                            android:layout_height="@dimen/dp_15"
+                            android:layout_height="@dimen/dp_17"
                             layout="@layout/layout_official_mask"/>
 
                         <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml
index 7cf5abe5c..94190a650 100644
--- a/app/src/main/res/layout/dialog_user_info.xml
+++ b/app/src/main/res/layout/dialog_user_info.xml
@@ -123,7 +123,7 @@
                     android:id="@+id/in_official_mask"
                     layout="@layout/layout_official_mask"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/dp_15"
+                    android:layout_height="@dimen/dp_17"
                     android:layout_gravity="center"
                     android:layout_marginEnd="5.5dp"
                     android:visibility="visible" />
@@ -154,7 +154,7 @@
                     android:id="@+id/in_nameplate"
                     layout="@layout/layout_official_mask"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/dp_15"
+                    android:layout_height="@dimen/dp_17"
                     android:layout_gravity="center"
                     android:layout_marginEnd="5.5dp"
                     android:visibility="visible" />
diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml
index 88d9a95b4..93a0d12a7 100644
--- a/app/src/main/res/layout/item_boss_micro.xml
+++ b/app/src/main/res/layout/item_boss_micro.xml
@@ -113,7 +113,7 @@
         <include
             android:id="@+id/in_official_mask"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_15"
+            android:layout_height="@dimen/dp_17"
             android:layout_marginEnd="5.5dp"
             android:layout_gravity="center"
             android:visibility="visible"
diff --git a/app/src/main/res/layout/item_home_hall_left.xml b/app/src/main/res/layout/item_home_hall_left.xml
index 9d27a226b..05d79b244 100644
--- a/app/src/main/res/layout/item_home_hall_left.xml
+++ b/app/src/main/res/layout/item_home_hall_left.xml
@@ -65,7 +65,7 @@
                 android:id="@+id/in_official_mask"
                 android:layout_marginEnd="2dp"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_15"
+                android:layout_height="@dimen/dp_17"
                 layout="@layout/layout_official_mask"/>
 
             <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/item_home_hall_right.xml b/app/src/main/res/layout/item_home_hall_right.xml
index 781dec0b0..6464bda22 100644
--- a/app/src/main/res/layout/item_home_hall_right.xml
+++ b/app/src/main/res/layout/item_home_hall_right.xml
@@ -60,7 +60,7 @@
                 android:id="@+id/in_official_mask"
                 android:layout_marginEnd="2dp"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_15"
+                android:layout_height="@dimen/dp_17"
                 layout="@layout/layout_official_mask"/>
 
             <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/item_user.xml b/app/src/main/res/layout/item_user.xml
index d5daf05e4..60107bbfe 100644
--- a/app/src/main/res/layout/item_user.xml
+++ b/app/src/main/res/layout/item_user.xml
@@ -48,7 +48,7 @@
                 <include
                     android:id="@+id/in_official_mask"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/dp_15"
+                    android:layout_height="@dimen/dp_17"
                     android:layout_marginEnd="5.5dp"
                     android:layout_gravity="center"
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/layout_official_mask.xml b/app/src/main/res/layout/layout_official_mask.xml
index 94a3bdc09..549d7456d 100644
--- a/app/src/main/res/layout/layout_official_mask.xml
+++ b/app/src/main/res/layout/layout_official_mask.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="17dp"
     android:visibility="gone"
     tools:visibility="visible">
 
@@ -22,15 +22,18 @@
 
     <TextView
         android:id="@+id/tv_official_mask"
-        android:layout_width="38.5dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="4.5dp"
         android:gravity="center"
         android:textColor="@color/white"
         android:textSize="8dp"
+        android:singleLine="true"
         tools:text="金牌主持"
         android:includeFontPadding="false"
-        app:layout_constraintEnd_toEndOf="@id/iv_official_mask"
+        android:layout_marginStart="22dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintStart_toStartOf="@id/iv_official_mask"
+        app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app/src/main/res/layout/list_item_online_user.xml b/app/src/main/res/layout/list_item_online_user.xml
index 31afed114..42f00dfab 100644
--- a/app/src/main/res/layout/list_item_online_user.xml
+++ b/app/src/main/res/layout/list_item_online_user.xml
@@ -87,7 +87,7 @@
             android:id="@+id/in_official_mask"
             layout="@layout/layout_official_mask"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_15"
+            android:layout_height="@dimen/dp_17"
             android:layout_gravity="center"
             android:layout_marginEnd="5.5dp"
             android:layout_toEndOf="@id/noble_avatar_view"
@@ -118,7 +118,7 @@
             android:id="@+id/in_nameplate"
             layout="@layout/layout_official_mask"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_15"
+            android:layout_height="@dimen/dp_17"
             android:layout_gravity="center"
             android:layout_marginEnd="5.5dp"
             android:layout_toEndOf="@id/noble_avatar_view"
diff --git a/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml b/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml
index 7710dd2fa..4b7784f0a 100644
--- a/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml
+++ b/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml
@@ -59,7 +59,7 @@
         <include
             android:id="@+id/in_official_mask"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_15"
+            android:layout_height="@dimen/dp_17"
             android:layout_marginEnd="6.5dp"
             android:visibility="gone"
             tools:visibility="visible"