Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #5607: Implement Font Scaling Support Up to 200% for Accessibility #5686

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/src/main/res/layout-land/onboarding_slide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
android:id="@+id/slide_title_text_view"
style="@style/Heading1ViewCenterHorizontal"
android:layout_width="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="80dp"
android:layout_marginEnd="28dp"
android:layout_marginStart="16dp"
android:layout_marginTop="100dp"
android:layout_marginEnd="36dp"
android:fontFamily="sans-serif-medium"
android:text="@{viewModel.title}"
android:textColor="@color/component_color_shared_primary_text_color"
Expand All @@ -54,9 +54,9 @@
android:id="@+id/slide_description_text_view"
style="@style/Subtitle1ViewCenterHorizontal"
android:layout_width="0dp"
android:layout_marginStart="20dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="40dp"
android:layout_marginStart="28dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="48dp"
android:text="@{viewModel.description}"
android:textColor="@color/component_color_shared_secondary_1_text_color"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/res/layout-land/onboarding_slide_final.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
android:id="@+id/slide_title_text_view"
style="@style/Heading1ViewCenterHorizontal"
android:layout_width="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="80dp"
android:layout_marginEnd="28dp"
android:layout_marginStart="16dp"
android:layout_marginTop="100dp"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While other dimensions increased by a consistent 8, why did this one increase by 20?

android:layout_marginEnd="36dp"
android:fontFamily="sans-serif-medium"
android:text="@string/onboarding_slide_3_title"
android:textColor="@color/component_color_shared_primary_text_color"
Expand All @@ -55,9 +55,9 @@
android:id="@+id/slide_description_text_view"
style="@style/Subtitle1ViewCenterHorizontal"
android:layout_width="0dp"
android:layout_marginStart="20dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="40dp"
android:layout_marginStart="28dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="48dp"
android:text="@string/onboarding_slide_3_description"
android:textColor="@color/component_color_shared_secondary_1_text_color"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -69,9 +69,9 @@
android:id="@+id/get_started_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="52dp"
android:layout_marginStart="36dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="60dp"
android:background="@drawable/primary_rounded_button"
android:fontFamily="sans-serif-medium"
android:minHeight="48dp"
Expand All @@ -89,9 +89,9 @@
style="@style/TextViewCenter"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="28dp"
android:layout_marginStart="36dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="36dp"
android:fontFamily="sans-serif"
android:textColor="@color/component_color_shared_primary_text_color"
android:textColorLink="@color/component_color_shared_link_text_color"
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/res/layout-land/profile_edit_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,28 @@
<TextView
android:id="@+id/profile_edit_name"
style="@style/Heading2ViewStart"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="24dp"
android:importantForAccessibility="no"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_shared_primary_text_color"
app:layout_constraintBottom_toTopOf="@+id/profile_edit_created"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/profile_edit_image"
app:layout_constraintTop_toTopOf="@id/profile_edit_image"
app:layout_constraintVertical_chainStyle="packed" />

<TextView
android:id="@+id/profile_edit_created"
style="@style/Subtitle2ViewStart"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:textColor="@color/component_color_shared_secondary_1_text_color"
app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/profile_edit_name"
app:layout_constraintTop_toBottomOf="@+id/profile_edit_name"
app:layout_constraintVertical_chainStyle="packed"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/layout-land/profile_progress_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginStart="44dp"
android:fontFamily="sans-serif-medium"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_shared_primary_text_color"
Expand Down Expand Up @@ -103,6 +104,7 @@
style="@style/TextViewCenter"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:fontFamily="sans-serif"
android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
android:textColor="@color/component_color_shared_primary_text_color"
Expand Down Expand Up @@ -153,6 +155,7 @@
style="@style/TextViewCenter"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:fontFamily="sans-serif"
android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
android:textColor="@color/component_color_shared_primary_text_color"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/onboarding_slide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
android:id="@+id/slide_title_text_view"
style="@style/Heading1"
android:layout_width="0dp"
android:layout_marginStart="28dp"
android:layout_marginStart="48dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="28dp"
android:layout_marginEnd="48dp"
android:layout_marginBottom="16dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal"
Expand All @@ -53,9 +53,9 @@
android:id="@+id/slide_description_text_view"
style="@style/Subtitle1ViewCenterHorizontal"
android:layout_width="0dp"
android:layout_marginStart="48dp"
android:layout_marginStart="68dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="48dp"
android:layout_marginEnd="68dp"
android:maxLines="2"
android:minLines="2"
android:text="@{viewModel.description}"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/onboarding_slide_final.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
android:id="@+id/slide_title_text_view"
style="@style/Heading1"
android:layout_width="0dp"
android:layout_marginStart="28dp"
android:layout_marginStart="48dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="28dp"
android:layout_marginEnd="48dp"
android:layout_marginBottom="16dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal"
Expand All @@ -55,9 +55,9 @@
android:id="@+id/slide_description_text_view"
style="@style/Subtitle1ViewCenterHorizontal"
android:layout_width="0dp"
android:layout_marginStart="48dp"
android:layout_marginStart="68dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="48dp"
android:layout_marginEnd="68dp"
android:maxLines="2"
android:minLines="2"
android:text="@string/onboarding_slide_3_description"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/profile_edit_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
style="@style/Heading2ViewStart"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="32dp"
android:layout_marginEnd="24dp"
android:importantForAccessibility="no"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_shared_primary_text_color"
Expand All @@ -66,7 +66,7 @@
style="@style/Subtitle2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginEnd="16dp"
android:textColor="@color/component_color_shared_secondary_1_text_color"
app:layout_constraintBottom_toBottomOf="@+id/profile_edit_image"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/layout/profile_progress_header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="sans-serif-medium"
android:text="@{viewModel.profile.name}"
android:textColor="@color/component_color_shared_primary_text_color"
Expand Down Expand Up @@ -106,6 +108,8 @@
style="@style/TextViewCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="sans-serif"
android:minWidth="60dp"
android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
Expand Down Expand Up @@ -156,6 +160,8 @@
style="@style/TextViewCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="sans-serif"
android:minWidth="60dp"
android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
Expand Down
Loading