Merge branch 'master' into dev_tmp

# Conflicts:
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java

live/src/main/res/anim/live_chat_msg_in.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="500"
+        android:fromAlpha="0.1"
+        android:toAlpha="1"
+        android:fromYDelta="2.5%p"
+        android:toYDelta="0" />
+    <alpha
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="500"
+        android:fromAlpha="0.1"
+        android:toAlpha="1"
+        />
+</set>

live/src/main/res/drawable/bg_prank_coin.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:width="96dp" android:height="27dp">
-        <shape android:shape="rectangle">
-            <solid android:color="#ff181d29" />
-            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" />
-        </shape>
-    </item>
-</selector>

live/src/main/res/layout/dialog_live_robot_setting.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    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="wrap_content"
-    android:background="@drawable/border_translucent">
-
-
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

live/src/main/res/layout/view_new_live_ready.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/traceroute_rootview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -254,13 +252,23 @@
         android:id="@+id/faceTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#FFFFFF"
-        android:visibility="gone"
-        android:textSize="16sp"
         android:text=""
+        android:textColor="#FFFFFF"
+        android:textSize="16sp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/btn_robot"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="50dp"
+        android:layout_marginBottom="53dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@mipmap/icon_robot" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>