diff --git a/app/onboarding.fml.yaml b/app/onboarding.fml.yaml index 1922b43ce3..4382e17dc3 100644 --- a/app/onboarding.fml.yaml +++ b/app/onboarding.fml.yaml @@ -25,6 +25,7 @@ features: add-search-widget: card-type: add-search-widget + enabled: false title: juno_onboarding_add_search_widget_title body: juno_onboarding_add_search_widget_description image-res: ic_onboarding_search_widget @@ -68,6 +69,10 @@ objects: description: The type of the card. # This should never be defaulted. default: default-browser + enabled: + type: Boolean + description: If true, this card is shown to the user. + default: true title: type: Text description: The title text displayed to the user. diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingMapper.kt b/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingMapper.kt index b57d489d96..8d8a5e4a60 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingMapper.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingMapper.kt @@ -14,18 +14,18 @@ import org.mozilla.fenix.settings.SupportUtils */ internal fun Collection.toPageUiData( showNotificationPage: Boolean, - canShowAddWidgetPage: Boolean, + showAddWidgetPage: Boolean, ): List = filter { when (it.cardType) { OnboardingCardType.NOTIFICATION_PERMISSION -> { - showNotificationPage + it.enabled && showNotificationPage } OnboardingCardType.ADD_SEARCH_WIDGET -> { - canShowAddWidgetPage + it.enabled && showAddWidgetPage } else -> { - true + it.enabled } } }.sortedBy { it.ordering } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 12d94fe152..5eed33b3d9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -330,13 +330,13 @@ Turn on notifications Not now - Try the Firefox search widget - With Firefox on your home screen, you’ll have easy access to the privacy-first browser that blocks cross-site trackers. - Add Firefox widget