From f4b6deb06a8ccc8ca5d855f8b1b62eb8754da252 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 8 Sep 2023 10:31:56 +0200
Subject: [PATCH] Layout changes for tablet

---
 .../org/linphone/utils/DataBindingUtils.kt    |  5 +-
 .../main/res/layout-land/welcome_page_1.xml   | 71 +++++++++++++++++++
 .../main/res/layout-land/welcome_page_2.xml   | 71 +++++++++++++++++++
 .../main/res/layout-land/welcome_page_3.xml   | 71 +++++++++++++++++++
 .../res/layout/account_profile_fragment.xml   | 24 +++----
 .../res/layout/assistant_login_fragment.xml   | 12 ++--
 .../layout/assistant_register_fragment.xml    | 21 +++---
 ...third_party_sip_account_login_fragment.xml | 16 +++--
 ...ird_party_sip_account_warning_fragment.xml |  3 +
 .../main/res/layout/call_start_fragment.xml   |  1 +
 .../res/layout/contact_new_or_edit_cell.xml   | 12 ++--
 .../layout/contact_new_or_edit_fragment.xml   | 34 ++++-----
 ...assistant_accept_conditions_and_policy.xml |  7 +-
 ...nt_create_account_confirm_phone_number.xml |  1 +
 .../layout/dialog_cancel_contact_changes.xml  |  1 +
 .../res/layout/dialog_confirm_zrtp_sas.xml    |  1 +
 .../dialog_contact_confirm_trust_call.xml     |  1 +
 .../layout/dialog_contact_trust_process.xml   |  1 +
 .../layout/dialog_pick_number_or_address.xml  |  1 +
 .../layout/dialog_remove_all_call_logs.xml    |  1 +
 app/src/main/res/layout/drawer_menu.xml       | 11 ++-
 app/src/main/res/layout/welcome_activity.xml  |  1 +
 app/src/main/res/values/dimen.xml             |  9 ++-
 23 files changed, 310 insertions(+), 66 deletions(-)
 create mode 100644 app/src/main/res/layout-land/welcome_page_1.xml
 create mode 100644 app/src/main/res/layout-land/welcome_page_2.xml
 create mode 100644 app/src/main/res/layout-land/welcome_page_3.xml

diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index c2abadc88..f33dae9a2 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -68,9 +68,8 @@ fun <T> setEntries(
     entries: List<T>?,
     layoutId: Int
 ) {
-    viewGroup.removeAllViews()
-
-    if (entries != null) {
+    if (!entries.isNullOrEmpty()) {
+        viewGroup.removeAllViews()
         val inflater = viewGroup.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         for (entry in entries) {
             val binding = DataBindingUtil.inflate<ViewDataBinding>(
diff --git a/app/src/main/res/layout-land/welcome_page_1.xml b/app/src/main/res/layout-land/welcome_page_1.xml
new file mode 100644
index 000000000..57cf422f5
--- /dev/null
+++ b/app/src/main/res/layout-land/welcome_page_1.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/title_first_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="65dp"
+        android:text="Welcome"
+        android:textColor="@color/black"
+        android:textSize="36sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/title_second_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:text="in Linphone"
+        android:textColor="@color/black"
+        android:textSize="26sp"
+        app:layout_constraintBottom_toBottomOf="@id/title_first_line"
+        app:layout_constraintStart_toEndOf="@id/title_first_line"/>
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginStart="32dp"
+        android:src="@drawable/illu"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintTop_toBottomOf="@id/title_second_line"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/page_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="55dp"
+        android:layout_marginStart="55dp"
+        android:text="Title 1"
+        android:textColor="@color/gray_9"
+        android:textSize="20sp"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@id/title_second_line"
+        app:layout_constraintStart_toEndOf="@id/image"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style"
+        android:id="@+id/message"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:layout_marginTop="16dp"
+        android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas commodo augue ut dictum. Fusce egestas tellus ut velit pulvinar commodo."
+        android:textColor="@color/gray_9"
+        android:textSize="14sp"
+        android:gravity="left"
+        app:layout_constraintTop_toBottomOf="@id/page_title"
+        app:layout_constraintStart_toStartOf="@id/page_title"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/welcome_page_2.xml b/app/src/main/res/layout-land/welcome_page_2.xml
new file mode 100644
index 000000000..6362376c9
--- /dev/null
+++ b/app/src/main/res/layout-land/welcome_page_2.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/title_first_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="65dp"
+        android:text="Welcome"
+        android:textColor="@color/black"
+        android:textSize="36sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/title_second_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:text="in Linphone"
+        android:textColor="@color/black"
+        android:textSize="26sp"
+        app:layout_constraintBottom_toBottomOf="@id/title_first_line"
+        app:layout_constraintStart_toEndOf="@id/title_first_line"/>
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginStart="32dp"
+        android:src="@drawable/illu"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintTop_toBottomOf="@id/title_second_line"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/page_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="55dp"
+        android:layout_marginStart="55dp"
+        android:text="Title 2"
+        android:textColor="@color/gray_9"
+        android:textSize="20sp"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@id/title_second_line"
+        app:layout_constraintStart_toEndOf="@id/image"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style"
+        android:id="@+id/message"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:layout_marginTop="16dp"
+        android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas commodo augue ut dictum. Fusce egestas tellus ut velit pulvinar commodo."
+        android:textColor="@color/gray_9"
+        android:textSize="14sp"
+        android:gravity="left"
+        app:layout_constraintTop_toBottomOf="@id/page_title"
+        app:layout_constraintStart_toStartOf="@id/page_title"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/welcome_page_3.xml b/app/src/main/res/layout-land/welcome_page_3.xml
new file mode 100644
index 000000000..bdb535213
--- /dev/null
+++ b/app/src/main/res/layout-land/welcome_page_3.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/title_first_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="65dp"
+        android:text="Welcome"
+        android:textColor="@color/black"
+        android:textSize="36sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/title_second_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:text="in Linphone"
+        android:textColor="@color/black"
+        android:textSize="26sp"
+        app:layout_constraintBottom_toBottomOf="@id/title_first_line"
+        app:layout_constraintStart_toEndOf="@id/title_first_line"/>
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginStart="32dp"
+        android:src="@drawable/illu"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintTop_toBottomOf="@id/title_second_line"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style_800"
+        android:id="@+id/page_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="55dp"
+        android:layout_marginStart="55dp"
+        android:text="Title 3"
+        android:textColor="@color/gray_9"
+        android:textSize="20sp"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@id/title_second_line"
+        app:layout_constraintStart_toEndOf="@id/image"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        style="@style/default_text_style"
+        android:id="@+id/message"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:layout_marginTop="16dp"
+        android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas commodo augue ut dictum. Fusce egestas tellus ut velit pulvinar commodo."
+        android:textColor="@color/gray_9"
+        android:textSize="14sp"
+        android:gravity="left"
+        app:layout_constraintTop_toBottomOf="@id/page_title"
+        app:layout_constraintStart_toStartOf="@id/page_title"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index 4a33fae8f..3ed0d612b 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -88,15 +88,14 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
             android:id="@+id/sip_uri_label"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="30dp"
-            android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="SIP address"
             android:textSize="13sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
+            app:layout_constraintStart_toStartOf="@id/sip_uri"
             app:layout_constraintTop_toBottomOf="@id/add_picture_label"/>
 
         <androidx.appcompat.widget.AppCompatEditText
@@ -116,6 +115,7 @@
             android:maxLines="1"
             android:background="@drawable/edit_text_background"
             android:inputType="text|textPersonName"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/sip_uri_label"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
@@ -123,15 +123,14 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
             android:id="@+id/first_name_label"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="Display Name"
             android:textSize="13sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
+            app:layout_constraintStart_toStartOf="@id/first_name"
             app:layout_constraintTop_toBottomOf="@id/sip_uri"/>
 
         <androidx.appcompat.widget.AppCompatEditText
@@ -150,6 +149,7 @@
             android:maxLines="1"
             android:background="@drawable/edit_text_background"
             android:inputType="text|textPersonName"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/first_name_label"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
@@ -157,15 +157,14 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
             android:id="@+id/international_prefix_label"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="30dp"
-            android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="International Prefix"
             android:textSize="13sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
+            app:layout_constraintStart_toStartOf="@id/international_prefix"
             app:layout_constraintTop_toBottomOf="@id/first_name"/>
 
         <androidx.appcompat.widget.AppCompatEditText
@@ -184,6 +183,7 @@
             android:maxLines="1"
             android:background="@drawable/edit_text_background"
             android:inputType="number|phone"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/international_prefix_label"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml
index 7a5687552..9e1bf59d4 100644
--- a/app/src/main/res/layout/assistant_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_login_fragment.xml
@@ -79,13 +79,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="18dp"
-                android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:text="Username*"
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/username"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -102,6 +101,7 @@
                 android:background="@drawable/edit_text_background"
                 android:inputType="text"
                 android:hint="Username"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/username_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -111,14 +111,14 @@
                 style="@style/default_text_style_700"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
                 android:text="Password*"
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/username"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/password"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -134,6 +134,7 @@
                 android:textColor="@color/gray_9"
                 android:background="@drawable/edit_text_background"
                 android:hint="Password"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -171,6 +172,7 @@
                 android:textColor="@color/primary_button_label_color"
                 android:gravity="center"
                 android:background="@drawable/primary_button_background"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/password"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
@@ -249,6 +251,7 @@
                 android:drawableStart="@drawable/qr_code"
                 android:drawablePadding="8dp"
                 app:drawableTint="@color/secondary_button_label_color"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/or" />
@@ -271,6 +274,7 @@
                 android:textColor="@color/secondary_button_label_color"
                 android:gravity="center"
                 android:background="@drawable/secondary_button_background"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/scan_qr_code" />
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index 99ad26ad2..d7cc8e631 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -79,13 +79,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="48dp"
-                android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:text="Username*"
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/username"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -102,6 +101,7 @@
                 android:background="@{viewModel.usernameError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}"
                 android:inputType="text"
                 android:hint="Username"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/username_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -124,21 +124,19 @@
                 style="@style/default_text_style_700"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
                 android:text="Phone Number*"
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/username_error"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/prefix"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
                 android:id="@+id/phone_number"
                 android:layout_width="0dp"
                 android:layout_height="50dp"
-                android:layout_marginEnd="16dp"
                 android:paddingStart="90dp"
                 android:paddingEnd="20dp"
                 android:text="@={viewModel.phoneNumber, default=`6 01 02 03 04 05`}"
@@ -149,9 +147,10 @@
                 android:drawableStart="@drawable/separator"
                 android:drawablePadding="10dp"
                 android:hint="Phone number"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/phone_number_label"
-                app:layout_constraintStart_toStartOf="@id/prefix"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/username"
+                app:layout_constraintEnd_toEndOf="@id/username"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:onClick="@{showCountryPickerClickListener}"
@@ -159,7 +158,6 @@
                 android:id="@+id/prefix"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_marginStart="16dp"
                 android:paddingStart="20dp"
                 android:text="@{viewModel.internationalPrefix, default=`+33`}"
                 android:textSize="14sp"
@@ -169,7 +167,7 @@
                 android:drawablePadding="10dp"
                 app:layout_constraintTop_toTopOf="@id/phone_number"
                 app:layout_constraintBottom_toBottomOf="@id/phone_number"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="@id/username" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_600"
@@ -189,14 +187,13 @@
                 style="@style/default_text_style_700"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
                 android:text="Password*"
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/phone_number_error"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/password"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -213,6 +210,7 @@
                 android:background="@drawable/edit_text_background"
                 android:hint="Password"
                 android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -247,6 +245,7 @@
                 android:textColor="@color/primary_button_label_color"
                 android:gravity="center"
                 android:background="@drawable/primary_button_background"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/password"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index 2044c157e..37f1454c3 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -60,7 +60,7 @@
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/username"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -77,6 +77,7 @@
                 android:background="@drawable/edit_text_background"
                 android:inputType="text"
                 android:hint="Username"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/username_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -93,7 +94,7 @@
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/username"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/password"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -110,6 +111,7 @@
                 android:background="@drawable/edit_text_background"
                 android:hint="Password"
                 android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -139,7 +141,7 @@
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/password"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/domain"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -156,6 +158,7 @@
                 android:background="@drawable/edit_text_background"
                 android:inputType="text|textUri"
                 android:hint="Domain"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/domain_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -172,7 +175,7 @@
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/domain"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/display_name"/>
 
             <androidx.appcompat.widget.AppCompatEditText
                 style="@style/default_text_style"
@@ -189,6 +192,7 @@
                 android:background="@drawable/edit_text_background"
                 android:inputType="text|textPersonName"
                 android:hint="Display Name"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/display_name_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -205,7 +209,7 @@
                 android:textSize="13sp"
                 android:textColor="@color/gray_9"
                 app:layout_constraintTop_toBottomOf="@id/display_name"
-                app:layout_constraintStart_toStartOf="parent"/>
+                app:layout_constraintStart_toStartOf="@id/transport"/>
 
             <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/transport"
@@ -216,6 +220,7 @@
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:background="@drawable/edit_text_background"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/transport_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -249,6 +254,7 @@
                 android:textColor="@color/primary_button_label_color"
                 android:gravity="center"
                 android:background="@drawable/primary_button_background"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/transport"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
index e6c6db747..b8777245d 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
@@ -89,6 +89,7 @@
             android:text="Some features require a Linphone account, such as group messaging, video conferences...\n\nThese features are hidden when you register with a third party SIP account.\n\nTo enable it in a commercial projet, please contact us. "
             android:textSize="14sp"
             android:gravity="center"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/no_chat"/>
@@ -132,6 +133,7 @@
             android:textColor="@color/secondary_button_label_color"
             android:gravity="center"
             android:background="@drawable/secondary_button_background"
+            app:layout_constraintWidth_max="@dimen/button_max_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@id/continue_third_party_account_login" />
@@ -155,6 +157,7 @@
             android:textColor="@color/primary_button_label_color"
             android:gravity="center"
             android:background="@drawable/primary_button_background"
+            app:layout_constraintWidth_max="@dimen/button_max_width"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/call_start_fragment.xml b/app/src/main/res/layout/call_start_fragment.xml
index 7efe61090..016d9f47f 100644
--- a/app/src/main/res/layout/call_start_fragment.xml
+++ b/app/src/main/res/layout/call_start_fragment.xml
@@ -181,6 +181,7 @@
                 android:layout_height="wrap_content"
                 android:text="No suggestion and no contact for the moment..."
                 android:textSize="16sp"
+                android:gravity="center"
                 android:visibility="@{viewModel.emptyContactsList &amp;&amp; viewModel.suggestionsList.size() == 0 ? View.VISIBLE : View.GONE}"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/contact_new_or_edit_cell.xml b/app/src/main/res/layout/contact_new_or_edit_cell.xml
index 87b67a0f6..e46aeef2b 100644
--- a/app/src/main/res/layout/contact_new_or_edit_cell.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_cell.xml
@@ -19,15 +19,12 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
             android:id="@+id/label"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             android:text="@{model.isSip ? `SIP address` : `Phone number`, default=`SIP address`}"
             android:textSize="13sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/field"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatEditText
@@ -36,8 +33,6 @@
             android:id="@+id/field"
             android:layout_width="0dp"
             android:layout_height="50dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="5dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
@@ -47,6 +42,7 @@
             android:background="@drawable/edit_text_background"
             android:maxLines="1"
             android:inputType="@{model.isSip ? InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS : InputType.TYPE_CLASS_PHONE}"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/label"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/remove"/>
@@ -57,7 +53,7 @@
             android:visibility="@{model.showRemoveButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="10dp"
             android:src="@drawable/x"
             app:tint="@color/gray_8"
             app:layout_constraintStart_toEndOf="@id/field"
diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
index f05bd52ec..f9c5dc5e9 100644
--- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
@@ -116,15 +116,13 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/default_text_style_700"
                     android:id="@+id/first_name_label"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
-                    android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:text="First Name"
                     android:textSize="13sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/first_name"
                     app:layout_constraintTop_toBottomOf="@id/add_picture_label"/>
 
                 <androidx.appcompat.widget.AppCompatEditText
@@ -143,6 +141,7 @@
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
                     android:inputType="text|textPersonName|textCapWords"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/first_name_label"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
@@ -150,15 +149,13 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/default_text_style_700"
                     android:id="@+id/last_name_label"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:text="Last Name"
                     android:textSize="13sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/last_name"
                     app:layout_constraintTop_toBottomOf="@id/first_name"/>
 
                 <androidx.appcompat.widget.AppCompatEditText
@@ -177,6 +174,7 @@
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
                     android:inputType="text|textPersonName|textCapWords"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/last_name_label"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
@@ -186,7 +184,10 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:orientation="vertical"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/last_name"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
@@ -196,7 +197,10 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:orientation="vertical"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/sip_addresses"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
@@ -204,15 +208,13 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/default_text_style_700"
                     android:id="@+id/company_label"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
-                    android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:text="Company"
                     android:textSize="13sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/company"
                     app:layout_constraintTop_toBottomOf="@id/phone_numbers"/>
 
                 <androidx.appcompat.widget.AppCompatEditText
@@ -231,6 +233,7 @@
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
                     android:inputType="text|textCapWords"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/company_label"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
@@ -238,15 +241,13 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/default_text_style_700"
                     android:id="@+id/job_title_label"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:text="Job"
                     android:textSize="13sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/job_title"
                     app:layout_constraintTop_toBottomOf="@id/company"/>
 
                 <androidx.appcompat.widget.AppCompatEditText
@@ -266,6 +267,7 @@
                     android:maxLines="1"
                     android:background="@drawable/edit_text_background"
                     android:inputType="text|textCapWords"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/job_title_label"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml b/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml
index acadf0ea9..2760cb085 100644
--- a/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml
+++ b/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml
@@ -33,12 +33,13 @@
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/title"
-            android:clickable="true"
-            android:focusable="true" />
+            app:layout_constraintTop_toTopOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
diff --git a/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
index 99f9d9367..1727415dd 100644
--- a/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
+++ b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
@@ -33,6 +33,7 @@
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_cancel_contact_changes.xml b/app/src/main/res/layout/dialog_cancel_contact_changes.xml
index 93596be82..f6f05ca62 100644
--- a/app/src/main/res/layout/dialog_cancel_contact_changes.xml
+++ b/app/src/main/res/layout/dialog_cancel_contact_changes.xml
@@ -34,6 +34,7 @@
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
index a202b8d2f..5506761c2 100644
--- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
+++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
@@ -35,6 +35,7 @@
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/title" />
diff --git a/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml b/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml
index a853d6be4..252605b87 100644
--- a/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml
+++ b/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml
@@ -33,6 +33,7 @@
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_contact_trust_process.xml b/app/src/main/res/layout/dialog_contact_trust_process.xml
index c45731792..2acdc75d5 100644
--- a/app/src/main/res/layout/dialog_contact_trust_process.xml
+++ b/app/src/main/res/layout/dialog_contact_trust_process.xml
@@ -33,6 +33,7 @@
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_pick_number_or_address.xml b/app/src/main/res/layout/dialog_pick_number_or_address.xml
index cda4e3550..ec531041a 100644
--- a/app/src/main/res/layout/dialog_pick_number_or_address.xml
+++ b/app/src/main/res/layout/dialog_pick_number_or_address.xml
@@ -34,6 +34,7 @@
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_remove_all_call_logs.xml b/app/src/main/res/layout/dialog_remove_all_call_logs.xml
index ce0955270..4c3c8c2d6 100644
--- a/app/src/main/res/layout/dialog_remove_all_call_logs.xml
+++ b/app/src/main/res/layout/dialog_remove_all_call_logs.xml
@@ -34,6 +34,7 @@
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="2dp"
             android:src="@drawable/shape_dialog_background"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
             app:layout_constraintBottom_toBottomOf="@id/anchor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml
index 9c5c96966..243b0c794 100644
--- a/app/src/main/res/layout/drawer_menu.xml
+++ b/app/src/main/res/layout/drawer_menu.xml
@@ -74,7 +74,15 @@
                 android:layout_marginEnd="5dp"
                 android:orientation="vertical"
                 entries="@{viewModel.accounts}"
-                layout="@{@layout/account_list_cell}"/>
+                layout="@{@layout/account_list_cell}">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="No account configured yet" />
+
+            </LinearLayout>
 
         </ScrollView>
 
@@ -99,6 +107,7 @@
             android:drawablePadding="8dp"
             app:drawableTint="@color/secondary_button_label_color"
             android:background="@drawable/secondary_button_background"
+            app:layout_constraintWidth_max="@dimen/button_max_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@id/separator" />
diff --git a/app/src/main/res/layout/welcome_activity.xml b/app/src/main/res/layout/welcome_activity.xml
index f2bf6772b..a540ad1c3 100644
--- a/app/src/main/res/layout/welcome_activity.xml
+++ b/app/src/main/res/layout/welcome_activity.xml
@@ -84,6 +84,7 @@
                 android:textColor="@color/primary_button_label_color"
                 android:gravity="center"
                 android:background="@drawable/primary_button_background"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/dots_indicator"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 612d669be..f441fe437 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -3,9 +3,9 @@
     <dimen name="zero">0dp</dimen>
 
     <dimen name="landscape_nav_bar_width">75dp</dimen>
-    <dimen name="sliding_pane_left_fragment_width">280dp</dimen>
+    <dimen name="sliding_pane_left_fragment_width">400dp</dimen>
     <!-- This value is the result of the above two added together -->
-    <dimen name="sliding_pane_left_fragment_with_nav_width">355dp</dimen>
+    <dimen name="sliding_pane_left_fragment_with_nav_width">475dp</dimen>
     <dimen name="sliding_pane_right_fragment_width">300dp</dimen>
 
     <dimen name="icon_size">24dp</dimen>
@@ -34,7 +34,10 @@
     <dimen name="in_call_all_actions_menu_height">345dp</dimen> <!-- sum of above two -->
     <dimen name="in_call_round_corners_texture_view_radius">20dp</dimen>
 
-    <dimen name="toast_max_width">360dp</dimen>
+    <dimen name="toast_max_width">400dp</dimen>
+    <dimen name="button_max_width">400dp</dimen>
+    <dimen name="dialog_max_width">400dp</dimen>
+    <dimen name="text_input_max_width">400dp</dimen>
 
     <dimen name="voip_button_size">55dp</dimen>
     <dimen name="voip_button_icon_padding">15dp</dimen>