From 3d3e4799b5fc3bf47ea73f6845df7f45961f3f37 Mon Sep 17 00:00:00 2001
From: brianxcli <neteasy1210@gmail.com>
Date: Mon, 5 Aug 2019 14:48:25 +0800
Subject: [PATCH 1/2] update UI properties for both xhdpi and xxhdpi screens.

---
 .../btn_endcall_normal.png                        | Bin
 .../btn_endcall_pressed.png                       | Bin
 .../btn_mute_normal.png                           | Bin
 .../btn_mute_pressed.png                          | Bin
 .../btn_startcall_normal.png                      | Bin
 .../btn_startcall_pressed.png                     | Bin
 .../btn_switch_camera_normal.png                  | Bin
 .../btn_switch_camera_pressed.png                 | Bin
 .../btn_unmute_normal.png                         | Bin
 .../btn_unmute_pressed.png                        | Bin
 .../icon_agora_large.png                          | Bin
 .../icon_agora_largest.png                        | Bin
 .../icon_launcher.png                             | Bin
 .../main/res/layout/activity_video_chat_view.xml  |  13 +++++++------
 .../app/src/main/res/values-xhdpi/dimens.xml      |  12 ++++++++++++
 .../app/src/main/res/values-xxhdpi/dimens.xml     |  12 ++++++++++++
 .../app/src/main/res/values/dimens.xml            |  14 ++++----------
 .../logger/src/main/res/values-xhdpi/dimens.xml   |   5 +++++
 .../logger/src/main/res/values-xxhdpi/dimens.xml  |   5 +++++
 .../logger/src/main/res/values/dimens.xml         |  10 ++++------
 20 files changed, 49 insertions(+), 22 deletions(-)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_endcall_normal.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_endcall_pressed.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_mute_normal.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_mute_pressed.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_startcall_normal.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_startcall_pressed.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_switch_camera_normal.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_switch_camera_pressed.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_unmute_normal.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/btn_unmute_pressed.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_agora_large.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_agora_largest.png (100%)
 rename One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/{drawable-xxxhdpi => drawable-xxhdpi}/icon_launcher.png (100%)
 create mode 100644 One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xhdpi/dimens.xml
 create mode 100644 One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xxhdpi/dimens.xml
 create mode 100644 One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xhdpi/dimens.xml
 create mode 100644 One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xxhdpi/dimens.xml

diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_endcall_normal.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_endcall_normal.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_endcall_normal.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_endcall_normal.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_endcall_pressed.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_endcall_pressed.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_endcall_pressed.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_endcall_pressed.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_mute_normal.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_mute_normal.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_mute_normal.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_mute_normal.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_mute_pressed.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_mute_pressed.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_mute_pressed.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_mute_pressed.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_startcall_normal.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_startcall_normal.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_startcall_normal.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_startcall_normal.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_startcall_pressed.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_startcall_pressed.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_startcall_pressed.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_startcall_pressed.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_switch_camera_normal.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_switch_camera_normal.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_switch_camera_normal.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_switch_camera_normal.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_switch_camera_pressed.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_switch_camera_pressed.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_switch_camera_pressed.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_switch_camera_pressed.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_unmute_normal.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_unmute_normal.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_unmute_normal.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_unmute_normal.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_unmute_pressed.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_unmute_pressed.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/btn_unmute_pressed.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/btn_unmute_pressed.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/icon_agora_large.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/icon_agora_large.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/icon_agora_large.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/icon_agora_large.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/icon_agora_largest.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/icon_agora_largest.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/icon_agora_largest.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/icon_agora_largest.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/icon_launcher.png b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/icon_launcher.png
similarity index 100%
rename from One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxxhdpi/icon_launcher.png
rename to One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/drawable-xxhdpi/icon_launcher.png
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/layout/activity_video_chat_view.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/layout/activity_video_chat_view.xml
index 723a92c4..94e487bc 100644
--- a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/layout/activity_video_chat_view.xml
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/layout/activity_video_chat_view.xml
@@ -41,9 +41,10 @@
         android:background="@color/localBackground">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/local_back_icon_size"
+            android:layout_height="@dimen/local_back_icon_size"
             android:layout_gravity="center"
+            android:scaleType="centerCrop"
             android:src="@drawable/icon_agora_large" />
     </FrameLayout>
 
@@ -61,7 +62,7 @@
             android:layout_centerInParent="true"
             android:onClick="onCallClicked"
             android:src="@drawable/btn_endcall"
-            android:scaleType="center"/>
+            android:scaleType="centerCrop"/>
 
         <ImageView
             android:id="@+id/btn_switch_camera"
@@ -73,7 +74,7 @@
             android:layout_centerVertical="true"
             android:onClick="onSwitchCameraClicked"
             android:src="@drawable/btn_switch_camera"
-            android:scaleType="center"/>
+            android:scaleType="centerCrop"/>
 
         <ImageView
             android:id="@+id/btn_mute"
@@ -85,12 +86,12 @@
             android:layout_centerVertical="true"
             android:onClick="onLocalAudioMuteClicked"
             android:src="@drawable/btn_unmute"
-            android:scaleType="center"/>
+            android:scaleType="centerCrop"/>
     </RelativeLayout>
 
     <io.agora.uikit.logger.LoggerRecyclerView
         android:id="@+id/log_recycler_view"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/log_container_width"
         android:layout_height="@dimen/log_container_height"
         android:layout_above="@+id/control_panel"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xhdpi/dimens.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xhdpi/dimens.xml
