Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/voice_layout"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bg_voice_chat"
|
||||
@@ -10,8 +11,8 @@
|
||||
android:id="@+id/icon_withdraw"
|
||||
android:layout_width="38dp"
|
||||
android:layout_height="31dp"
|
||||
android:layout_marginTop="23dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_marginTop="23dp"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:src="@mipmap/icon_withdraw" />
|
||||
|
||||
@@ -19,8 +20,8 @@
|
||||
android:id="@+id/voice_fluctuations"
|
||||
android:layout_width="154dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="23dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_marginTop="23dp"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@mipmap/img_p" />
|
||||
@@ -29,8 +30,8 @@
|
||||
android:id="@+id/gif_view"
|
||||
android:layout_width="154dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="23dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_marginTop="23dp"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:background="@mipmap/voice_fluctuations"
|
||||
android:visibility="gone" />
|
||||
@@ -41,8 +42,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:maxLines="5"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="14sp" />
|
||||
@@ -51,9 +52,9 @@
|
||||
android:id="@+id/fingers_slide"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:text="@string/fingers_slide"
|
||||
android:textColor="#9A9A9A" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user