From 159f76954b8e6b63208d1325eaa4c5c5a959ed36 Mon Sep 17 00:00:00 2001
From: xufuji456 <839789740@qq.com>
Date: Sun, 8 Aug 2021 21:18:32 +0800
Subject: [PATCH] adjust view layout

---
 .../java/com/frank/live/PushActivity.java     |  2 +-
 Live/src/main/res/layout/activity_push.xml    | 19 ++++++++++---------
 Live/src/main/res/values-en/strings.xml       |  1 +
 Live/src/main/res/values/strings.xml          |  1 +
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Live/src/main/java/com/frank/live/PushActivity.java b/Live/src/main/java/com/frank/live/PushActivity.java
index eb3a35a..359931d 100644
--- a/Live/src/main/java/com/frank/live/PushActivity.java
+++ b/Live/src/main/java/com/frank/live/PushActivity.java
@@ -94,7 +94,7 @@ public class PushActivity extends Activity implements Callback {
         //SurfaceView
         mSmartCameraView = findViewById(R.id.gl_surfaceview);
         //beauty type
-        beautyTypeSelector = findViewById(R.id.beauty_type_selctor);
+        beautyTypeSelector = findViewById(R.id.beauty_type_selector);
         //mute
         btnMute = findViewById(R.id.button_mute);
         //take photo
diff --git a/Live/src/main/res/layout/activity_push.xml b/Live/src/main/res/layout/activity_push.xml
index 2a56b4c..968fff8 100644
--- a/Live/src/main/res/layout/activity_push.xml
+++ b/Live/src/main/res/layout/activity_push.xml
@@ -7,12 +7,12 @@
         android:layout_height="match_parent"
         android:id="@+id/gl_surfaceview"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true" />
+        android:layout_alignParentEnd="true" />
 
         <Spinner
-            android:id="@+id/beauty_type_selctor"
+            android:id="@+id/beauty_type_selector"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"/>
@@ -21,20 +21,21 @@
             android:id="@+id/img_photo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:src="@drawable/ic_camera_switch"
-            android:text="拍照"
+            android:text="@string/take_photo"
             android:clickable="true"
             android:focusable="true"
-            android:tint="@color/colorPrimary" />
+            android:tint="@color/colorPrimary"
+            android:contentDescription="@string/take_photo" />
 
         <Button
             android:id="@+id/button_mute"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" 静音"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="10dp"
+            android:text="@string/mute"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="20dp"
             android:layout_below="@+id/img_photo"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/Live/src/main/res/values-en/strings.xml b/Live/src/main/res/values-en/strings.xml
index 01e2b30..01ee3a7 100644
--- a/Live/src/main/res/values-en/strings.xml
+++ b/Live/src/main/res/values-en/strings.xml
@@ -5,6 +5,7 @@
     <string name="stop">stop</string>
     <string name="mute">mute</string>
     <string name="voice">voice</string>
+    <string name="take_photo">photo</string>
 
     <string name="effect_beauty">beauty</string>
     <string name="effect_cool">cool</string>
diff --git a/Live/src/main/res/values/strings.xml b/Live/src/main/res/values/strings.xml
index 288c6d0..8cb9785 100644
--- a/Live/src/main/res/values/strings.xml
+++ b/Live/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="stop">停止</string>
     <string name="mute">静音</string>
     <string name="voice">取消静音</string>
+    <string name="take_photo">拍照</string>
 
     <string name="effect_beauty">美颜</string>
     <string name="effect_cool">冷酷</string>