From 8fcf4a86495e909e3265f1ff3630dd774c8141f6 Mon Sep 17 00:00:00 2001
From: Noelia Alcala <nalcalag@gmail.com>
Date: Fri, 25 Nov 2022 16:44:15 +0000
Subject: [PATCH] ADS: Accessibility screen migration (#2553)

Task/Issue URL: https://app.asana.com/0/0/1203418963160797/f

### Description
Accessibility screen 100% migrated to new components

### Steps to test this PR

- Install from this branch
- Go to Settings > Accessibility
- [ ] Check screen looks as expected

### UI changes
| Before  | After |
| ------ | ----- |
![Screenshot_20221123-171045_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203611688-2e940e30-79a6-46b6-b641-02c162f975a7.jpg)|![Screenshot_20221124-101518_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759185-7398bb92-b372-4182-bf36-266dde6f555c.jpg)|
![Screenshot_20221124-101542_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759120-a2230381-80c3-4648-a79b-e6d79f0a624d.jpg)|![Screenshot_20221124-101507_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759152-68b12852-8705-4c4b-9c6a-6930cefca7c1.jpg)|
---
 .../activity_accessibility_settings.xml       | 150 ++++++++----------
 .../background_text_view_container.xml        |  21 +++
 2 files changed, 89 insertions(+), 82 deletions(-)
 create mode 100644 common-ui/src/main/res/drawable/background_text_view_container.xml

diff --git a/app/src/main/res/layout/activity_accessibility_settings.xml b/app/src/main/res/layout/activity_accessibility_settings.xml
index b025536e3616..2c153370df97 100644
--- a/app/src/main/res/layout/activity_accessibility_settings.xml
+++ b/app/src/main/res/layout/activity_accessibility_settings.xml
@@ -14,114 +14,100 @@
   ~ limitations under the License.
   -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout 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="match_parent"
-                                                     tools:context="com.duckduckgo.app.accessibility.AccessibilityActivity">
+<LinearLayout 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="match_parent"
+    android:orientation="vertical">
 
     <include
-            android:id="@+id/includeToolbar"
-            layout="@layout/include_default_toolbar"/>
+        android:id="@+id/includeToolbar"
+        layout="@layout/include_default_toolbar" />
 
     <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            tools:ignore="Overdraw">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:ignore="Overdraw">
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/keyline_4"
-                android:paddingBottom="@dimen/keyline_4"
-                android:orientation="vertical">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/keyline_4">
 
             <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
-                    android:id="@+id/appFontSizeToggle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:secondaryText="@string/accessibilityTextSizeOverrideSubtitle"
-                    app:primaryText="@string/accessibilityTextSizeOverrideTitle"
-                    app:showSwitch="true"/>
+                android:id="@+id/appFontSizeToggle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:primaryText="@string/accessibilityTextSizeOverrideTitle"
+                app:secondaryText="@string/accessibilityTextSizeOverrideSubtitle"
+                app:showSwitch="true" />
 
             <LinearLayout
-                    android:id="@+id/fontSizeSettingsGroup"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    tools:ignore="Overdraw">
+                android:id="@+id/fontSizeSettingsGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                tools:ignore="Overdraw">
 
-                <com.duckduckgo.mobile.android.ui.view.text.SectionHeaderTextView
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/keyline_4"
+                    android:orientation="horizontal"
                     android:paddingStart="@dimen/keyline_4"
-                    android:paddingEnd="@dimen/keyline_4"
-                    android:text="@string/accessibilityFontSizeTitle"
-                    tools:text="Text goes here"/>
+                    android:paddingEnd="@dimen/keyline_4">
 
-                <LinearLayout
-                        android:layout_width="match_parent"
+                    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+                        android:id="@+id/accessibilitySliderValue"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:paddingStart="@dimen/keyline_4"
-                        android:paddingEnd="@dimen/keyline_4">
-
-                    <TextView
-                            android:id="@+id/accessibilitySliderValue"
-                            style="@style/TextAppearance.DuckDuckGo.Body1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical|start"
-                            android:minWidth="50dp"
-                            android:textColor="?attr/normalTextColor"/>
+                        android:layout_gravity="center"
+                        android:minWidth="50dp"
+                        app:typography="body1" />
 
                     <com.google.android.material.slider.Slider
-                            android:id="@+id/accessibilitySlider"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:paddingTop="@dimen/keyline_4"
-                            android:paddingBottom="@dimen/keyline_4"
-                            android:stepSize="10"
-                            android:valueFrom="70"
-                            android:valueTo="170"
-                            app:labelBehavior="gone"
-                            app:tickVisible="false"/>
+                        android:id="@+id/accessibilitySlider"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:paddingTop="@dimen/keyline_4"
+                        android:paddingBottom="@dimen/keyline_4"
+                        android:stepSize="10"
+                        android:valueFrom="70"
+                        android:valueTo="170"
+                        app:labelBehavior="gone"
+                        app:tickVisible="false" />
                 </LinearLayout>
 
-                <TextView
-                        android:id="@+id/accessibilityHint"
-                        style="@style/TextAppearance.DuckDuckGo.Body1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:layout_marginStart="@dimen/keyline_4"
-                        android:layout_marginTop="@dimen/keyline_4"
-                        android:layout_marginEnd="@dimen/keyline_4"
-                        android:background="?lightContainerBackground"
-                        android:ellipsize="end"
-                        android:padding="@dimen/keyline_2"
-                        android:text="@string/accessibilityFontSizeHint"
-                        android:textColor="?attr/normalTextColor"/>
+                <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+                    android:id="@+id/accessibilityHint"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/keyline_4"
+                    android:layout_marginTop="@dimen/keyline_4"
+                    android:layout_marginEnd="@dimen/keyline_4"
+                    android:layout_marginBottom="16dp"
+                    android:background="@drawable/background_text_view_container"
+                    android:padding="@dimen/keyline_4"
+                    android:text="@string/accessibilityFontSizeHint"
+                    app:typography="body1" />
             </LinearLayout>
 
             <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
+                android:id="@+id/accessibilityDivider"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/accessibilityDivider"/>
+                android:layout_height="wrap_content" />
 
             <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
-                    android:id="@+id/forceZoomToggle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:secondaryText="@string/accessibilityForceZoomSubtitle"
-                    app:primaryText="@string/accessibilityForceZoomTitle"
-                    app:showSwitch="true"/>
+                android:id="@+id/forceZoomToggle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:primaryText="@string/accessibilityForceZoomTitle"
+                app:secondaryText="@string/accessibilityForceZoomSubtitle"
+                app:showSwitch="true" />
 
         </LinearLayout>
     </ScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/common-ui/src/main/res/drawable/background_text_view_container.xml b/common-ui/src/main/res/drawable/background_text_view_container.xml
new file mode 100644
index 000000000000..accb8406b0c9
--- /dev/null
+++ b/common-ui/src/main/res/drawable/background_text_view_container.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2022 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/daxColorContainer" />
+    <corners android:radius="@dimen/smallShapeCornerRadius" />
+</shape>
\ No newline at end of file