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
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:
| ... | ... | @@ -359,7 +359,7 @@ val privacyCaption: Caption = mockk(relaxed = true) |
| 359 | 359 | |
| 360 | 360 | private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(
|
| 361 | 361 | type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
|
| 362 | - imageRes = R.drawable.ic_onboarding_welcome,
|
|
| 362 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 363 | 363 | title = "default browser title",
|
| 364 | 364 | description = "default browser body",
|
| 365 | 365 | primaryButtonLabel = "default browser primary button text",
|
| ... | ... | @@ -368,7 +368,7 @@ private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData( |
| 368 | 368 | )
|
| 369 | 369 | private val addSearchWidgetPageUiData = OnboardingPageUiData(
|
| 370 | 370 | type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
|
| 371 | - imageRes = R.drawable.ic_onboarding_search_widget,
|
|
| 371 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 372 | 372 | title = "add search widget title",
|
| 373 | 373 | description = "add search widget body",
|
| 374 | 374 | primaryButtonLabel = "add search widget primary button text",
|
| ... | ... | @@ -377,7 +377,7 @@ private val addSearchWidgetPageUiData = OnboardingPageUiData( |
| 377 | 377 | )
|
| 378 | 378 | private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(
|
| 379 | 379 | type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
|
| 380 | - imageRes = R.drawable.ic_onboarding_search_widget,
|
|
| 380 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 381 | 381 | title = "add search widget title",
|
| 382 | 382 | description = "add search widget body",
|
| 383 | 383 | primaryButtonLabel = "add search widget primary button text",
|
| ... | ... | @@ -386,7 +386,7 @@ private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData( |
| 386 | 386 | )
|
| 387 | 387 | private val syncPageUiData = OnboardingPageUiData(
|
| 388 | 388 | type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
|
| 389 | - imageRes = R.drawable.ic_onboarding_sync,
|
|
| 389 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 390 | 390 | title = "sync title",
|
| 391 | 391 | description = "sync body",
|
| 392 | 392 | primaryButtonLabel = "sync primary button text",
|
| ... | ... | @@ -395,7 +395,7 @@ private val syncPageUiData = OnboardingPageUiData( |
| 395 | 395 | )
|
| 396 | 396 | private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData(
|
| 397 | 397 | type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
|
| 398 | - imageRes = R.drawable.ic_onboarding_sync,
|
|
| 398 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 399 | 399 | title = "sync title",
|
| 400 | 400 | description = "sync body",
|
| 401 | 401 | primaryButtonLabel = "sync primary button text",
|
| ... | ... | @@ -404,7 +404,7 @@ private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData( |
| 404 | 404 | )
|
| 405 | 405 | private val notificationPageUiData = OnboardingPageUiData(
|
| 406 | 406 | type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
|
| 407 | - imageRes = R.drawable.ic_notification_permission,
|
|
| 407 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 408 | 408 | title = "notification title",
|
| 409 | 409 | description = "notification body",
|
| 410 | 410 | primaryButtonLabel = "notification primary button text",
|
| ... | ... | @@ -414,7 +414,7 @@ private val notificationPageUiData = OnboardingPageUiData( |
| 414 | 414 | |
| 415 | 415 | private val defaultBrowserCardData = OnboardingCardData(
|
| 416 | 416 | cardType = OnboardingCardType.DEFAULT_BROWSER,
|
| 417 | - imageRes = R.drawable.ic_onboarding_welcome,
|
|
| 417 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 418 | 418 | title = StringHolder(null, "default browser title"),
|
| 419 | 419 | body = StringHolder(null, "default browser body"),
|
| 420 | 420 | primaryButtonLabel = StringHolder(null, "default browser primary button text"),
|
| ... | ... | @@ -426,7 +426,7 @@ private val defaultBrowserCardData = OnboardingCardData( |
| 426 | 426 | |
| 427 | 427 | private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(
|
| 428 | 428 | cardType = OnboardingCardType.DEFAULT_BROWSER,
|
| 429 | - imageRes = R.drawable.ic_onboarding_welcome,
|
|
| 429 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 430 | 430 | title = StringHolder(null, "default browser title"),
|
| 431 | 431 | body = StringHolder(null, "default browser body"),
|
| 432 | 432 | primaryButtonLabel = StringHolder(null, "default browser primary button text"),
|
| ... | ... | @@ -438,7 +438,7 @@ private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData( |
| 438 | 438 | |
| 439 | 439 | private val addSearchWidgetCardDataNoConditions = OnboardingCardData(
|
| 440 | 440 | cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
|
| 441 | - imageRes = R.drawable.ic_onboarding_search_widget,
|
|
| 441 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 442 | 442 | title = StringHolder(null, "add search widget title"),
|
| 443 | 443 | body = StringHolder(null, "add search widget body"),
|
| 444 | 444 | primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
|
| ... | ... | @@ -450,7 +450,7 @@ private val addSearchWidgetCardDataNoConditions = OnboardingCardData( |
| 450 | 450 | |
| 451 | 451 | private val addSearchWidgetCardData = OnboardingCardData(
|
| 452 | 452 | cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
|
| 453 | - imageRes = R.drawable.ic_onboarding_search_widget,
|
|
| 453 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 454 | 454 | title = StringHolder(null, "add search widget title"),
|
| 455 | 455 | body = StringHolder(null, "add search widget body"),
|
| 456 | 456 | primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
|
| ... | ... | @@ -460,7 +460,7 @@ private val addSearchWidgetCardData = OnboardingCardData( |
| 460 | 460 | |
| 461 | 461 | private val syncCardData = OnboardingCardData(
|
| 462 | 462 | cardType = OnboardingCardType.SYNC_SIGN_IN,
|
| 463 | - imageRes = R.drawable.ic_onboarding_sync,
|
|
| 463 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 464 | 464 | title = StringHolder(null, "sync title"),
|
| 465 | 465 | body = StringHolder(null, "sync body"),
|
| 466 | 466 | primaryButtonLabel = StringHolder(null, "sync primary button text"),
|
| ... | ... | @@ -472,7 +472,7 @@ private val syncCardData = OnboardingCardData( |
| 472 | 472 | |
| 473 | 473 | private val notificationCardData = OnboardingCardData(
|
| 474 | 474 | cardType = OnboardingCardType.NOTIFICATION_PERMISSION,
|
| 475 | - imageRes = R.drawable.ic_notification_permission,
|
|
| 475 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 476 | 476 | title = StringHolder(null, "notification title"),
|
| 477 | 477 | body = StringHolder(null, "notification body"),
|
| 478 | 478 | primaryButtonLabel = StringHolder(null, "notification primary button text"),
|
| ... | ... | @@ -13,7 +13,7 @@ class OnboardingMapperTest { |
| 13 | 13 | @Test
|
| 14 | 14 | fun `GIVEN a default browser page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
|
| 15 | 15 | val expected = OnboardingPageState(
|
| 16 | - imageRes = R.drawable.ic_onboarding_welcome,
|
|
| 16 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 17 | 17 | title = "default browser title",
|
| 18 | 18 | description = "default browser body with link text",
|
| 19 | 19 | primaryButton = Action("default browser primary button text", unitLambda),
|
| ... | ... | @@ -22,7 +22,7 @@ class OnboardingMapperTest { |
| 22 | 22 | |
| 23 | 23 | val onboardingPageUiData = OnboardingPageUiData(
|
| 24 | 24 | type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
|
| 25 | - imageRes = R.drawable.ic_onboarding_welcome,
|
|
| 25 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 26 | 26 | title = "default browser title",
|
| 27 | 27 | description = "default browser body with link text",
|
| 28 | 28 | primaryButtonLabel = "default browser primary button text",
|
| ... | ... | @@ -47,7 +47,7 @@ class OnboardingMapperTest { |
| 47 | 47 | @Test
|
| 48 | 48 | fun `GIVEN a sync page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
|
| 49 | 49 | val expected = OnboardingPageState(
|
| 50 | - imageRes = R.drawable.ic_onboarding_sync,
|
|
| 50 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 51 | 51 | title = "sync title",
|
| 52 | 52 | description = "sync body",
|
| 53 | 53 | primaryButton = Action("sync primary button text", unitLambda),
|
| ... | ... | @@ -56,7 +56,7 @@ class OnboardingMapperTest { |
| 56 | 56 | |
| 57 | 57 | val onboardingPageUiData = OnboardingPageUiData(
|
| 58 | 58 | type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
|
| 59 | - imageRes = R.drawable.ic_onboarding_sync,
|
|
| 59 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 60 | 60 | title = "sync title",
|
| 61 | 61 | description = "sync body",
|
| 62 | 62 | primaryButtonLabel = "sync primary button text",
|
| ... | ... | @@ -81,7 +81,7 @@ class OnboardingMapperTest { |
| 81 | 81 | @Test
|
| 82 | 82 | fun `GIVEN a notification page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
|
| 83 | 83 | val expected = OnboardingPageState(
|
| 84 | - imageRes = R.drawable.ic_notification_permission,
|
|
| 84 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 85 | 85 | title = "notification title",
|
| 86 | 86 | description = "notification body",
|
| 87 | 87 | primaryButton = Action("notification primary button text", unitLambda),
|
| ... | ... | @@ -90,7 +90,7 @@ class OnboardingMapperTest { |
| 90 | 90 | |
| 91 | 91 | val onboardingPageUiData = OnboardingPageUiData(
|
| 92 | 92 | type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
|
| 93 | - imageRes = R.drawable.ic_notification_permission,
|
|
| 93 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 94 | 94 | title = "notification title",
|
| 95 | 95 | description = "notification body",
|
| 96 | 96 | primaryButtonLabel = "notification primary button text",
|
| ... | ... | @@ -115,7 +115,7 @@ class OnboardingMapperTest { |
| 115 | 115 | @Test
|
| 116 | 116 | fun `GIVEN an add search widget page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {
|
| 117 | 117 | val expected = OnboardingPageState(
|
| 118 | - imageRes = R.drawable.ic_onboarding_search_widget,
|
|
| 118 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 119 | 119 | title = "add search widget title",
|
| 120 | 120 | description = "add search widget body with link text",
|
| 121 | 121 | primaryButton = Action("add search widget primary button text", unitLambda),
|
| ... | ... | @@ -124,7 +124,7 @@ class OnboardingMapperTest { |
| 124 | 124 | |
| 125 | 125 | val onboardingPageUiData = OnboardingPageUiData(
|
| 126 | 126 | type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
|
| 127 | - imageRes = R.drawable.ic_onboarding_search_widget,
|
|
| 127 | + imageRes = R.drawable.mozac_lib_crash_notification,
|
|
| 128 | 128 | title = "add search widget title",
|
| 129 | 129 | description = "add search widget body with link text",
|
| 130 | 130 | primaryButtonLabel = "add search widget primary button text",
|
| ... | ... | @@ -39,7 +39,7 @@ class AppViewHolderTest { |
| 39 | 39 | fun `bind app share option`() {
|
| 40 | 40 | val app = AppShareOption(
|
| 41 | 41 | name = "Pocket",
|
| 42 | - icon = getDrawable(testContext, R.drawable.ic_pocket)!!,
|
|
| 42 | + icon = getDrawable(testContext, R.drawable.mozac_lib_crash_notification)!!,
|
|
| 43 | 43 | packageName = "com.mozilla.pocket",
|
| 44 | 44 | activityName = "MainActivity",
|
| 45 | 45 | )
|
| ... | ... | @@ -53,7 +53,7 @@ class AppViewHolderTest { |
| 53 | 53 | fun `trigger interactor if application is bound`() {
|
| 54 | 54 | val app = AppShareOption(
|
| 55 | 55 | name = "Pocket",
|
| 56 | - icon = getDrawable(testContext, R.drawable.ic_pocket)!!,
|
|
| 56 | + icon = getDrawable(testContext, R.drawable.mozac_lib_crash_notification)!!,
|
|
| 57 | 57 | packageName = "com.mozilla.pocket",
|
| 58 | 58 | activityName = "MainActivity",
|
| 59 | 59 | )
|