cleaning up lint issues

duckduckgo · Jan 16, 2023 · 7429e8f · 7429e8f
1 parent 8ac0980
commit 7429e8f
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 68 deletions.
diff --git a/app/src/main/res/layout/activity_email_unsupported.xml b/app/src/main/res/layout/activity_email_unsupported.xml
@@ -40,33 +40,26 @@
             android:layout_marginTop="32dp"
             app:srcCompat="@drawable/contact_us" />
 
-        <com.google.android.material.textview.MaterialTextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/statusTitle"
+            app:typography="h2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fontFamily="sans-serif"
-            android:lineSpacingExtra="4sp"
             android:paddingTop="24dp"
             android:text="@string/emailNotSupported"
-            android:textAlignment="center"
-            android:textColor="?attr/settingsItemTextColor"
-            android:textSize="20sp"
-            android:textStyle="bold" />
+            android:textAlignment="center"/>
 
-        <com.google.android.material.textview.MaterialTextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/emailPrivacyDescription"
+            app:typography="body2"
+            app:textType="secondary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="24dp"
-            android:fontFamily="sans-serif"
-            android:lineSpacingExtra="4sp"
             android:paddingTop="8dp"
             android:text="@string/emailNotSupportedExplanation"
-            android:textAlignment="center"
-            android:textColor="?attr/settingsMinorTextColor"
-            android:textSize="14sp"
-            android:textStyle="normal" />
+            android:textAlignment="center"/>
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/content_test.xml b/app/src/main/res/layout/content_test.xml
@@ -29,16 +29,14 @@
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listItem="@layout/view_bookmark_entry" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/emptyBookmarks"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginTop="40dp"
         android:layout_marginEnd="10dp"
         android:text="@string/noBookmarks"
-        android:textAlignment="center"
-        android:textColor="?attr/listItemPrimaryTextColor"
-        android:textSize="16sp" />
+        android:textAlignment="center"/>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/include_add_widget_instruction_buttons.xml b/app/src/main/res/layout/include_add_widget_instruction_buttons.xml
@@ -29,17 +29,17 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toTopOf="@id/homeButton" />
 
-    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
+    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
         android:id="@+id/closeButton"
         app:buttonSize="large"
-
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/keyline_2"
         android:text="@string/addWidgetInstructionsButtonClose"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/homeButton" />
 
-    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
+    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
         android:id="@+id/homeButton"
         app:buttonSize="large"
         android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/include_add_widget_instruction_steps.xml b/app/src/main/res/layout/include_add_widget_instruction_steps.xml
@@ -38,98 +38,83 @@
         app:barrierDirection="end"
         app:constraint_referenced_ids="instruction1,instruction2,instruction3" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/instructionLabel1"
+        app:typography="caption"
         android:layout_width="18dp"
         android:layout_height="18dp"
         android:layout_margin="16dp"
         android:background="@drawable/background_add_widget_number"
-        android:fontFamily="sans-serif-black"
         android:gravity="center"
         android:text="@string/addWidgetInstruction1Label"
-        android:textColor="@color/white"
-        android:textSize="10sp"
-        android:textStyle="normal"
+        android:textColor="?attr/daxColorWhite"
         app:layout_constraintBaseline_toBaselineOf="@id/instruction1"
         app:layout_constraintEnd_toStartOf="@id/instruction1"
         tools:ignore="SmallSp" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/instruction1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:lineSpacingExtra="4sp"
+        app:typography="body2"
         android:paddingBottom="20dp"
         android:text="@string/addWidgetInstruction1"
-        android:textColor="@color/white"
-        android:textSize="14sp"
-        android:textStyle="normal"
+        android:textColor="?attr/daxColorWhite"
         app:layout_constraintEnd_toEndOf="@id/instructionsEndBarrier"
         app:layout_constraintStart_toEndOf="@id/instructionLabel1"
         app:layout_constraintStart_toStartOf="@id/instructionsStartBarrier"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintWidth_max="400dp" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/instructionLabel2"
         android:layout_width="18dp"
         android:layout_height="18dp"
         android:layout_margin="16dp"
+        app:typography="caption"
         android:background="@drawable/background_add_widget_number"
