From 9c06c9802df9b1ee55f6279401aeaa512970d4bb Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 3 Oct 2023 10:30:13 +0200 Subject: [PATCH] Updated margins --- .../account_profile_device_list_cell.xml | 2 +- .../res/layout/account_profile_fragment.xml | 42 +++++++++---------- .../account_profile_secure_mode_fragment.xml | 18 ++++---- .../layout/assistant_secure_mode_fragment.xml | 18 ++++---- app/src/main/res/layout/contact_fragment.xml | 36 ++++++++-------- .../res/layout/contacts_list_fragment.xml | 4 +- app/src/main/res/layout/help_fragment.xml | 5 ++- .../res/layout/history_contact_list_cell.xml | 4 +- app/src/main/res/layout/settings_fragment.xml | 14 +++---- app/src/main/res/layout/start_call_numpad.xml | 2 +- app/src/main/res/layout/toast.xml | 4 +- 11 files changed, 76 insertions(+), 73 deletions(-) diff --git a/app/src/main/res/layout/account_profile_device_list_cell.xml b/app/src/main/res/layout/account_profile_device_list_cell.xml index ebefb6c69..b76e21414 100644 --- a/app/src/main/res/layout/account_profile_device_list_cell.xml +++ b/app/src/main/res/layout/account_profile_device_list_cell.xml @@ -38,7 +38,7 @@ android:onClick="@{() -> model.removeDevice()}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="17dp" + android:layout_marginEnd="16dp" android:background="@drawable/tertiary_button_background" android:paddingStart="12dp" android:paddingEnd="12dp" diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 370d11b46..3ae4ef4c1 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -193,8 +193,8 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="8dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -206,7 +206,7 @@ android:id="@+id/sip_address_label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="17dp" + android:layout_marginStart="16dp" android:paddingTop="8dp" android:paddingBottom="8dp" android:text="@string/sip_address" @@ -324,7 +324,7 @@ android:id="@+id/details_bottom_anchor" android:layout_width="1dp" android:layout_height="1dp" - android:layout_marginTop="21dp" + android:layout_marginTop="20dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/prefix"/> @@ -333,8 +333,8 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="16dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -347,8 +347,8 @@ android:id="@+id/connected_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginTop="21dp" + android:layout_marginStart="16dp" + android:layout_marginTop="20dp" android:checked="@{viewModel.registerEnabled, default=true}" app:layout_constraintStart_toStartOf="@id/connection_background" app:layout_constraintTop_toTopOf="@id/connection_background" /> @@ -369,8 +369,8 @@ android:id="@+id/connected_summary" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:layout_marginTop="16dp" android:textSize="14sp" android:text="@{viewModel.accountModel.registrationStateSummary, default=@string/manage_account_status_connected_summary}" @@ -382,7 +382,7 @@ android:id="@+id/connection_bottom_anchor" android:layout_width="1dp" android:layout_height="1dp" - android:layout_marginTop="21dp" + android:layout_marginTop="20dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_summary"/> @@ -391,8 +391,8 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="16dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -417,7 +417,7 @@ android:id="@+id/change_mode" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="17dp" + android:layout_marginEnd="16dp" android:background="@drawable/tertiary_button_background" android:paddingStart="12dp" android:paddingEnd="12dp" @@ -460,7 +460,7 @@ android:paddingTop="6dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:paddingBottom="21dp" + android:paddingBottom="20dp" android:background="@drawable/shape_squircle_white_background" android:visibility="@{viewModel.expandDevices ? View.VISIBLE : View.GONE}" app:entries="@{viewModel.devices}" @@ -488,8 +488,8 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="8dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -502,8 +502,8 @@ android:id="@+id/action_settings" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:background="@drawable/action_background" android:text="@string/manage_account_settings" android:drawableStart="@drawable/gear" @@ -525,8 +525,8 @@ android:id="@+id/action_delete" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:layout_marginBottom="@dimen/screen_bottom_margin" android:background="@drawable/action_background" android:text="@string/manage_account_delete" diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml index 2b53789d9..a8d312447 100644 --- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml +++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml @@ -100,10 +100,10 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:background="@drawable/shape_squircle_white_background" - android:paddingTop="21dp" - android:paddingBottom="21dp" - android:paddingStart="17dp" - android:paddingEnd="17dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/manage_account_secure_mode_default_summary" android:textSize="14sp" android:gravity="center" @@ -117,7 +117,7 @@ android:layout_height="@dimen/avatar_list_cell_size" android:adjustViewBounds="true" android:layout_marginEnd="16dp" - android:layout_marginTop="21dp" + android:layout_marginTop="20dp" android:background="@drawable/shape_circle_light_blue_background" android:src="@drawable/user_circle" app:avatarViewPlaceholder="@drawable/user_circle" @@ -232,10 +232,10 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:background="@drawable/shape_squircle_white_background" - android:paddingTop="21dp" - android:paddingBottom="21dp" - android:paddingStart="17dp" - android:paddingEnd="17dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/manage_account_secure_mode_interoperable_summary" android:textSize="14sp" android:gravity="center" diff --git a/app/src/main/res/layout/assistant_secure_mode_fragment.xml b/app/src/main/res/layout/assistant_secure_mode_fragment.xml index 47fd5a816..29d1ba21c 100644 --- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml +++ b/app/src/main/res/layout/assistant_secure_mode_fragment.xml @@ -115,10 +115,10 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:background="@drawable/shape_squircle_gray_2_background" - android:paddingTop="21dp" - android:paddingBottom="21dp" - android:paddingStart="17dp" - android:paddingEnd="17dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/manage_account_secure_mode_default_summary" android:textSize="14sp" android:gravity="center" @@ -132,7 +132,7 @@ android:layout_height="@dimen/avatar_list_cell_size" android:adjustViewBounds="true" android:layout_marginEnd="16dp" - android:layout_marginTop="21dp" + android:layout_marginTop="20dp" android:background="@drawable/shape_circle_light_blue_background" android:src="@drawable/user_circle" app:avatarViewPlaceholder="@drawable/user_circle" @@ -247,10 +247,10 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:background="@drawable/shape_squircle_gray_2_background" - android:paddingTop="21dp" - android:paddingBottom="21dp" - android:paddingStart="17dp" - android:paddingEnd="17dp" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/manage_account_secure_mode_interoperable_summary" android:textSize="14sp" android:gravity="center" diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index 637b7a3f0..1d55efe5c 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -285,8 +285,8 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="16dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" android:visibility="@{viewModel.title.length() > 0 || viewModel.company.length() > 0 ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" @@ -386,8 +386,8 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="8dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -399,8 +399,8 @@ android:id="@+id/trusted_devices_count" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:layout_marginTop="20dp" android:text="@string/contact_details_trusted_devices_count" app:layout_constraintStart_toStartOf="@id/trust_background" @@ -412,8 +412,8 @@ android:layout_width="0dp" android:layout_height="28dp" android:layout_marginTop="10dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" app:trackCornerRadius="50dp" app:trackThickness="22dp" app:trackColor="@color/gray_main2_100" @@ -471,8 +471,8 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="8dp" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:src="@drawable/shape_squircle_white_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -485,8 +485,8 @@ android:id="@+id/action_edit" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:text="@string/contact_details_edit" android:drawableStart="@drawable/pencil_simple" android:background="@drawable/action_background" @@ -508,8 +508,8 @@ android:id="@+id/action_favorite" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:background="@drawable/action_background" android:text="@{viewModel.isFavourite ? @string/contact_details_remove_from_favourites : @string/contact_details_add_to_favourites, default=@string/contact_details_add_to_favourites}" android:drawableStart="@{viewModel.isFavourite ? @drawable/heart_fill : @drawable/heart, default=@drawable/heart_fill}" @@ -532,8 +532,8 @@ android:id="@+id/action_share" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:background="@drawable/action_background" android:text="@string/contact_details_share" android:drawableStart="@drawable/share_network" @@ -555,8 +555,8 @@ android:id="@+id/action_delete" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" - android:layout_marginEnd="17dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:background="@drawable/action_background" android:text="@string/contact_details_delete" android:drawableStart="@drawable/trash_simple" diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml index 1064033cb..05bc5a2d9 100644 --- a/app/src/main/res/layout/contacts_list_fragment.xml +++ b/app/src/main/res/layout/contacts_list_fragment.xml @@ -99,7 +99,7 @@ android:padding="5dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:layout_marginTop="15dp" + android:layout_marginTop="16dp" android:text="@string/contacts_list_favourites_title" android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="@color/gray_main2_600" @@ -128,7 +128,7 @@ android:padding="5dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:layout_marginTop="20dp" + android:layout_marginTop="16dp" android:text="@string/contacts_list_all_contacts_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml index 2322ed2bb..5a259ecee 100644 --- a/app/src/main/res/layout/help_fragment.xml +++ b/app/src/main/res/layout/help_fragment.xml @@ -160,7 +160,7 @@ android:id="@+id/check_for_update" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="17dp" + android:layout_marginEnd="16dp" android:background="@drawable/tertiary_button_background" android:paddingStart="12dp" android:paddingEnd="12dp" @@ -277,12 +277,15 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" + android:layout_marginBottom="@dimen/screen_bottom_margin" android:layout_marginTop="24dp" android:text="@string/help_troubleshooting_title" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" app:drawableTint="@color/gray_main2_500" + app:layout_constraintVertical_bias="0" app:layout_constraintTop_toBottomOf="@id/advanced_title" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/debug_icon" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/history_contact_list_cell.xml b/app/src/main/res/layout/history_contact_list_cell.xml index 6779b9cc8..c0615d4b9 100644 --- a/app/src/main/res/layout/history_contact_list_cell.xml +++ b/app/src/main/res/layout/history_contact_list_cell.xml @@ -14,8 +14,8 @@ + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp"> + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp">