From d74dc2053bff9a21bf18772c09397b1f9868f73e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Aug 2020 16:48:40 +0200
Subject: [PATCH 1/3] Increase Font size on Calling screen (#1643) And cleanup
 the layout

---
 CHANGES.md                                   |  1 +
 vector/src/main/res/layout/activity_call.xml | 38 ++++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a49507b516..8e8cee0d98 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
  - Give user the possibility to prevent accidental call (#1869)
  - Display device information (name, id and key) in Cryptography setting screen (#1784)
  - Ensure users do not accidentally ignore other users (#1890)
+ - Increase Font size on Calling screen (#1643)
 
 Bugfix 🐛:
  - Fix invisible toolbar (Status.im theme) (#1746)
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index d9d476cb9e..8fbff3692e 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -28,31 +28,38 @@
 
     <TextView
         android:id="@+id/participantNameText"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:gravity="center"
         android:textColor="?riotx_text_primary"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/callTypeText"
-        tools:text="Joe" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/callTypeText"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:gravity="center"
         android:textColor="?riotx_text_secondary"
-        android:textSize="12sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/otherMemberAvatar"
-        tools:text="Video Call" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/action_video_call" />
 
     <ImageView
         android:id="@+id/otherMemberAvatar"
         android:layout_width="128dp"
         android:layout_height="128dp"
-        android:layout_centerVertical="true"
         android:contentDescription="@string/avatar"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -64,21 +71,25 @@
 
     <TextView
         android:id="@+id/callStatusText"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:gravity="center"
         android:textColor="?riotx_text_secondary"
-        android:textSize="12sp"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/otherMemberAvatar"
-        tools:text="Connecting..." />
+        tools:text="@string/call_connecting" />
 
     <ProgressBar
         android:id="@+id/callConnectingProgress"
         style="?android:attr/progressBarStyle"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
@@ -91,7 +102,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="visible"
-        app:constraint_referenced_ids="participantNameText, callTypeText, otherMemberAvatar, callStatusText" />
+        app:constraint_referenced_ids="participantNameText,callTypeText,otherMemberAvatar,callStatusText" />
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/callVideoGroup"
@@ -101,7 +112,6 @@
         app:constraint_referenced_ids="pip_video_view, fullscreen_video_view"
         tools:visibility="invisible" />
 
-
     <im.vector.app.features.call.CallControlsView
         android:id="@+id/callControls"
         android:layout_width="match_parent"

From 497b07b156c6022b3ff6770f75175ce3e64d18f7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Aug 2020 18:02:23 +0200
Subject: [PATCH 2/3] Fix color issue in dark and black themes (#961)

---
 vector/src/main/res/layout/item_generic_list.xml        | 1 -
 vector/src/main/res/layout/item_verification_action.xml | 1 +
 vector/src/main/res/values/colors_riotx.xml             | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index dee6e06693..4b206c352d 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -5,7 +5,6 @@
     android:id="@+id/item_generic_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?riotx_background"
     android:minHeight="50dp">
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index f5d060b267..263a8ff107 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -5,6 +5,7 @@
     android:id="@+id/itemVerificationClickableZone"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?riotx_bottom_sheet_background"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index de415bae1b..cfcc8a8b1d 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -60,7 +60,7 @@
     <attr name="riotx_bottom_sheet_background" format="color" />
     <color name="riotx_bottom_sheet_background_light">#FFFFFFFF</color>
     <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
-    <color name="riotx_bottom_sheet_background_black">#FF000000</color>
+    <color name="riotx_bottom_sheet_background_black">#FF282C35</color>
 
     <attr name="riotx_base_text_icon_primary" format="color" />
     <color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
@@ -225,8 +225,8 @@
     <color name="riotx_disabled_view_color_dark">#61708B</color>
 
     <attr name="riotx_list_bottom_sheet_divider_color" format="color" />
-    <color name="riotx_list_bottom_sheet_divider_color_light">#EEEFEF</color>
-    <color name="riotx_list_bottom_sheet_divider_color_dark">#FF61708B</color>
+    <color name="riotx_list_bottom_sheet_divider_color_light">#E3E8F0</color>
+    <color name="riotx_list_bottom_sheet_divider_color_dark">#7F61708B</color>
     <color name="riotx_list_bottom_sheet_divider_color_black">#FF22262E</color>
 
     <!-- (color from RiotWeb) -->

From 189d2b2c06b29876d3ad013a8a74a966596321f0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Aug 2020 19:08:32 +0200
Subject: [PATCH 3/3] Increase again font size

---
 vector/src/main/res/layout/activity_call.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 8fbff3692e..b2af9f8a9d 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -34,7 +34,7 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:gravity="center"
         android:textColor="?riotx_text_primary"
-        android:textSize="24sp"
+        android:textSize="28sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/callTypeText"
         app:layout_constraintEnd_toEndOf="parent"
@@ -50,7 +50,7 @@
         android:layout_marginBottom="8dp"
         android:gravity="center"
         android:textColor="?riotx_text_secondary"
-        android:textSize="14sp"
+        android:textSize="22sp"
         app:layout_constraintBottom_toTopOf="@id/otherMemberAvatar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -58,8 +58,8 @@
 
     <ImageView
         android:id="@+id/otherMemberAvatar"
-        android:layout_width="128dp"
-        android:layout_height="128dp"
+        android:layout_width="160dp"
+        android:layout_height="160dp"
         android:contentDescription="@string/avatar"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -79,7 +79,7 @@
         android:layout_marginBottom="8dp"
         android:gravity="center"
         android:textColor="?riotx_text_secondary"
-        android:textSize="14sp"
+        android:textSize="22sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/otherMemberAvatar"