Commit 521f3dd0 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

[android] Delete unused media

parent 6949fca5

mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_logo_firefox_24.xml

+8 −11
Changes for mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_logo_firefox_24.xml: 8 added lines, 11 removed lines.
Original line number Diff line number Diff line 
<!-- This Source Code Form is subject to the terms of the Mozilla Public

   - License, v. 2.0. If a copy of the MPL was not distributed with this

   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

<!-- trivialise assets tb#44448 -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:width="16dp"

    android:height="16dp"

    android:viewportWidth="16"

    android:viewportHeight="16">



    <path

        android:fillColor="@color/mozac_ui_icons_fill"

        android:pathData="M21.334 8.852a5.478 5.478 0 0 0-2.008-2.457c0.491 0.92 0.833 1.913 1.014 2.941v0.021c-1.125-2.731-3.051-3.832-4.624-6.228L15.48 2.754a3.38 3.38 0 0 1-0.11-0.201 1.692 1.692 0 0 1-0.154-0.396 0.035 0.035 0 0 0-0.011-0.01 0.033 0.033 0 0 0-0.024 0h-0.007a7.04 7.04 0 0 0-3.443 5.383c0.117-0.007 0.234-0.017 0.352-0.017a5.078 5.078 0 0 1 4.387 2.479 3.543 3.543 0 0 0-2.413-0.566 3.996 3.996 0 0 1 1.971 4.745 4.004 4.004 0 0 1-4.327 2.77 4.55 4.55 0 0 1-1.765-0.443 4.093 4.093 0 0 1-2.359-3.165s0.461-1.667 3.308-1.667a2.386 2.386 0 0 0 1.205-1.071 15.96 15.96 0 0 1-2.426-1.397c-0.363-0.349-0.536-0.516-0.69-0.641a2.947 2.947 0 0 0-0.259-0.19A4.356 4.356 0 0 1 8.688 6a7.386 7.386 0 0 0-2.41 1.802 5.12 5.12 0 0 1-0.345-2.427 1.956 1.956 0 0 0-0.334 0.173A7.23 7.23 0 0 0 4.62 6.359a8.682 8.682 0 0 0-0.934 1.084 8.076 8.076 0 0 0-1.35 2.934c0 0.011-0.095 0.406-0.164 0.893l-0.031 0.227a6.357 6.357 0 0 0-0.06 0.555v0.029c-0.006 0.095-0.014 0.2-0.02 0.322v0.05a9.853 9.853 0 0 0 10.008 9.686 9.926 9.926 0 0 0 9.873-8.048l0.045-0.375a9.634 9.634 0 0 0-0.653-4.864z"

        tools:ignore="VectorPath" />

        android:fillColor="#FF0000"

        android:pathData="M0 0, L0 16, L16 16, L16 0, Z" />

</vector>

mobile/android/fenix/app/onboarding.fml.yaml

+7 −7
Changes for mobile/android/fenix/app/onboarding.fml.yaml: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ features: 
              card-type: terms-of-service

              ordering: 1

              title: onboarding_welcome_to_firefox

              image-res: nova_onboarding_tou

              image-res: ic_autoplay

              primary-button-label: nova_onboarding_continue_button

              extra-data:

                term-of-service-data:
@@ -42,7 +42,7 @@ features: 
              ordering: 10

              title: nova_onboarding_set_to_default_title_2

              body: nova_onboarding_set_to_default_subtitle

              image-res: nova_onboarding_set_to_default

              image-res: ic_autoplay

              primary-button-label: nova_onboarding_set_to_default_button

              secondary-button-label: nova_onboarding_negative_button
@@ -51,7 +51,7 @@ features: 
              ordering: 20

              title: nova_onboarding_add_search_widget_title

              body: nova_onboarding_add_search_widget_subtitle

              image-res: nova_onboarding_widget

              image-res: ic_autoplay

              primary-button-label: nova_onboarding_add_search_widget_button

              secondary-button-label: nova_onboarding_negative_button
@@ -60,7 +60,7 @@ features: 
              ordering: 30

              title: nova_onboarding_sync_title

              body: nova_onboarding_sync_subtitle

              image-res: nova_onboarding_sync

              image-res: ic_autoplay

              primary-button-label: nova_onboarding_sync_button

              secondary-button-label: nova_onboarding_negative_button
