Merge pull request #77 from AgoraIO/dev_java_UI

Dev java ui
AgoraIO · Aug 5, 2019 · 5eeadc9 · 5eeadc9
2 parents 06a3dd4 + b9b5b94
commit 5eeadc9
Show file tree

Hide file tree

Showing 21 changed files with 52 additions and 23 deletions.
diff --git a/...s/drawable-xxxhdpi/btn_endcall_normal.png → ...es/drawable-xxhdpi/btn_endcall_normal.png b/...s/drawable-xxxhdpi/btn_endcall_normal.png → ...es/drawable-xxhdpi/btn_endcall_normal.png
diff --git a/.../drawable-xxxhdpi/btn_endcall_pressed.png → ...s/drawable-xxhdpi/btn_endcall_pressed.png b/.../drawable-xxxhdpi/btn_endcall_pressed.png → ...s/drawable-xxhdpi/btn_endcall_pressed.png
diff --git a/.../res/drawable-xxxhdpi/btn_mute_normal.png → ...n/res/drawable-xxhdpi/btn_mute_normal.png b/.../res/drawable-xxxhdpi/btn_mute_normal.png → ...n/res/drawable-xxhdpi/btn_mute_normal.png
diff --git a/...res/drawable-xxxhdpi/btn_mute_pressed.png → .../res/drawable-xxhdpi/btn_mute_pressed.png b/...res/drawable-xxxhdpi/btn_mute_pressed.png → .../res/drawable-xxhdpi/btn_mute_pressed.png
diff --git a/...drawable-xxxhdpi/btn_startcall_normal.png → .../drawable-xxhdpi/btn_startcall_normal.png b/...drawable-xxxhdpi/btn_startcall_normal.png → .../drawable-xxhdpi/btn_startcall_normal.png
diff --git a/...rawable-xxxhdpi/btn_startcall_pressed.png → ...drawable-xxhdpi/btn_startcall_pressed.png b/...rawable-xxxhdpi/btn_startcall_pressed.png → ...drawable-xxhdpi/btn_startcall_pressed.png
diff --git a/...able-xxxhdpi/btn_switch_camera_normal.png → ...wable-xxhdpi/btn_switch_camera_normal.png b/...able-xxxhdpi/btn_switch_camera_normal.png → ...wable-xxhdpi/btn_switch_camera_normal.png
diff --git a/...ble-xxxhdpi/btn_switch_camera_pressed.png → ...able-xxhdpi/btn_switch_camera_pressed.png b/...ble-xxxhdpi/btn_switch_camera_pressed.png → ...able-xxhdpi/btn_switch_camera_pressed.png
diff --git a/...es/drawable-xxxhdpi/btn_unmute_normal.png → ...res/drawable-xxhdpi/btn_unmute_normal.png b/...es/drawable-xxxhdpi/btn_unmute_normal.png → ...res/drawable-xxhdpi/btn_unmute_normal.png
diff --git a/...s/drawable-xxxhdpi/btn_unmute_pressed.png → ...es/drawable-xxhdpi/btn_unmute_pressed.png b/...s/drawable-xxxhdpi/btn_unmute_pressed.png → ...es/drawable-xxhdpi/btn_unmute_pressed.png
diff --git a/...res/drawable-xxxhdpi/icon_agora_large.png → .../res/drawable-xxhdpi/icon_agora_large.png b/...res/drawable-xxxhdpi/icon_agora_large.png → .../res/drawable-xxhdpi/icon_agora_large.png
diff --git a/...s/drawable-xxxhdpi/icon_agora_largest.png → ...es/drawable-xxhdpi/icon_agora_largest.png b/...s/drawable-xxxhdpi/icon_agora_largest.png → ...es/drawable-xxhdpi/icon_agora_largest.png
diff --git a/...in/res/drawable-xxxhdpi/icon_launcher.png → ...ain/res/drawable-xxhdpi/icon_launcher.png b/...in/res/drawable-xxxhdpi/icon_launcher.png → ...ain/res/drawable-xxhdpi/icon_launcher.png
diff --git a/...ne-Video/Agora-Android-Tutorial-1to1/app/src/main/res/layout/activity_video_chat_view.xml b/...ne-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
@@ -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
@@ -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
@@ -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/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-xhdpi/dimens.xml 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
@@ -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
@@ -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_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>