From 426a1ba57de99d23e9c6e7d15c773c4780802478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hakk=C4=B1=20Kaan=20=C3=87al=C4=B1=C5=9Fkan?=
 <caliskanhkaan@gmail.com>
Date: Mon, 29 Jun 2020 14:59:01 +0300
Subject: [PATCH] For #12078: Follow ux mock on Settings --> Language screen

---
 .../res/layout/component_locale_settings.xml  |  4 +++-
 .../res/layout/fragment_locale_settings.xml   |  3 +++
 .../main/res/layout/locale_settings_item.xml  | 23 +++++++++++--------
 app/src/main/res/values/dimens.xml            |  8 +++----
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/component_locale_settings.xml b/app/src/main/res/layout/component_locale_settings.xml
index 98ccd27cd..338f2868c 100644
--- a/app/src/main/res/layout/component_locale_settings.xml
+++ b/app/src/main/res/layout/component_locale_settings.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -10,7 +13,6 @@
         android:id="@+id/locale_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_margin="@dimen/locale_list_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_locale_settings.xml b/app/src/main/res/layout/fragment_locale_settings.xml
index 2ce083109..eb8b403c7 100644
--- a/app/src/main/res/layout/fragment_locale_settings.xml
+++ b/app/src/main/res/layout/fragment_locale_settings.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/locale_settings_item.xml b/app/src/main/res/layout/locale_settings_item.xml
index 48e67a838..31fa8cd68 100644
--- a/app/src/main/res/layout/locale_settings_item.xml
+++ b/app/src/main/res/layout/locale_settings_item.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="48dp">
 
     <ImageView
         android:id="@+id/locale_selected_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/locale_item_vertical_margin"
-        android:layout_marginBottom="@dimen/locale_item_vertical_margin"
+        android:layout_marginStart="@dimen/locale_list_margin"
         android:contentDescription="@string/a11y_selected_locale_content_description"
         app:srcCompat="@drawable/mozac_ic_check"
-        android:tint="?primaryText"
-        android:visibility="gone"
+        app:tint="?primaryText"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -23,7 +26,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/locale_item_text_margin_start"
-        android:layout_marginTop="@dimen/locale_item_vertical_margin"
+        android:layout_marginEnd="@dimen/locale_item_text_margin_end"
         android:textColor="?primaryText"
         android:textAlignment="viewStart"
         app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
@@ -33,22 +36,24 @@
         app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        app:layout_goneMarginBottom="@dimen/locale_item_vertical_margin" />
+        tools:text="English (United States)" />
 
     <TextView
         android:id="@+id/locale_subtitle_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/locale_item_text_margin_start"
-        android:layout_marginBottom="@dimen/locale_item_vertical_margin"
+        android:layout_marginEnd="@dimen/locale_item_text_margin_end"
         android:textColor="?secondaryText"
         android:textAlignment="viewStart"
         android:textSize="@dimen/locale_item_subtitle_size"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
         app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
         app:layout_constraintTop_toBottomOf="@+id/locale_title_text"
-        app:layout_constraintVertical_chainStyle="packed" />
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="English (United States)" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a8e62f014..159315993 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -109,12 +109,10 @@
     <dimen name="about_header_text_line_spacing_extra">4dp</dimen>
 
     <!-- Locale Settings Fragment -->
-    <dimen name="locale_search_bar_margin">8dp</dimen>
-    <dimen name="locale_search_bar_padding_start">-12dp</dimen>
     <dimen name="locale_list_margin">16dp</dimen>
-    <dimen name="locale_item_vertical_margin">8dp</dimen>
-    <dimen name="locale_item_text_margin_start">16dp</dimen>
-    <dimen name="locale_item_text_margin_gone_start">40dp</dimen>
+    <dimen name="locale_item_text_margin_start">32dp</dimen>
+    <dimen name="locale_item_text_margin_end">16dp</dimen>
+    <dimen name="locale_item_text_margin_gone_start">72dp</dimen>
     <dimen name="locale_item_title_size">16sp</dimen>
     <dimen name="locale_item_subtitle_size">12sp</dimen>