[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! [android] Delete unused media - tbb-commits

5 Sep 2024


      Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
50ad336a by clairehurst at 2024-09-05T15:42:55+00:00
fixup! [android] Delete unused media
- - - - -
3 changed files:
- mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
- mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
- mobile/android/fenix/app/src/test/java/org/mozilla/fenix/share/viewholders/AppViewHolderTest.kt
Changes:
=====================================
mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
=====================================
@@ -359,7 +359,7 @@ val privacyCaption: Caption = mockk(relaxed = true)
private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
-    imageRes = R.drawable.ic_onboarding_welcome,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = "default browser title",
     description = "default browser body",
     primaryButtonLabel = "default browser primary button text",
@@ -368,7 +368,7 @@ private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(
 )
 private val addSearchWidgetPageUiData = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
-    imageRes = R.drawable.ic_onboarding_search_widget,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = "add search widget title",
     description = "add search widget body",
     primaryButtonLabel = "add search widget primary button text",
@@ -377,7 +377,7 @@ private val addSearchWidgetPageUiData = OnboardingPageUiData(
 )
 private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
-    imageRes = R.drawable.ic_onboarding_search_widget,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = "add search widget title",
     description = "add search widget body",
     primaryButtonLabel = "add search widget primary button text",
@@ -386,7 +386,7 @@ private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(
 )
 private val syncPageUiData = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
-    imageRes = R.drawable.ic_onboarding_sync,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = "sync title",
     description = "sync body",
     primaryButtonLabel = "sync primary button text",
@@ -395,7 +395,7 @@ private val syncPageUiData = OnboardingPageUiData(
 )
 private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
-    imageRes = R.drawable.ic_onboarding_sync,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = "sync title",
     description = "sync body",
     primaryButtonLabel = "sync primary button text",
@@ -404,7 +404,7 @@ private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData(
 )
 private val notificationPageUiData = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
-    imageRes = R.drawable.ic_notification_permission,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = "notification title",
     description = "notification body",
     primaryButtonLabel = "notification primary button text",
@@ -414,7 +414,7 @@ private val notificationPageUiData = OnboardingPageUiData(
private val defaultBrowserCardData = OnboardingCardData(
     cardType = OnboardingCardType.DEFAULT_BROWSER,
-    imageRes = R.drawable.ic_onboarding_welcome,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = StringHolder(null, "default browser title"),
     body = StringHolder(null, "default browser body"),
     primaryButtonLabel = StringHolder(null, "default browser primary button text"),
@@ -426,7 +426,7 @@ private val defaultBrowserCardData = OnboardingCardData(
private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(
     cardType = OnboardingCardType.DEFAULT_BROWSER,
-    imageRes = R.drawable.ic_onboarding_welcome,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = StringHolder(null, "default browser title"),
     body = StringHolder(null, "default browser body"),
     primaryButtonLabel = StringHolder(null, "default browser primary button text"),
@@ -438,7 +438,7 @@ private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(
private val addSearchWidgetCardDataNoConditions = OnboardingCardData(
     cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
-    imageRes = R.drawable.ic_onboarding_search_widget,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = StringHolder(null, "add search widget title"),
     body = StringHolder(null, "add search widget body"),
     primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
@@ -450,7 +450,7 @@ private val addSearchWidgetCardDataNoConditions = OnboardingCardData(
private val addSearchWidgetCardData = OnboardingCardData(
     cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
-    imageRes = R.drawable.ic_onboarding_search_widget,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = StringHolder(null, "add search widget title"),
     body = StringHolder(null, "add search widget body"),
     primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
@@ -460,7 +460,7 @@ private val addSearchWidgetCardData = OnboardingCardData(
private val syncCardData = OnboardingCardData(
     cardType = OnboardingCardType.SYNC_SIGN_IN,
-    imageRes = R.drawable.ic_onboarding_sync,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = StringHolder(null, "sync title"),
     body = StringHolder(null, "sync body"),
     primaryButtonLabel = StringHolder(null, "sync primary button text"),
@@ -472,7 +472,7 @@ private val syncCardData = OnboardingCardData(
private val notificationCardData = OnboardingCardData(
     cardType = OnboardingCardType.NOTIFICATION_PERMISSION,
-    imageRes = R.drawable.ic_notification_permission,
+    imageRes = R.drawable.mozac_lib_crash_notification,
     title = StringHolder(null, "notification title"),
     body = StringHolder(null, "notification body"),
     primaryButtonLabel = StringHolder(null, "notification primary button text"),
=====================================
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
=====================================
@@ -13,7 +13,7 @@ class OnboardingMapperTest {
     @Test
     fun `GIVEN a default browser page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
         val expected = OnboardingPageState(
-            imageRes = R.drawable.ic_onboarding_welcome,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "default browser title",
             description = "default browser body with link text",
             primaryButton = Action("default browser primary button text", unitLambda),
@@ -22,7 +22,7 @@ class OnboardingMapperTest {
val onboardingPageUiData = OnboardingPageUiData(
             type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
-            imageRes = R.drawable.ic_onboarding_welcome,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "default browser title",
             description = "default browser body with link text",
             primaryButtonLabel = "default browser primary button text",
@@ -47,7 +47,7 @@ class OnboardingMapperTest {
     @Test
     fun `GIVEN a sync page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
         val expected = OnboardingPageState(
-            imageRes = R.drawable.ic_onboarding_sync,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "sync title",
             description = "sync body",
             primaryButton = Action("sync primary button text", unitLambda),
@@ -56,7 +56,7 @@ class OnboardingMapperTest {
val onboardingPageUiData = OnboardingPageUiData(
             type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
-            imageRes = R.drawable.ic_onboarding_sync,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "sync title",
             description = "sync body",
             primaryButtonLabel = "sync primary button text",
@@ -81,7 +81,7 @@ class OnboardingMapperTest {
     @Test
     fun `GIVEN a notification page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
         val expected = OnboardingPageState(
-            imageRes = R.drawable.ic_notification_permission,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "notification title",
             description = "notification body",
             primaryButton = Action("notification primary button text", unitLambda),
@@ -90,7 +90,7 @@ class OnboardingMapperTest {
val onboardingPageUiData = OnboardingPageUiData(
             type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
-            imageRes = R.drawable.ic_notification_permission,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "notification title",
             description = "notification body",
             primaryButtonLabel = "notification primary button text",
@@ -115,7 +115,7 @@ class OnboardingMapperTest {
     @Test
     fun `GIVEN an add search widget page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
         val expected = OnboardingPageState(
-            imageRes = R.drawable.ic_onboarding_search_widget,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "add search widget title",
             description = "add search widget body with link text",
             primaryButton = Action("add search widget primary button text", unitLambda),
@@ -124,7 +124,7 @@ class OnboardingMapperTest {
val onboardingPageUiData = OnboardingPageUiData(
             type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
-            imageRes = R.drawable.ic_onboarding_search_widget,
+            imageRes = R.drawable.mozac_lib_crash_notification,
             title = "add search widget title",
             description = "add search widget body with link text",
             primaryButtonLabel = "add search widget primary button text",
=====================================
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/share/viewholders/AppViewHolderTest.kt
=====================================
@@ -39,7 +39,7 @@ class AppViewHolderTest {
     fun `bind app share option`() {
         val app = AppShareOption(
             name = "Pocket",
-            icon = getDrawable(testContext, R.drawable.ic_pocket)!!,
+            icon = getDrawable(testContext, R.drawable.mozac_lib_crash_notification)!!,
             packageName = "com.mozilla.pocket",
             activityName = "MainActivity",
         )
@@ -53,7 +53,7 @@ class AppViewHolderTest {
     fun `trigger interactor if application is bound`() {
         val app = AppShareOption(
             name = "Pocket",
-            icon = getDrawable(testContext, R.drawable.ic_pocket)!!,
+            icon = getDrawable(testContext, R.drawable.mozac_lib_crash_notification)!!,
             packageName = "com.mozilla.pocket",
             activityName = "MainActivity",
         )
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50ad336a...
-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50ad336a...
You're receiving this email because of your account on gitlab.torproject.org.





    