1
0
Fork 0

For #12078: Follow ux mock on Settings --> Language screen

master
Hakkı Kaan Çalışkan 2020-06-29 14:59:01 +03:00 committed by Emily Kager
parent 9bc4f443f5
commit 426a1ba57d
4 changed files with 23 additions and 15 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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>