Merge pull request #9001 from woocommerce/feature/new_privacy_screen

[Feature] New privacy screen

Author: Ecarrion

RELEASE-NOTES.txt

@@ -5,6 +5,8 @@
 - [*] [Internal] Fixed a crash related to a product image viewing [https://github.com/woocommerce/woocommerce-android/pull/9111]
 - [*] [Internal] Fixes crashes in order details list when activity gets destroyed and recreated [https://github.com/woocommerce/woocommerce-android/pull/9113]
 - [***] In-Person Payments: A merchant can now scan to add product during order creation. [https://github.com/woocommerce/woocommerce-android/pull/9125]
+- [*] Allow EU merchants to have better control of their privacy choices. A privacy choices banner will be shown the next time they open the app.
+[https://github.com/woocommerce/woocommerce-android/pull/9001]
 
 13.7
 -----

WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefsWrapper.kt

@@ -335,4 +335,10 @@ class AppPrefsWrapper @Inject constructor() {
     fun getStorePhoneNumber(siteId: Int): String = AppPrefs.getStorePhoneNumber(siteId)
 
     var savedPrivacyBannerSettings by AppPrefs::savedPrivacySettings
+
+    fun isCrashReportingEnabled(): Boolean = AppPrefs.isCrashReportingEnabled()
+
+    fun setCrashReportingEnabled(enabled: Boolean) {
+        AppPrefs.setCrashReportingEnabled(enabled)
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/AppUrls.kt

@@ -15,6 +15,8 @@ object AppUrls {
 
     const val WOOCOMMERCE_UPGRADE = "https://docs.woocommerce.com/document/how-to-update-woocommerce/"
     const val WOOCOMMERCE_PLUGIN = "https://wordpress.org/plugins/woocommerce/"
+    const val WOOCOMMERCE_WEB_OPTIONS = "https://woocommerce.com/tracking-and-opt-outs/"
+    const val WOOCOMMERCE_USAGE_TRACKER = "https://woocommerce.com/usage-tracking/"
 
     const val URL_LEARN_MORE_REVIEWS = "https://woocommerce.com/posts/reviews-woocommerce-best-practices/"
     const val URL_LEARN_MORE_ORDERS = "https://woocommerce.com/blog/"

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

@@ -423,11 +423,9 @@ enum class AnalyticsEvent(val siteless: Boolean = false) {
     SETTINGS_WE_ARE_HIRING_BUTTON_TAPPED,
     SETTINGS_IMAGE_OPTIMIZATION_TOGGLED,
     SETTINGS_CARD_PRESENT_SELECT_PAYMENT_GATEWAY_TAPPED,
-    PRIVACY_SETTINGS_COLLECT_INFO_TOGGLED,
     PRIVACY_SETTINGS_PRIVACY_POLICY_LINK_TAPPED,
     PRIVACY_SETTINGS_SHARE_INFO_LINK_TAPPED,
     PRIVACY_SETTINGS_THIRD_PARTY_TRACKING_INFO_LINK_TAPPED,
-    PRIVACY_SETTINGS_CRASH_REPORTING_TOGGLED,
     SETTINGS_DOMAINS_TAPPED,
 
     // -- Payments Hub
@@ -844,5 +842,10 @@ enum class AnalyticsEvent(val siteless: Boolean = false) {
     // EU Shipping Notice
     EU_SHIPPING_NOTICE_SHOWN,
     EU_SHIPPING_NOTICE_DISMISSED,
-    EU_SHIPPING_NOTICE_LEARN_MORE_TAPPED
+    EU_SHIPPING_NOTICE_LEARN_MORE_TAPPED,
+
+    // Privacy Banner
+    PRIVACY_CHOICES_BANNER_PRESENTED,
+    PRIVACY_CHOICES_BANNER_SETTINGS_BUTTON_TAPPED,
+    PRIVACY_CHOICES_BANNER_SAVE_BUTTON_TAPPED
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTrackerWrapper.kt

@@ -1,11 +1,35 @@
 package com.woocommerce.android.analytics
 
+import android.content.SharedPreferences
+import com.woocommerce.android.AppPrefs
+import com.woocommerce.android.analytics.AnalyticsTracker.Companion.PREFKEY_SEND_USAGE_STATS
 import dagger.Reusable
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.onStart
 import javax.inject.Inject
 
 @Reusable
-class AnalyticsTrackerWrapper @Inject constructor() {
-    var sendUsageStats: Boolean by AnalyticsTracker.Companion::sendUsageStats
+open class AnalyticsTrackerWrapper @Inject constructor() {
+    open var sendUsageStats: Boolean by AnalyticsTracker.Companion::sendUsageStats
+
+    open fun observeSendUsageStats(): Flow<Boolean> {
+        return callbackFlow {
+            val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+                if (key == PREFKEY_SEND_USAGE_STATS) {
+                    trySend(sendUsageStats)
+                }
+            }
+            AppPrefs.getPreferences().registerOnSharedPreferenceChangeListener(listener)
+
+            awaitClose {
+                AppPrefs.getPreferences().unregisterOnSharedPreferenceChangeListener(listener)
+            }
+        }.onStart {
+            emit(sendUsageStats)
+        }
+    }
 
     fun track(stat: AnalyticsEvent, properties: Map<String, *> = emptyMap<String, Any>()) {
         AnalyticsTracker.track(stat, properties)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/icons/OpenInNew.kt

@@ -0,0 +1,46 @@
+@file:Suppress("MagicNumber")
+package com.woocommerce.android.ui.icons
+
+import androidx.compose.material.icons.materialIcon
+import androidx.compose.material.icons.materialPath
+import androidx.compose.ui.graphics.vector.ImageVector
+
+val OpenInNew: ImageVector
+    get() {
+        if (_openInNew != null) {
+            return _openInNew!!
+        }
+        _openInNew = materialIcon(name = "Filled.OpenInNew") {
+            materialPath {
+                moveTo(19.0f, 19.0f)
+                horizontalLineTo(5.0f)
+                verticalLineTo(5.0f)
+                horizontalLineToRelative(7.0f)
+                verticalLineTo(3.0f)
+                horizontalLineTo(5.0f)
+                curveToRelative(-1.11f, 0.0f, -2.0f, 0.9f, -2.0f, 2.0f)
+                verticalLineToRelative(14.0f)
+                curveToRelative(0.0f, 1.1f, 0.89f, 2.0f, 2.0f, 2.0f)
+                horizontalLineToRelative(14.0f)
+                curveToRelative(1.1f, 0.0f, 2.0f, -0.9f, 2.0f, -2.0f)
+                verticalLineToRelative(-7.0f)
+                horizontalLineToRelative(-2.0f)
+                verticalLineToRelative(7.0f)
+                close()
+                moveTo(14.0f, 3.0f)
+                verticalLineToRelative(2.0f)
+                horizontalLineToRelative(3.59f)
+                lineToRelative(-9.83f, 9.83f)
+                lineToRelative(1.41f, 1.41f)
+                lineTo(19.0f, 6.41f)
+                verticalLineTo(10.0f)
+                horizontalLineToRelative(2.0f)
+                verticalLineTo(3.0f)
+                horizontalLineToRelative(-7.0f)
+                close()
+            }
+        }
+        return _openInNew!!
+    }
+
+private var _openInNew: ImageVector? = null

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt

@@ -12,6 +12,7 @@ import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.os.Handler
+import android.os.Parcelable
 import android.text.method.LinkMovementMethod
 import android.view.Menu
 import android.view.MenuItem
@@ -99,6 +100,7 @@ import com.woocommerce.android.ui.plans.di.StartUpgradeFlowFactory
 import com.woocommerce.android.ui.plans.di.TrialStatusBarFormatterFactory
 import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState.TrialStatusBarState
 import com.woocommerce.android.ui.prefs.AppSettingsActivity
+import com.woocommerce.android.ui.prefs.RequestedAnalyticsValue
 import com.woocommerce.android.ui.products.ProductListFragmentDirections
 import com.woocommerce.android.ui.reviews.ReviewListFragmentDirections
 import com.woocommerce.android.ui.sitepicker.SitePickerFragmentDirections
@@ -600,6 +602,17 @@ class MainActivity :
         startActivityForResult(intent, RequestCodes.SETTINGS)
     }
 
+    private fun showPrivacySettingsScreen(requestedAnalyticsValue: Parcelable) {
+        val intent = Intent(this, AppSettingsActivity::class.java).apply {
+            putExtra(AppSettingsActivity.EXTRA_SHOW_PRIVACY_SETTINGS, true)
+            putExtra(
+                AppSettingsActivity.EXTRA_REQUESTED_ANALYTICS_VALUE_FROM_ERROR,
+                requestedAnalyticsValue
+            )
+        }
+        startActivityForResult(intent, RequestCodes.SETTINGS)
+    }
+
     override fun showAnalytics(targetPeriod: StatsTimeRangeSelection.SelectionType) {
         val action = MyStoreFragmentDirections.actionMyStoreToAnalytics(targetPeriod)
         navController.navigateSafely(action)
@@ -756,6 +769,12 @@ class MainActivity :
                         viewModel.onRequestPrivacyUpdate(event.analyticsEnabled)
                     }.show()
                 }
+                MainActivityViewModel.ShowPrivacySettings -> {
+                    showPrivacySettingsScreen(RequestedAnalyticsValue.NONE)
+                }
+                is MainActivityViewModel.ShowPrivacySettingsWithError -> {
+                    showPrivacySettingsScreen(event.requestedAnalyticsValue)
+                }
             }
         }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityViewModel.kt

@@ -30,6 +30,7 @@ import com.woocommerce.android.ui.moremenu.MoreMenuNewFeature
 import com.woocommerce.android.ui.moremenu.MoreMenuNewFeatureHandler
 import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState
 import com.woocommerce.android.ui.prefs.PrivacySettingsRepository
+import com.woocommerce.android.ui.prefs.RequestedAnalyticsValue
 import com.woocommerce.android.ui.whatsnew.FeatureAnnouncementRepository
 import com.woocommerce.android.util.BuildConfigWrapper
 import com.woocommerce.android.util.WooLog
@@ -283,6 +284,14 @@ class MainActivityViewModel @Inject constructor(
         }
     }
 
+    fun onPrivacySettingsTapped() {
+        triggerEvent(ShowPrivacySettings)
+    }
+
+    fun onSettingsPrivacyPreferenceUpdateFailed(requestedAnalyticsPreference: RequestedAnalyticsValue) {
+        triggerEvent(ShowPrivacySettingsWithError(requestedAnalyticsPreference))
+    }
+
     object ViewOrderList : Event()
     object ViewReviewList : Event()
     object ViewMyStoreStats : Event()
@@ -301,6 +310,8 @@ class MainActivityViewModel @Inject constructor(
     data class ViewReviewDetail(val uniqueId: Long) : Event()
     data class ViewOrderDetail(val uniqueId: Long, val remoteNoteId: Long) : Event()
     data class ShowPrivacyPreferenceUpdatedFailed(val analyticsEnabled: Boolean) : Event()
+    object ShowPrivacySettings : Event()
+    data class ShowPrivacySettingsWithError(val requestedAnalyticsValue: RequestedAnalyticsValue) : Event()
 
     sealed class MoreMenuBadgeState {
         data class UnseenReviews(val count: Int) : MoreMenuBadgeState()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt

@@ -27,6 +27,7 @@ import com.woocommerce.android.ui.main.AppBarStatus
 import com.woocommerce.android.ui.main.MainActivity
 import com.woocommerce.android.ui.prefs.MainSettingsFragment.AppSettingsListener
 import com.woocommerce.android.util.AnalyticsUtils
+import com.woocommerce.android.util.parcelable
 import dagger.android.DispatchingAndroidInjector
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -37,6 +38,8 @@ class AppSettingsActivity :
     AppSettingsListener,
     AppSettingsContract.View {
     companion object {
+        const val EXTRA_SHOW_PRIVACY_SETTINGS = "extra_show_privacy_settings"
+        const val EXTRA_REQUESTED_ANALYTICS_VALUE_FROM_ERROR = "extra_requested_analytics_value_from_error"
         const val RESULT_CODE_BETA_OPTIONS_CHANGED = 2
         const val KEY_BETA_OPTION_CHANGED = "key_beta_option_changed"
     }
@@ -75,6 +78,19 @@ class AppSettingsActivity :
         if (isBetaOptionChanged) {
             setResult(RESULT_CODE_BETA_OPTIONS_CHANGED)
         }
+
+        if (intent.getBooleanExtra(EXTRA_SHOW_PRIVACY_SETTINGS, false)) {
+
+            val requestedAnalyticsValue =
+                intent.parcelable(EXTRA_REQUESTED_ANALYTICS_VALUE_FROM_ERROR)
+                    ?: RequestedAnalyticsValue.NONE
+
+            navHostFragment.navController.navigate(
+                MainSettingsFragmentDirections.actionMainSettingsFragmentToPrivacySettingsFragment(
+                    requestedAnalyticsValue
+                )
+            )
+        }
     }
 
     private val fragmentLifecycleObserver: FragmentLifecycleCallbacks = object : FragmentLifecycleCallbacks() {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/MainSettingsFragment.kt

@@ -184,7 +184,11 @@ class MainSettingsFragment : Fragment(R.layout.fragment_settings_main), MainSett
 
         binding.optionPrivacy.setOnClickListener {
             AnalyticsTracker.track(SETTINGS_PRIVACY_SETTINGS_BUTTON_TAPPED)
-            findNavController().navigateSafely(R.id.action_mainSettingsFragment_to_privacySettingsFragment)
+            findNavController().navigateSafely(
+                MainSettingsFragmentDirections.actionMainSettingsFragmentToPrivacySettingsFragment(
+                    RequestedAnalyticsValue.NONE
+                )
+            )
         }
 
         binding.optionSendFeedback.setOnClickListener {