Clean up resources v26 and below (#4226)

duckduckgo · Mar 7, 2024 · 9718334 · 9718334
1 parent d9145d3
commit 9718334
Show file tree

Hide file tree

Showing 103 changed files with 14 additions and 479 deletions.
diff --git a/...pn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/report/DeviceShieldFragment.kt b/...pn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/report/DeviceShieldFragment.kt
@@ -125,18 +125,18 @@ class DeviceShieldFragment : DuckDuckGoFragment() {
             renderTrackersBlockedWhenEnabled(viewState.trackersBlocked)
         } else {
             deviceShieldCtaHeaderTextView.setText(R.string.atp_NewTabEnabled)
-            deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_default)
+            deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_default)
         }
     }
 
     private fun renderStateDisabled() {
         deviceShieldCtaHeaderTextView.setText(R.string.atp_NewTabDisabled)
-        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_warning)
+        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_warning)
     }
 
     private fun renderStateRevoked() {
         deviceShieldCtaHeaderTextView.setText(R.string.atp_NewTabRevoked)
-        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_warning)
+        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_warning)
     }
 
     private fun renderTrackersBlockedWhenEnabled(trackerBlocked: PrivacyReportViewModel.PrivacyReportView.TrackersBlocked) {
@@ -185,6 +185,6 @@ class DeviceShieldFragment : DuckDuckGoFragment() {
         }
 
         deviceShieldCtaHeaderTextView.text = HtmlCompat.fromHtml(textToStyle, HtmlCompat.FROM_HTML_MODE_LEGACY)
-        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_default)
+        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_default)
     }
 }
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_amazon.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_amazon.png
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_default.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_default.png
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_facebook.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_facebook.png
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_google.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_google.png
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_warning.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_warning.png
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_amazon.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_amazon.xml
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_facebook.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_facebook.xml
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_google.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_google.xml
diff --git a/...rc/main/res/drawable/ic_apptb_default.xml → ...rc/main/res/drawable/ic_apptp_default.xml b/...rc/main/res/drawable/ic_apptb_default.xml → ...rc/main/res/drawable/ic_apptp_default.xml
diff --git a/...rc/main/res/drawable/ic_apptb_warning.xml → ...rc/main/res/drawable/ic_apptp_warning.xml b/...rc/main/res/drawable/ic_apptb_warning.xml → ...rc/main/res/drawable/ic_apptp_warning.xml
diff --git a/...g-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml b/...g-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
@@ -36,7 +36,7 @@
                     android:layout_width="@dimen/listItemImageContainerSize"
                     android:layout_height="@dimen/listItemImageContainerSize"
                     android:importantForAccessibility="no"
-                    android:src="@drawable/ic_apptb_default"
+                    android:src="@drawable/ic_apptp_default"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml
@@ -37,7 +37,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_apptb_default"
+        android:src="@drawable/ic_apptp_default"
         app:layout_constraintBottom_toTopOf="@+id/deviceShieldCtaSplitter"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"