new file mode 100644
index 00000000..b0bc18ff
--- /dev/null
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xhdpi/dimens.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="local_preview_width">88dp</dimen>
+    <dimen name="local_preview_height">117dp</dimen>
+    <dimen name="local_back_icon_size">50dp</dimen>
+    <dimen name="remote_back_icon_size">100dp</dimen>
+    <dimen name="remote_back_icon_margin_bottom">90dp</dimen>
+
+    <!-- buttons -->
+    <dimen name="control_bottom_margin">24dp</dimen>
+    <dimen name="control_bottom_horizontal_margin">30dp</dimen>
+</resources>
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xxhdpi/dimens.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xxhdpi/dimens.xml
new file mode 100644
index 00000000..181263e2
--- /dev/null
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values-xxhdpi/dimens.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="local_preview_width">112dp</dimen>
+    <dimen name="local_preview_height">150dp</dimen>
+    <dimen name="local_back_icon_size">48dp</dimen>
+    <dimen name="remote_back_icon_size">80dp</dimen>
+    <dimen name="remote_back_icon_margin_bottom">100dp</dimen>
+
+    <!-- buttons -->
+    <dimen name="control_bottom_margin">40dp</dimen>
+    <dimen name="control_bottom_horizontal_margin">24dp</dimen>
+</resources>
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values/dimens.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values/dimens.xml
index 96705215..6f834e45 100644
--- a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values/dimens.xml
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/res/values/dimens.xml
@@ -2,16 +2,10 @@
 <resources>
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="local_preview_width">132dp</dimen>
-    <dimen name="local_preview_height">176dp</dimen>
-    <dimen name="local_preview_margin_top">36dp</dimen>
-    <dimen name="local_preview_margin_right">32dp</dimen>
-    <dimen name="remote_back_icon_size">100dp</dimen>
-    <dimen name="remote_back_icon_margin_bottom">120dp</dimen>
+    <dimen name="local_preview_margin_top">28dp</dimen>
+    <dimen name="local_preview_margin_right">24dp</dimen>
 
     <!-- buttons -->
-    <dimen name="control_bottom_margin">50dp</dimen>
-    <dimen name="control_bottom_horizontal_margin">30dp</dimen>
-    <dimen name="call_button_size">80dp</dimen>
-    <dimen name="other_button_size">64dp</dimen>
+    <dimen name="call_button_size">60dp</dimen>
+    <dimen name="other_button_size">54dp</dimen>
 </resources>
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xhdpi/dimens.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xhdpi/dimens.xml
new file mode 100644
index 00000000..5255d213
--- /dev/null
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xhdpi/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="log_container_width">240dp</dimen>
+    <dimen name="log_container_height">120dp</dimen>
+</resources>
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xxhdpi/dimens.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xxhdpi/dimens.xml
new file mode 100644
index 00000000..f642afcf
--- /dev/null
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values-xxhdpi/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="log_container_width">260dp</dimen>
+    <dimen name="log_container_height">160dp</dimen>
+</resources>
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml
index a8ffba96..9c5fbc84 100644
--- a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Logs -->
     <dimen name="log_back_corner_radius">16dp</dimen>
-    <dimen name="log_item_height">32dp</dimen>
-    <dimen name="log_item_horizontal_padding">20dp</dimen>
-    <dimen name="log_text_size">16dp</dimen>
-    <dimen name="log_container_height">160dp</dimen>
-    <dimen name="log_item_offset">5dp</dimen>
+    <dimen name="log_item_height">24dp</dimen>
+    <dimen name="log_item_horizontal_padding">12dp</dimen>
+    <dimen name="log_text_size">10dp</dimen>
+    <dimen name="log_item_offset">3dp</dimen>
 </resources>

From b9b5b94a6a255abeac6e6e11782240a85dc845d0 Mon Sep 17 00:00:00 2001
From: brianxcli <neteasy1210@gmail.com>
Date: Mon, 5 Aug 2019 15:54:43 +0800
Subject: [PATCH 2/2] muliti-line log support

---
 .../logger/src/main/res/layout/log_item_layout.xml            | 4 +++-
 .../logger/src/main/res/values/dimens.xml                     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/layout/log_item_layout.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/layout/log_item_layout.xml
index dc5a3bd5..acb3f389 100644
--- a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/layout/log_item_layout.xml
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/layout/log_item_layout.xml
@@ -2,13 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/log_back"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/log_item_height">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/log_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:paddingTop="@dimen/log_item_vertical_padding"
+        android:paddingBottom="@dimen/log_item_vertical_padding"
         android:paddingLeft="@dimen/log_item_horizontal_padding"
         android:paddingRight="@dimen/log_item_horizontal_padding"
         android:textAlignment="gravity"
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml
index 9c5fbc84..f1d9c98f 100644
--- a/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml
+++ b/One-to-One-Video/Agora-Android-Tutorial-1to1/logger/src/main/res/values/dimens.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="log_back_corner_radius">16dp</dimen>
-    <dimen name="log_item_height">24dp</dimen>
-    <dimen name="log_item_horizontal_padding">12dp</dimen>
+    <dimen name="log_item_vertical_padding">6dp</dimen>
+    <dimen name="log_item_horizontal_padding">10dp</dimen>
     <dimen name="log_text_size">10dp</dimen>
     <dimen name="log_item_offset">3dp</dimen>
 </resources>