From 7c9d31e159778a2ec90decfa072906738dcf9cbb Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sat, 19 Nov 2022 00:17:04 +0530
Subject: [PATCH] Use appropriate dimensions for different screens

---
 app/src/main/res/layout/activity_call.xml  | 34 +++++++++++++---------
 app/src/main/res/values-hdpi/dimens.xml    | 14 +++++++++
 app/src/main/res/values-sw480dp/dimens.xml | 14 +++++++++
 app/src/main/res/values-sw720dp/dimens.xml | 14 +++++++++
 app/src/main/res/values-xhdpi/dimens.xml   | 14 +++++++++
 app/src/main/res/values-xxhdpi/dimens.xml  | 14 +++++++++
 app/src/main/res/values-xxxhdpi/dimens.xml | 14 +++++++++
 app/src/main/res/values/dimens.xml         |  1 +
 8 files changed, 105 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/values-hdpi/dimens.xml
 create mode 100644 app/src/main/res/values-sw480dp/dimens.xml
 create mode 100644 app/src/main/res/values-sw720dp/dimens.xml
 create mode 100644 app/src/main/res/values-xhdpi/dimens.xml
 create mode 100644 app/src/main/res/values-xxhdpi/dimens.xml
 create mode 100644 app/src/main/res/values-xxxhdpi/dimens.xml

diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml
index 62593058..b0ebf96c 100644
--- a/app/src/main/res/layout/activity_call.xml
+++ b/app/src/main/res/layout/activity_call.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.05"
+        app:layout_constraintVertical_bias="0.1"
         tools:src="@drawable/ic_call_accept" />
 
     <com.simplemobiletools.commons.views.MyTextView
@@ -165,13 +165,13 @@
             android:layout_height="@dimen/dialpad_button_size"
             android:background="@drawable/circle_background"
             android:contentDescription="@string/turn_microphone_off"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_microphone_off_vector"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/call_toggle_speaker"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.6" />
+            app:layout_constraintVertical_bias="0.63" />
 
         <ImageView
             android:id="@+id/call_toggle_speaker"
@@ -179,13 +179,13 @@
             android:layout_height="@dimen/dialpad_button_size"
             android:background="@drawable/circle_background"
             android:contentDescription="@string/turn_speaker_on"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_volume_up_vector"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/call_dialpad"
             app:layout_constraintStart_toEndOf="@+id/call_toggle_microphone"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.6" />
+            app:layout_constraintVertical_bias="0.63" />
 
         <ImageView
             android:id="@+id/call_dialpad"
@@ -193,13 +193,13 @@
             android:layout_height="@dimen/dialpad_button_size"
             android:background="@drawable/circle_button_background_ripple"
             android:contentDescription="@string/show_dialpad"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_dialpad_vector"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/call_toggle_speaker"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.6" />
+            app:layout_constraintVertical_bias="0.63" />
 
         <ImageView
             android:id="@+id/call_toggle_hold"
@@ -208,7 +208,7 @@
             android:layout_marginTop="@dimen/big_margin"
             android:background="@drawable/circle_background"
             android:contentDescription="@string/hold_call"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_pause_vector"
             app:layout_constraintEnd_toEndOf="@+id/call_toggle_microphone"
             app:layout_constraintStart_toStartOf="@+id/call_toggle_microphone"
@@ -221,7 +221,7 @@
             android:layout_marginTop="@dimen/big_margin"
             android:background="@drawable/circle_button_background_ripple"
             android:contentDescription="@string/call_add"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_add_call_vector"
             app:layout_constraintEnd_toEndOf="@+id/call_toggle_speaker"
             app:layout_constraintStart_toStartOf="@+id/call_toggle_speaker"
@@ -234,7 +234,7 @@
             android:layout_marginTop="@dimen/big_margin"
             android:background="@drawable/circle_button_background_ripple"
             android:contentDescription="@string/conference_manage"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_people_vector"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="@+id/call_dialpad"
@@ -249,7 +249,7 @@
             android:layout_marginTop="@dimen/big_margin"
             android:background="@drawable/circle_button_background_ripple"
             android:contentDescription="@string/call_swap"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_call_swap_vector"
             app:layout_constraintEnd_toEndOf="@+id/call_toggle_microphone"
             app:layout_constraintHorizontal_bias="0.5"
@@ -263,13 +263,20 @@
             android:layout_marginTop="@dimen/big_margin"
             android:background="@drawable/circle_button_background_ripple"
             android:contentDescription="@string/call_merge"
-            android:padding="@dimen/activity_margin"
+            android:padding="@dimen/dialpad_button_padding"
             android:src="@drawable/ic_call_merge_vector"
             app:layout_constraintEnd_toEndOf="@+id/call_toggle_speaker"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="@+id/call_toggle_speaker"
             app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/call_control_grid_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="call_toggle_microphone,call_toggle_speaker,call_dialpad,call_toggle_hold,call_add,call_swap,call_merge,call_manage" />
+
         <ImageView
             android:id="@+id/call_end"
             android:layout_width="@dimen/dialpad_button_size"
