Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,17 @@ fun JetpackBenefitsScreen(
)
Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_200)))

// Push notifications
BenefitEntry(
icon = R.drawable.ic_alarm_bell_ring,
title = R.string.jetpack_benefits_modal_push_notifications_title,
subtitle = R.string.jetpack_benefits_modal_push_notifications_subtitle,
modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.major_100))
)
if (viewState.isPushNotificationsBenefitVisible) {
// Push notifications
BenefitEntry(
icon = R.drawable.ic_alarm_bell_ring,
title = R.string.jetpack_benefits_modal_push_notifications_title,
subtitle = R.string.jetpack_benefits_modal_push_notifications_subtitle,
modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.major_100))
)

Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_100)))
Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_100)))
}

// Analytics
BenefitEntry(
Expand Down Expand Up @@ -182,6 +184,7 @@ private fun JetpackBenefitsScreenPreview() {
viewState = JetpackBenefitsViewModel.ViewState(
isUsingJetpackCP = false,
isLoadingDialogShown = false,
isPushNotificationsBenefitVisible = true,
)
)
}
Expand All @@ -195,6 +198,7 @@ private fun JetpackBenefitsScreenWithoutNativeInstallPreview() {
viewState = JetpackBenefitsViewModel.ViewState(
isUsingJetpackCP = false,
isLoadingDialogShown = false,
isPushNotificationsBenefitVisible = true,
)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import com.woocommerce.android.tools.SiteConnectionType
import com.woocommerce.android.ui.common.UserEligibilityFetcher
import com.woocommerce.android.ui.jetpack.FetchJetpackStatus
import com.woocommerce.android.ui.jetpack.FetchJetpackStatus.JetpackStatusFetchResponse
import com.woocommerce.android.util.FeatureFlag
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.Exit
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowSnackbar
Expand Down Expand Up @@ -47,6 +48,7 @@ class JetpackBenefitsViewModel @Inject constructor(
ViewState(
isUsingJetpackCP = selectedSite.connectionType == SiteConnectionType.JetpackConnectionPackage,
isLoadingDialogShown = false,
isPushNotificationsBenefitVisible = !FeatureFlag.WOO_PUSH_NOTIFICATIONS_SYSTEM_M2.isEnabled(),
)
)
val viewState = _viewState.asLiveData()
Expand Down Expand Up @@ -184,6 +186,7 @@ class JetpackBenefitsViewModel @Inject constructor(
data class ViewState(
val isUsingJetpackCP: Boolean,
val isLoadingDialogShown: Boolean,
val isPushNotificationsBenefitVisible: Boolean,
)

object StartJetpackActivationForJetpackCP : Event()
Expand Down