From 952387cb5af672414575ac70847703a88b8f4b78 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 13 Nov 2020 16:11:38 +0100
Subject: [PATCH] use lower margins on between in-call buttons on small
 displays

hopefully fixes #3890
---
 src/main/res/layout/activity_rtp_session.xml | 8 ++++----
 src/main/res/values-w384dp/dimens.xml        | 4 ++++
 src/main/res/values/dimens.xml               | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index cc4ea716e..121f712ce 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -174,7 +174,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_margin="12dp"
+                android:layout_margin="@dimen/in_call_fab_margin"
                 android:layout_toStartOf="@+id/end_call"
                 android:layout_toLeftOf="@+id/end_call"
                 android:visibility="gone"
@@ -188,7 +188,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:layout_margin="16dp"
+                android:layout_margin="@dimen/in_call_fab_margin_center"
                 android:src="@drawable/ic_call_end_white_48dp"
                 android:visibility="visible"
                 app:backgroundTint="@color/red700"
@@ -201,7 +201,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_margin="12dp"
+                android:layout_margin="@dimen/in_call_fab_margin"
                 android:layout_toEndOf="@+id/end_call"
                 android:layout_toRightOf="@+id/end_call"
                 android:visibility="gone"
@@ -215,7 +215,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_margin="12dp"
+                android:layout_margin="@dimen/in_call_fab_margin"
                 android:layout_toEndOf="@+id/in_call_action_right"
                 android:layout_toRightOf="@+id/in_call_action_right"
                 android:visibility="gone"
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
index 4f3550ab5..3c5d3c6f2 100644
--- a/src/main/res/values-w384dp/dimens.xml
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -1,6 +1,10 @@
 <resources>
     <!-- 384dp is the screen width of the Nexus 4. Something like a Moto G is smaller but a Nexus 5X is larger -->
     <!-- https://material.io/devices/ -->
+
+    <dimen name="in_call_fab_margin">12dp</dimen>
+    <dimen name="in_call_fab_margin_center">16dp</dimen>
+
     <dimen name="fineprint_size">12sp</dimen>
     <dimen name="audio_player_width">288dp</dimen>
     <dimen name="image_preview_width">288dp</dimen>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 069c19edc..fba306510 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -1,5 +1,7 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="in_call_fab_margin">8dp</dimen>
+    <dimen name="in_call_fab_margin_center">12dp</dimen>
     <dimen name="activity_horizontal_margin">8dp</dimen>
     <dimen name="activity_vertical_margin">8dp</dimen>
     <dimen name="card_padding_regular">16dp</dimen>