@@ -279,8 +286,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.9" />
+            app:layout_constraintTop_toBottomOf="@id/call_control_grid_barrier" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/controls_single_call"
diff --git a/app/src/main/res/values-hdpi/dimens.xml b/app/src/main/res/values-hdpi/dimens.xml
new file mode 100644
index 00000000..f413fcdf
--- /dev/null
+++ b/app/src/main/res/values-hdpi/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialpad_button_size">50dp</dimen>
+    <dimen name="dialpad_button_padding">12dp</dimen>
+    <dimen name="dialpad_button_size_small">50dp</dimen>
+    <dimen name="incoming_call_arrow_size">50dp</dimen>
+    <dimen name="incoming_call_button_size">72dp</dimen>
+    <dimen name="call_notification_button_size">40dp</dimen>
+    <dimen name="incoming_call_avatar_size">94dp</dimen>
+
+    <dimen name="dialpad_text_size">30sp</dimen>
+    <dimen name="caller_name_text_size">34sp</dimen>
+    <dimen name="call_status_text_size">20sp</dimen>
+</resources>
diff --git a/app/src/main/res/values-sw480dp/dimens.xml b/app/src/main/res/values-sw480dp/dimens.xml
new file mode 100644
index 00000000..1c538144
--- /dev/null
+++ b/app/src/main/res/values-sw480dp/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialpad_button_size">80dp</dimen>
+    <dimen name="dialpad_button_padding">16dp</dimen>
+    <dimen name="dialpad_button_size_small">60dp</dimen>
+    <dimen name="incoming_call_arrow_size">60dp</dimen>
+    <dimen name="incoming_call_button_size">80dp</dimen>
+    <dimen name="call_notification_button_size">50dp</dimen>
+    <dimen name="incoming_call_avatar_size">120dp</dimen>
+
+    <dimen name="dialpad_text_size">34sp</dimen>
+    <dimen name="caller_name_text_size">40sp</dimen>
+    <dimen name="call_status_text_size">28sp</dimen>
+</resources>
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
new file mode 100644
index 00000000..990ad67d
--- /dev/null
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialpad_button_size">96dp</dimen>
+    <dimen name="dialpad_button_padding">20dp</dimen>
+    <dimen name="dialpad_button_size_small">64dp</dimen>
+    <dimen name="incoming_call_arrow_size">64dp</dimen>
+    <dimen name="incoming_call_button_size">80dp</dimen>
+    <dimen name="call_notification_button_size">56dp</dimen>
+    <dimen name="incoming_call_avatar_size">160dp</dimen>
+
+    <dimen name="dialpad_text_size">42sp</dimen>
+    <dimen name="caller_name_text_size">46sp</dimen>
+    <dimen name="call_status_text_size">30sp</dimen>
+</resources>
diff --git a/app/src/main/res/values-xhdpi/dimens.xml b/app/src/main/res/values-xhdpi/dimens.xml
new file mode 100644
index 00000000..a988f0ca
--- /dev/null
+++ b/app/src/main/res/values-xhdpi/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialpad_button_size">72dp</dimen>
+    <dimen name="dialpad_button_padding">16dp</dimen>
+    <dimen name="dialpad_button_size_small">50dp</dimen>
+    <dimen name="incoming_call_arrow_size">50dp</dimen>
+    <dimen name="incoming_call_button_size">72dp</dimen>
+    <dimen name="call_notification_button_size">40dp</dimen>
+    <dimen name="incoming_call_avatar_size">120dp</dimen>
+
+    <dimen name="dialpad_text_size">30sp</dimen>
+    <dimen name="caller_name_text_size">34sp</dimen>
+    <dimen name="call_status_text_size">20sp</dimen>
+</resources>
diff --git a/app/src/main/res/values-xxhdpi/dimens.xml b/app/src/main/res/values-xxhdpi/dimens.xml
new file mode 100644
index 00000000..a988f0ca
--- /dev/null
+++ b/app/src/main/res/values-xxhdpi/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialpad_button_size">72dp</dimen>
+    <dimen name="dialpad_button_padding">16dp</dimen>
+    <dimen name="dialpad_button_size_small">50dp</dimen>
+    <dimen name="incoming_call_arrow_size">50dp</dimen>
+    <dimen name="incoming_call_button_size">72dp</dimen>
+    <dimen name="call_notification_button_size">40dp</dimen>
+    <dimen name="incoming_call_avatar_size">120dp</dimen>
+
+    <dimen name="dialpad_text_size">30sp</dimen>
+    <dimen name="caller_name_text_size">34sp</dimen>
+    <dimen name="call_status_text_size">20sp</dimen>
+</resources>
diff --git a/app/src/main/res/values-xxxhdpi/dimens.xml b/app/src/main/res/values-xxxhdpi/dimens.xml
new file mode 100644
index 00000000..a988f0ca
--- /dev/null
+++ b/app/src/main/res/values-xxxhdpi/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialpad_button_size">72dp</dimen>
+    <dimen name="dialpad_button_padding">16dp</dimen>
+    <dimen name="dialpad_button_size_small">50dp</dimen>
+    <dimen name="incoming_call_arrow_size">50dp</dimen>
+    <dimen name="incoming_call_button_size">72dp</dimen>
+    <dimen name="call_notification_button_size">40dp</dimen>
+    <dimen name="incoming_call_avatar_size">120dp</dimen>
+
+    <dimen name="dialpad_text_size">30sp</dimen>
+    <dimen name="caller_name_text_size">34sp</dimen>
+    <dimen name="call_status_text_size">20sp</dimen>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bc83e3e1..a988f0ca 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="dialpad_button_size">72dp</dimen>
+    <dimen name="dialpad_button_padding">16dp</dimen>
     <dimen name="dialpad_button_size_small">50dp</dimen>
     <dimen name="incoming_call_arrow_size">50dp</dimen>
     <dimen name="incoming_call_button_size">72dp</dimen>