Hack week: Update target SDK from 31 to 33

WooCommerce/build.gradle

@@ -66,6 +66,8 @@ repositories {
 }
 
 android {
+    namespace "com.woocommerce.android"
+
     compileSdkVersion gradle.ext.compileSdkVersion
 
     defaultConfig {

WooCommerce/src/debug/AndroidManifest.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.woocommerce.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />

WooCommerce/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.woocommerce.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Mark the camera as optional, as the back camera is missing from some ChromeOS devices -->
     <uses-feature
@@ -14,6 +13,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACTION_OPEN_DOCUMENT" />
     <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:name=".WooCommerce"

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

@@ -107,6 +107,7 @@ object AppPrefs {
         CUSTOM_DOMAINS_SOURCE,
         IS_TAP_TO_PAY_BETA_ENABLED,
         JETPACK_INSTALLATION_FROM_BANNER,
+        NOTIFICATIONS_PERMISSION_BAR,
     }
 
     /**
@@ -864,6 +865,12 @@ object AppPrefs {
 
     fun getJetpackInstallationIsFromBanner() = getBoolean(DeletablePrefKey.JETPACK_INSTALLATION_FROM_BANNER, false)
 
+    fun setWasNotificationsPermissionBarDismissed(source: Boolean) {
+        setBoolean(DeletablePrefKey.NOTIFICATIONS_PERMISSION_BAR, source)
+    }
+
+    fun getWasNotificationsPermissionBarDismissed() = getBoolean(DeletablePrefKey.NOTIFICATIONS_PERMISSION_BAR, false)
+
     private fun getActiveStatsGranularityFilterKey(currentSiteId: Int) =
         PrefKeyString("${DeletablePrefKey.ACTIVE_STATS_GRANULARITY}:$currentSiteId")
 

WooCommerce/src/main/kotlin/com/woocommerce/android/mediapicker/MediaPickerSetupFactory.kt

@@ -1,11 +1,13 @@
 package com.woocommerce.android.mediapicker
 
+import com.woocommerce.android.R
 import org.wordpress.android.mediapicker.api.MediaPickerSetup
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.CAMERA
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.DEVICE
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.SYSTEM_PICKER
 import org.wordpress.android.mediapicker.api.MediaPickerSetup.DataSource.WP_MEDIA_LIBRARY
+import org.wordpress.android.mediapicker.api.MediaPickerSetup.SearchMode.VISIBLE_UNTOGGLED
 import org.wordpress.android.mediapicker.model.MediaTypes
 import org.wordpress.android.mediapicker.source.device.DeviceMediaPickerSetup
 import org.wordpress.android.mediapicker.source.wordpress.MediaLibraryPickerSetup
@@ -20,9 +22,14 @@ class MediaPickerSetupFactory @Inject constructor() : MediaPickerSetup.Factory {
                 mediaTypes = MediaTypes.IMAGES,
                 canMultiSelect = isMultiSelectAllowed
             )
-            DEVICE -> DeviceMediaPickerSetup.buildMediaPicker(
-                mediaTypes = MediaTypes.IMAGES,
-                canMultiSelect = true
+            DEVICE -> MediaPickerSetup(
+                primaryDataSource = DEVICE,
+                isMultiSelectEnabled = isMultiSelectAllowed,
+                areResultsQueued = false,
+                searchMode = VISIBLE_UNTOGGLED,
+                availableDataSources = setOf(SYSTEM_PICKER),
+                allowedTypes = MediaTypes.IMAGES.allowedTypes,
+                title = R.string.photo_picker_title
             )
             SYSTEM_PICKER -> DeviceMediaPickerSetup.buildSystemPicker(
                 mediaTypes = MediaTypes.IMAGES,

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

@@ -2,21 +2,27 @@
 
 package com.woocommerce.android.ui.main
 
+import NotificationsPermissionCard
 import android.animation.ValueAnimator
 import android.app.Activity
 import android.app.ProgressDialog
 import android.content.Intent
 import android.net.Uri
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.os.Bundle
+import android.os.Handler
 import android.text.method.LinkMovementMethod
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.activity.viewModels
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.Toolbar
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -55,6 +61,7 @@ import com.woocommerce.android.ui.appwidgets.WidgetUpdater
 import com.woocommerce.android.ui.base.BaseFragment
 import com.woocommerce.android.ui.base.TopLevelFragment
 import com.woocommerce.android.ui.base.UIMessageResolver
+import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import com.woocommerce.android.ui.feedback.SurveyType
 import com.woocommerce.android.ui.login.LoginActivity
 import com.woocommerce.android.ui.main.BottomNavigationPosition.MORE
@@ -64,6 +71,7 @@ import com.woocommerce.android.ui.main.BottomNavigationPosition.PRODUCTS
 import com.woocommerce.android.ui.main.MainActivityViewModel.BottomBarState
 import com.woocommerce.android.ui.main.MainActivityViewModel.MoreMenuBadgeState.Hidden
 import com.woocommerce.android.ui.main.MainActivityViewModel.MoreMenuBadgeState.UnseenReviews
+import com.woocommerce.android.ui.main.MainActivityViewModel.RequestNotificationsPermission
 import com.woocommerce.android.ui.main.MainActivityViewModel.RestartActivityForAppLink
 import com.woocommerce.android.ui.main.MainActivityViewModel.RestartActivityForNotification
 import com.woocommerce.android.ui.main.MainActivityViewModel.ShortcutOpenOrderCreation
@@ -89,9 +97,9 @@ import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState.Trial
 import com.woocommerce.android.ui.prefs.AppSettingsActivity
 import com.woocommerce.android.ui.products.ProductListFragmentDirections
 import com.woocommerce.android.ui.reviews.ReviewListFragmentDirections
-import com.woocommerce.android.util.WooAnimUtils
 import com.woocommerce.android.util.WooAnimUtils.Duration
 import com.woocommerce.android.util.WooAnimUtils.animateBottomBar
+import com.woocommerce.android.util.WooPermissionUtils
 import com.woocommerce.android.widgets.AppRatingDialog
 import com.woocommerce.android.widgets.DisabledAppBarLayoutBehavior
 import dagger.hilt.android.AndroidEntryPoint
@@ -126,6 +134,8 @@ class MainActivity :
         const val FIELD_OPENED_FROM_WIDGET = "opened-from-push-widget"
         const val FIELD_WIDGET_NAME = "widget-name"
 
+        const val NOTIFICATIONS_PERMISSION_BAR_DISPLAY_DELAY = 2000L
+
         interface BackPressListener {
             fun onRequestAllowBackPress(): Boolean
         }
@@ -224,6 +234,12 @@ class MainActivity :
         }
     }
 
+    private val launcher = this.registerForActivityResult(RequestPermission()) { isGranted: Boolean ->
+        if (isGranted) {
+            viewModel.checkForNotificationsPermission(hasNotificationsPermission = true)
+        }
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         this.menu = menu
         return super.onCreateOptionsMenu(menu)
@@ -312,6 +328,10 @@ class MainActivity :
 
         if (selectedSite.exists()) {
             updateOrderBadge(false)
+
+            if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
+                viewModel.checkForNotificationsPermission(WooPermissionUtils.hasNotificationsPermission(this))
+            }
         }
 
         checkConnection()
@@ -707,26 +727,51 @@ class MainActivity :
                 is RestartActivityForAppLink -> restartActivityForAppLink(event)
                 is ShowFeatureAnnouncement -> navigateToFeatureAnnouncement(event)
                 is ViewUrlInWebView -> navigateToWebView(event)
+                is RequestNotificationsPermission -> requestNotificationsPermission()
                 ViewPayments -> showPayments()
                 ViewTapToPay -> showTapToPaySummary()
                 ShortcutOpenPayments -> shortcutShowPayments()
                 ShortcutOpenOrderCreation -> shortcutOpenOrderCreation()
             }
         }
 
+        observeNotificationsPermissionBarVisibility()
         observeMoreMenuBadgeStateEvent()
         observeTrialStatus()
         observeBottomBarState()
     }
 
+    private fun observeNotificationsPermissionBarVisibility() {
+        viewModel.isNotificationsPermissionCardVisible.observe(this) { isVisible ->
+            if (isVisible) {
+                binding.notificationsPermissionBar.apply {
+                    setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+                    setContent {
+                        WooThemeWithBackground {
+                            NotificationsPermissionCard()
+                        }
+                    }
+                }
+                Handler().postDelayed(
+                    {
+                        animateBottomBar(binding.notificationsPermissionBar, show = true)
+                    },
+                    NOTIFICATIONS_PERMISSION_BAR_DISPLAY_DELAY
+                )
+            } else {
+                animateBottomBar(binding.notificationsPermissionBar, show = false)
+            }
+        }
+    }
+
     private fun observeBottomBarState() {
         viewModel.bottomBarState.observe(this) { bottomBarState ->
             val show = when (bottomBarState) {
                 BottomBarState.Hidden -> false
                 BottomBarState.Visible -> true
             }
 
-            WooAnimUtils.animateBottomBar(binding.bottomNav, show, Duration.MEDIUM)
+            animateBottomBar(binding.bottomNav, show, Duration.MEDIUM)
         }
     }
 
@@ -756,6 +801,12 @@ class MainActivity :
         }
     }
 
+    private fun requestNotificationsPermission() {
+        if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
+            WooPermissionUtils.requestNotificationsPermission(launcher)
+        }
+    }
+
     private fun navigateToFeatureAnnouncement(event: ShowFeatureAnnouncement) {
         val action = NavGraphMainDirections.actionOpenWhatsnewFromMain(event.announcement)
         navController.navigateSafely(action)

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

@@ -1,6 +1,8 @@
 package com.woocommerce.android.ui.main
 
 import android.net.Uri
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import com.woocommerce.android.AppPrefs
@@ -16,6 +18,8 @@ import com.woocommerce.android.push.NotificationChannelType
 import com.woocommerce.android.push.NotificationMessageHandler
 import com.woocommerce.android.push.UnseenReviewsCountHandler
 import com.woocommerce.android.tools.SelectedSite
+import com.woocommerce.android.tools.SiteConnectionType.Jetpack
+import com.woocommerce.android.tools.connectionType
 import com.woocommerce.android.ui.main.MainActivityViewModel.MoreMenuBadgeState.Hidden
 import com.woocommerce.android.ui.main.MainActivityViewModel.MoreMenuBadgeState.UnseenReviews
 import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState
@@ -28,6 +32,7 @@ import com.woocommerce.android.viewmodel.ScopedViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.wordpress.android.fluxc.store.SiteStore
 import javax.inject.Inject
@@ -44,7 +49,7 @@ class MainActivityViewModel @Inject constructor(
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
     private val resolveAppLink: ResolveAppLink,
     unseenReviewsCountHandler: UnseenReviewsCountHandler,
-    private val determineTrialStatusBarState: DetermineTrialStatusBarState,
+    determineTrialStatusBarState: DetermineTrialStatusBarState,
 ) : ScopedViewModel(savedState) {
     init {
         launch {
@@ -61,6 +66,9 @@ class MainActivityViewModel @Inject constructor(
     private val _bottomBarState: MutableStateFlow<BottomBarState> = MutableStateFlow(BottomBarState.Visible)
     val bottomBarState = _bottomBarState.asLiveData()
 
+    private val _isNotificationPermissionCardVisible = MutableStateFlow(false)
+    val isNotificationsPermissionCardVisible = _isNotificationPermissionCardVisible.asLiveData()
+
     val trialStatusBarState = determineTrialStatusBarState(_bottomBarState).asLiveData()
 
     fun handleShortcutAction(action: String?) {
@@ -202,6 +210,14 @@ class MainActivityViewModel @Inject constructor(
         }
     }
 
+    fun checkForNotificationsPermission(hasNotificationsPermission: Boolean) {
+        val shouldShowNotificationsPermissionBar = VERSION.SDK_INT >= VERSION_CODES.TIRAMISU &&
+            !hasNotificationsPermission && !AppPrefs.getWasNotificationsPermissionBarDismissed() &&
+            selectedSite.get().connectionType == Jetpack
+
+        _isNotificationPermissionCardVisible.update { shouldShowNotificationsPermissionBar }
+    }
+
     fun hideBottomNav() {
         _bottomBarState.value = BottomBarState.Hidden
     }
@@ -210,12 +226,22 @@ class MainActivityViewModel @Inject constructor(
         _bottomBarState.value = BottomBarState.Visible
     }
 
+    fun onNotificationsPermissionBarDismissButtonTapped() {
+        AppPrefs.setWasNotificationsPermissionBarDismissed(true)
+        _isNotificationPermissionCardVisible.update { false }
+    }
+
+    fun onNotificationsPermissionBarAllowButtonTapped() {
+        triggerEvent(RequestNotificationsPermission)
+    }
+
     object ViewOrderList : Event()
     object ViewReviewList : Event()
     object ViewMyStoreStats : Event()
     object ViewZendeskTickets : Event()
     object ViewPayments : Event()
     object ViewTapToPay : Event()
+    object RequestNotificationsPermission : Event()
     data class ViewUrlInWebView(val url: String) : Event()
     object ShortcutOpenPayments : Event()
     object ShortcutOpenOrderCreation : Event()