ADS: Line Items Style update (#4619)

Task/Issue URL: https://app.asana.com/0/276630244458377/1206543781454793/f ### Description Several updates to line items, switch and other screens in the app ### Steps to test this PR https://app.asana.com/0/0/1207502672084300/f ### UI changes https://app.asana.com/0/0/1207502672084300/f
duckduckgo · Jun 18, 2024 · 471d4e2 · 471d4e2
1 parent 6d27e34
commit 471d4e2
Show file tree

Hide file tree

Showing 38 changed files with 489 additions and 536 deletions.
diff --git a/...ava/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt b/...ava/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt
@@ -29,11 +29,10 @@ import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.di.AppCoroutineScope
-import com.duckduckgo.app.global.*
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.InfoPanel
-import com.duckduckgo.common.ui.view.SwitchView
 import com.duckduckgo.common.ui.view.addClickableLink
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.quietlySetIsChecked
@@ -233,7 +232,7 @@ class AppTPCompanyTrackersActivity : DuckDuckGoActivity() {
         menuInflater.inflate(R.menu.menu_company_trackers_activity, menu)
 
         val switchMenuItem = menu.findItem(R.id.deviceShieldSwitch)
-        appEnabledSwitch = switchMenuItem?.actionView as SwitchView
+        appEnabledSwitch = switchMenuItem?.actionView as DaxSwitch
         appEnabledSwitch.setOnCheckedChangeListener(toggleAppSwitchListener)
         return true
     }

diff --git a/...java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt b/...java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt
@@ -35,9 +35,9 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.view.DaxDialogListener
+import com.duckduckgo.common.ui.view.DaxSwitch
 import com.duckduckgo.common.ui.view.InfoPanel.Companion.APPTP_SETTINGS_ANNOTATION
 import com.duckduckgo.common.ui.view.InfoPanel.Companion.REPORT_ISSUES_ANNOTATION
-import com.duckduckgo.common.ui.view.SwitchView
 import com.duckduckgo.common.ui.view.TypewriterDaxDialog
 import com.duckduckgo.common.ui.view.dialog.StackedAlertDialogBuilder
 import com.duckduckgo.common.ui.view.dialog.TextAlertDialogBuilder
@@ -113,7 +113,7 @@ class DeviceShieldTrackerActivity :
 
     private val binding: ActivityDeviceShieldActivityBinding by viewBinding()
 
-    private lateinit var deviceShieldSwitch: SwitchView
+    private lateinit var deviceShieldSwitch: DaxSwitch
 
     // we might get an update before options menu has been populated; temporarily cache value to use when menu populated
     private var vpnCachedState: VpnState? = null
@@ -596,7 +596,7 @@ class DeviceShieldTrackerActivity :
         menuInflater.inflate(R.menu.menu_device_tracker_activity, menu)
 
         val switchMenuItem = menu.findItem(R.id.deviceShieldSwitch)
-        deviceShieldSwitch = switchMenuItem?.actionView as SwitchView
+        deviceShieldSwitch = switchMenuItem?.actionView as DaxSwitch
         deviceShieldSwitch.setOnCheckedChangeListener(enableAppTPSwitchListener)
         return true
     }

diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/menu_item_device_tracker_switch.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/menu_item_device_tracker_switch.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<com.duckduckgo.common.ui.view.SwitchView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.duckduckgo.common.ui.view.DaxSwitch xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/deviceShieldTrackerSwitch"
     android:layout_width="wrap_content"

diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml
@@ -22,7 +22,7 @@
     android:gravity="center"
     android:orientation="horizontal"
     android:background="?attr/selectableItemBackground"
-    android:minHeight="@dimen/twoLineItemWithLargeImageHeight">
+    android:minHeight="@dimen/oneLineItemWithLargeImageHeight">
 
     <ImageView
         android:id="@+id/deviceShieldAppEntryIcon"
@@ -58,7 +58,7 @@
         app:typography="caption"
         tools:text="App issues may occur if enabled" />
 
-    <com.duckduckgo.common.ui.view.SwitchView
+    <com.duckduckgo.common.ui.view.DaxSwitch
         android:id="@+id/deviceShieldAppEntryShieldEnabled"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.541"
         app:layout_constraintVertical_chainStyle="packed"
-        app:typography="h4"
+        app:typography="body1"
         tools:text="Facebook" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkListItem.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarkListItem.kt
diff --git a/app/src/main/res/layout/activity_appearance.xml b/app/src/main/res/layout/activity_appearance.xml
@@ -74,7 +74,7 @@
                     android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:text="@string/changeIconCtaLabel"
-                    app:typography="h4" />
+                    app:typography="body1" />
 
                 <ImageView
                     android:id="@+id/changeAppIcon"