@@ -69,7 +69,7 @@ features: 
              ordering: 40

              title: nova_onboarding_notifications_title

              body: nova_onboarding_notifications_subtitle

              image-res: nova_onboarding_notifications

              image-res: ic_autoplay

              primary-button-label: nova_onboarding_notifications_button

              secondary-button-label: nova_onboarding_negative_button
@@ -89,7 +89,7 @@ features: 
              card-type: marketing-data

              ordering: 60

              title: nova_onboarding_marketing_title

              image-res: nova_onboarding_marketing

              image-res: ic_autoplay

              primary-button-label: nova_onboarding_continue_button

              secondary-button-label: nova_onboarding_marketing_secondary_button_text

              extra-data:
@@ -150,7 +150,7 @@ objects: 
        type: Image

        description: The resource id of the image to be displayed.

        # This should never be defaulted.

        default: ic_onboarding_welcome

        default: ic_autoplay

      ordering:

        type: Int

        description: Used to sequence the cards.

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt

+12 −11
Changes for mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt: 12 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ package org.mozilla.fenix.onboarding.view 


import io.mockk.every

import io.mockk.mockk

import mozilla.components.lib.crash.R as crashR

import mozilla.components.service.nimbus.evalJexlSafe

import org.junit.Assert.assertEquals

import org.junit.Before
@@ -156,7 +157,7 @@ class OnboardingMapperTest { 


    @Test

    fun termsOfServiceData_toPageUiData_returnsConvertedPage() {

        val imageRes = R.drawable.ic_firefox

        val imageRes = crashR.drawable.mozac_lib_crash_notification

        val title = "Terms of service card title"

        val description = "Terms of service card body"

        val primaryButtonLabel = "onboarding card primary button text"
@@ -429,7 +430,7 @@ class OnboardingMapperTest { 


private val defaultBrowserPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.DEFAULT_BROWSER,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "default browser title",

    description = "default browser body",

    primaryButtonLabel = "default browser primary button text",
@@ -437,7 +438,7 @@ private val defaultBrowserPageUiData = OnboardingPageUiData( 
)

private val addSearchWidgetPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "add search widget title",

    description = "add search widget body",

    primaryButtonLabel = "add search widget primary button text",
@@ -445,7 +446,7 @@ private val addSearchWidgetPageUiData = OnboardingPageUiData( 
)

private val syncPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.SYNC_SIGN_IN,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "sync title",

    description = "sync body",

    primaryButtonLabel = "sync primary button text",
@@ -468,7 +469,7 @@ private val toolbarPageUiData = OnboardingPageUiData( 
)

private val notificationPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "notification title",

    description = "notification body",

    primaryButtonLabel = "notification primary button text",
@@ -477,7 +478,7 @@ private val notificationPageUiData = OnboardingPageUiData( 


private val defaultBrowserCardData = OnboardingCardData(

    cardType = OnboardingCardType.DEFAULT_BROWSER,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.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"),
@@ -489,7 +490,7 @@ private val defaultBrowserCardData = OnboardingCardData( 


private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(

    cardType = OnboardingCardType.DEFAULT_BROWSER,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.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"),
@@ -501,7 +502,7 @@ private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData( 


private val addSearchWidgetCardDataNoConditions = OnboardingCardData(

    cardType = OnboardingCardType.ADD_SEARCH_WIDGET,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.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"),
@@ -513,7 +514,7 @@ private val addSearchWidgetCardDataNoConditions = OnboardingCardData( 


private val addSearchWidgetCardData = OnboardingCardData(

    cardType = OnboardingCardType.ADD_SEARCH_WIDGET,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.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"),
@@ -523,7 +524,7 @@ private val addSearchWidgetCardData = OnboardingCardData( 


private val syncCardData = OnboardingCardData(

    cardType = OnboardingCardType.SYNC_SIGN_IN,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = StringHolder(null, "sync title"),

    body = StringHolder(null, "sync body"),

    primaryButtonLabel = StringHolder(null, "sync primary button text"),
@@ -535,7 +536,7 @@ private val syncCardData = OnboardingCardData( 


private val notificationCardData = OnboardingCardData(

    cardType = OnboardingCardType.NOTIFICATION_PERMISSION,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.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/debug/ic_launcher-web.webp

deleted100644 → 0
−50.5 KiB
Loading image diff...

mobile/android/fenix/app/src/debug/res/drawable/ic_firefox.xml

+9 −123

File changed.

Preview size limit exceeded, changes collapsed.