-        android:fontFamily="sans-serif-black"
         android:gravity="center"
         android:text="@string/addWidgetInstruction2Label"
-        android:textColor="@color/white"
-        android:textSize="10sp"
-        android:textStyle="normal"
+        android:textColor="?attr/daxColorWhite"
         app:layout_constraintBaseline_toBaselineOf="@id/instruction2"
         app:layout_constraintEnd_toStartOf="@id/instruction2"
         tools:ignore="SmallSp" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/instruction2"
+        app:typography="body2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:lineSpacingExtra="4sp"
         android:paddingBottom="20dp"
         android:text="@string/addWidgetInstruction2"
-        android:textColor="@color/white"
-        android:textSize="14sp"
-        android:textStyle="normal"
+        android:textColor="?attr/daxColorWhite"
         app:layout_constraintEnd_toEndOf="@id/instructionsEndBarrier"
         app:layout_constraintStart_toStartOf="@id/instructionsStartBarrier"
         app:layout_constraintTop_toBottomOf="@+id/instruction1"
         app:layout_constraintWidth_max="400dp" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/instructionLabel3"
         android:layout_width="18dp"
         android:layout_height="18dp"
         android:layout_margin="16dp"
+        app:typography="caption"
         android:background="@drawable/background_add_widget_number"
-        android:fontFamily="sans-serif-black"
+        android:textColor="?attr/daxColorWhite"
         android:gravity="center"
         android:text="@string/addWidgetInstruction3Label"
-        android:textColor="@color/white"
-        android:textSize="10sp"
-        android:textStyle="normal"
         app:layout_constraintBaseline_toBaselineOf="@id/instruction3"
         app:layout_constraintEnd_toStartOf="@id/instruction3"
         tools:ignore="SmallSp" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/instruction3"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:fontFamily="sans-serif"
-        android:lineSpacingExtra="4sp"
+        app:typography="body2"
         android:paddingBottom="42dp"
         android:text="@string/addWidgetInstruction3"
-        android:textColor="@color/white"
-        android:textSize="14sp"
-        android:textStyle="normal"
+        android:textColor="?attr/daxColorWhite"
         app:layout_constraintEnd_toEndOf="@id/instructionsEndBarrier"
         app:layout_constraintStart_toStartOf="@id/instructionsStartBarrier"
         app:layout_constraintTop_toBottomOf="@+id/instruction2"

diff --git a/app/src/main/res/layout/view_tab_switcher_button.xml b/app/src/main/res/layout/view_tab_switcher_button.xml
@@ -18,9 +18,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="android.widget.RelativeLayout">
 
-    <!-- This TextView doesn't migrate to DaxTextView, special case for the Tabs icon  -->
     <TextView
-            tools:ignore="MergeRootFrame"
+        tools:ignore="DeprecatedWidgetInXml"
         android:id="@+id/tabCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/waitlist_dialog_fragment.xml b/app/src/main/res/layout/waitlist_dialog_fragment.xml
@@ -21,16 +21,12 @@
     android:paddingStart="10dp"
     android:paddingEnd="10dp">
 
-    <com.google.android.material.textview.MaterialTextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/waitlistDialogText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:fontFamily="sans-serif"
-        android:lineSpacingExtra="4sp"
         android:text="@string/waitlistNotificationDialogDescription"
-        android:textSize="16sp"
-        android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

diff --git a/autofill/autofill-impl/src/main/res/layout/item_row_search_no_results.xml b/autofill/autofill-impl/src/main/res/layout/item_row_search_no_results.xml
@@ -14,20 +14,14 @@
   ~ limitations under the License.
   -->
 
-<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
-   tools:ignore="DeprecatedWidgetInXml"
+<com.duckduckgo.mobile.android.ui.view.text.DaxTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/noMatchingLoginsHint"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:fontFamily="sans-serif"
     android:gravity="center"
-    android:lineSpacingExtra="4sp"
     android:paddingStart="16dp"
     android:paddingTop="24dp"
     android:paddingEnd="16dp"
     android:paddingBottom="24dp"
-    android:textColor="?attr/normalTextColor"
-    android:textSize="16sp"
-    android:textStyle="normal"
     tools:text="Lorem ipsum dolor sit amet" />