Photo picker

WooCommerce/build.gradle

@@ -280,7 +280,9 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     kapt "com.github.bumptech.glide:compiler:$glideVersion"
     implementation "com.github.bumptech.glide:volley-integration:$glideVersion@aar"
-    implementation "com.google.android.play:core:$googlePlayCoreVersion"
+
+    implementation "com.google.android.play:app-update-ktx:$googlePlayVersion"
+    implementation "com.google.android.play:review-ktx:$googlePlayVersion"
 
     implementation 'com.google.android.gms:play-services-code-scanner:16.0.0-beta3'
 
@@ -359,14 +361,9 @@ dependencies {
 
     implementation "com.tinder.statemachine:statemachine:$stateMachineVersion"
 
-    implementation("${gradle.ext.mediaPickerBinaryPath}:$mediapickerVersion") {
-        exclude group: "org.wordpress", module: "utils"
-    }
-    implementation("${gradle.ext.mediaPickerSourceDeviceBinaryPath}:$mediapickerVersion")
-    implementation("${gradle.ext.mediaPickerSourceWordPressBinaryPath}:$mediapickerVersion") {
-        exclude group: "org.wordpress", module: "utils"
-        exclude group: "org.wordpress", module: "fluxc"
-    }
+    implementation("${gradle.ext.mediaPickerBinaryPath}:$mediapickerVersion")
+    implementation("${gradle.ext.mediaPickerSourceCameraBinaryPath}:$mediapickerVersion")
+    implementation("${gradle.ext.mediaPickerSourceWordPressBinaryPath}:$mediapickerVersion")
 
     // Jetpack Compose
     implementation platform("androidx.compose:compose-bom:$composeBOMVersion")

WooCommerce/src/main/AndroidManifest.xml

@@ -228,6 +228,18 @@
             android:value="barcode_ui,ocr" />
 
         <meta-data android:name="io.sentry.traces.activity.enable" android:value="false" />
+
+        <!-- Trigger Google Play services to install the backported photo picker module. -->
+        <service android:name="com.google.android.gms.metadata.ModuleDependencies"
+            android:enabled="false"
+            android:exported="false"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+            </intent-filter>
+            <meta-data android:name="photopicker_activity:0:required" android:value="" />
+        </service>
+
     </application>
 
 </manifest>

WooCommerce/src/main/kotlin/com/woocommerce/android/di/WooCommerceGlideModule.kt

@@ -53,7 +53,7 @@ class WooCommerceGlideModule : AppGlideModule() {
             WooCommerceGlideEntryPoint::class.java
         ).requestQueue()
 
-        glide.registry.replace(GlideUrl::class.java, InputStream::class.java, VolleyUrlLoader.Factory(requestQueue))
+        registry.replace(GlideUrl::class.java, InputStream::class.java, VolleyUrlLoader.Factory(requestQueue))
     }
 
     /**

WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/LiveDataExt.kt

@@ -60,3 +60,13 @@ fun <T : Any> LiveData<T?>.filterNotNull(): LiveData<T> {
     }
     return mediator
 }
+
+fun <T> LiveData<T>.filter(predicate: (T) -> Boolean): LiveData<T> {
+    val mediator = MediatorLiveData<T>()
+    mediator.addSource(this) {
+        if (it != null && predicate(it)) {
+            mediator.value = it
+        }
+    }
+    return mediator
+}

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

@@ -1,9 +1,11 @@
 package com.woocommerce.android.mediapicker
 
+import android.net.Uri
 import androidx.activity.result.ActivityResult
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.fragment.app.Fragment
-import com.woocommerce.android.mediapicker.MediaPickerUtil.processDeviceMediaResult
 import com.woocommerce.android.mediapicker.MediaPickerUtil.processMediaLibraryResult
 import dagger.hilt.android.scopes.FragmentScoped
 import org.wordpress.android.mediapicker.api.MediaPickerSetup
@@ -17,34 +19,35 @@ class MediaPickerHelper @Inject constructor(
     private val fragment: Fragment,
     private val mediaPickerSetupFactory: MediaPickerSetup.Factory
 ) {
-    private val deviceLibraryLauncher = fragment.registerForActivityResult(StartActivityForResult()) {
-        handleDeviceMediaResult(it)
+
+    private val photoPicker = fragment.registerForActivityResult(PickVisualMedia()) { uri ->
+        handlePhotoPickerResult(uri)
     }
 
     private val mediaLibraryLauncher = fragment.registerForActivityResult(StartActivityForResult()) {
         handleMediaLibraryPickerResult(it)
     }
 
     fun showMediaPicker(source: DataSource) {
-        val mediaPickerIntent = MediaPickerActivity.buildIntent(
-            context = fragment.requireContext(),
-            mediaPickerSetupFactory.build(
-                source = source,
-                mediaTypes = MediaTypes.IMAGES
-            )
-        )
         if (source == DataSource.WP_MEDIA_LIBRARY) {
+            val mediaPickerIntent = MediaPickerActivity.buildIntent(
+                context = fragment.requireContext(),
+                mediaPickerSetupFactory.build(
+                    source = source,
+                    mediaTypes = MediaTypes.IMAGES
+                )
+            )
             mediaLibraryLauncher.launch(mediaPickerIntent)
         } else {
-            deviceLibraryLauncher.launch(mediaPickerIntent)
+            photoPicker.launch(
+                PickVisualMediaRequest(MediaTypes.IMAGES.allowedTypes.toPhotoPickerTypes())
+            )
         }
     }
 
-    private fun handleDeviceMediaResult(result: ActivityResult) {
-        result.processDeviceMediaResult()?.let { mediaUris ->
-            if (mediaUris.isNotEmpty()) {
-                (fragment as MediaPickerResultHandler).onMediaSelected(mediaUris.first().toString())
-            }
+    private fun handlePhotoPickerResult(uri: Uri?) {
+        uri?.let {
+            (fragment as MediaPickerResultHandler).onMediaSelected(it.toString())
         }
     }
 

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

@@ -3,21 +3,14 @@ package com.woocommerce.android.mediapicker
 import org.wordpress.android.mediapicker.api.MediaPickerSetup
 import org.wordpress.android.mediapicker.loader.MediaLoader
 import org.wordpress.android.mediapicker.loader.MediaLoaderFactory
-import org.wordpress.android.mediapicker.source.device.DeviceMediaSource
 import org.wordpress.android.mediapicker.source.wordpress.MediaLibrarySource
 import javax.inject.Inject
 
 // A factory class responsible for building an image-loader class, which is specific to a source.
 class MediaPickerLoaderFactory @Inject constructor(
-    private val deviceMediaSourceFactory: DeviceMediaSource.Factory,
     private val mediaLibrarySourceFactory: MediaLibrarySource.Factory
 ) : MediaLoaderFactory {
     override fun build(mediaPickerSetup: MediaPickerSetup): MediaLoader {
-        return when (mediaPickerSetup.primaryDataSource) {
-            MediaPickerSetup.DataSource.WP_MEDIA_LIBRARY -> {
-                mediaLibrarySourceFactory.build(mediaPickerSetup.allowedTypes)
-            }
-            else -> deviceMediaSourceFactory.build(mediaPickerSetup.allowedTypes)
-        }.toMediaLoader()
+        return mediaLibrarySourceFactory.build(mediaPickerSetup.allowedTypes).toMediaLoader()
     }
 }

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

@@ -1,15 +1,11 @@
 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.camera.CameraMediaPickerSetup
 import org.wordpress.android.mediapicker.source.wordpress.MediaLibraryPickerSetup
 import java.security.InvalidParameterException
 import javax.inject.Inject
@@ -21,27 +17,12 @@ class MediaPickerSetupFactory @Inject constructor() : MediaPickerSetup.Factory {
         isMultiSelectAllowed: Boolean
     ): MediaPickerSetup {
         return when (source) {
-            CAMERA -> DeviceMediaPickerSetup.buildCameraPicker()
+            CAMERA -> CameraMediaPickerSetup.build()
             WP_MEDIA_LIBRARY -> MediaLibraryPickerSetup.build(
                 mediaTypes = mediaTypes,
                 canMultiSelect = isMultiSelectAllowed
             )
 
-            DEVICE -> MediaPickerSetup(
-                primaryDataSource = DEVICE,
-                isMultiSelectEnabled = isMultiSelectAllowed,
-                areResultsQueued = false,
-                searchMode = VISIBLE_UNTOGGLED,
-                availableDataSources = setOf(SYSTEM_PICKER),
-                allowedTypes = mediaTypes.allowedTypes,
-                title = R.string.photo_picker_title
-            )
-
-            SYSTEM_PICKER -> DeviceMediaPickerSetup.buildSystemPicker(
-                mediaTypes = mediaTypes,
-                canMultiSelect = false
-            )
-
             else -> throw InvalidParameterException("${source.name} source is not supported")
         }
     }

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

@@ -3,13 +3,18 @@ package com.woocommerce.android.mediapicker
 import android.net.Uri
 import android.os.Bundle
 import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
+import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia.VisualMediaType
 import androidx.appcompat.app.AppCompatActivity
 import com.woocommerce.android.extensions.parcelableArrayList
 import com.woocommerce.android.model.Product
 import com.woocommerce.android.util.WooLog
 import org.wordpress.android.mediapicker.MediaPickerConstants
 import org.wordpress.android.mediapicker.api.MediaPickerSetup
 import org.wordpress.android.mediapicker.model.MediaItem
+import org.wordpress.android.mediapicker.model.MediaType
+import org.wordpress.android.mediapicker.model.MediaType.IMAGE
+import org.wordpress.android.mediapicker.model.MediaType.VIDEO
 import org.wordpress.android.util.DateTimeUtils
 import java.security.InvalidParameterException
 
@@ -62,3 +67,21 @@ object MediaPickerUtil {
             ?: emptyList()
     }
 }
+
+fun Set<MediaType>.toPhotoPickerTypes(): VisualMediaType {
+    return when {
+        contains(IMAGE) && contains(VIDEO) -> {
+            PickVisualMedia.ImageAndVideo
+        }
+        contains(IMAGE) -> {
+            PickVisualMedia.ImageOnly
+        }
+        contains(VIDEO) -> {
+            PickVisualMedia.VideoOnly
+        } else -> {
+            throw IllegalArgumentException(
+                "Missing or unsupported photo picker media types: $this"
+            )
+        }
+    }
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/model/Product.kt

@@ -94,9 +94,9 @@ data class Product(
     @Parcelize
     data class Image(
         val id: Long,
-        val name: String,
+        val name: String?,
         val source: String,
-        val dateCreated: Date
+        val dateCreated: Date?
     ) : Parcelable
 
     fun isSameProduct(product: Product): Boolean {

WooCommerce/src/main/kotlin/com/woocommerce/android/model/ProductVariation.kt

@@ -114,7 +114,10 @@ open class ProductVariation(
                     json.addProperty("id", variantImage.id)
                     json.addProperty("name", variantImage.name)
                     json.addProperty("src", variantImage.source)
-                    json.addProperty("date_created_gmt", variantImage.dateCreated.formatToYYYYmmDDhhmmss())
+                    json.addProperty(
+                        /* property = */ "date_created_gmt",
+                        /* value = */ variantImage.dateCreated?.formatToYYYYmmDDhhmmss() ?: ""
+                    )
                 }.toString()
             } ?: ""
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/BlazeCampaignCreationScreen.kt

@@ -7,7 +7,7 @@ import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -84,7 +84,7 @@ fun BlazeCampaignCreationScreen(
     ) { paddingValues ->
         AnimatedContent(
             targetState = viewState,
-            transitionSpec = { fadeIn() with fadeOut() }
+            transitionSpec = { fadeIn() togetherWith fadeOut() }, label = ""
         ) { targetState ->
             when (targetState) {
                 is BlazeCreationViewState.Intro -> BlazeCreationIntroScreen(

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/main/JetpackActivationMainScreen.kt

@@ -11,6 +11,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.togetherWith
 import androidx.compose.animation.with
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.Image
@@ -109,7 +110,12 @@ fun JetpackActivationMainScreen(
             transition.AnimatedContent(
                 contentKey = { it is JetpackActivationMainViewModel.ViewState.ErrorViewState },
                 transitionSpec = {
-                    fadeIn(animationSpec = tween(DefaultDurationMillis, delayMillis = DefaultDurationMillis)) with
+                    fadeIn(
+                        animationSpec = tween(
+                            DefaultDurationMillis,
+                            delayMillis = DefaultDurationMillis
+                        )
+                    ) togetherWith
                         fadeOut(animationSpec = tween(DefaultDurationMillis))
                 },
                 modifier = Modifier.weight(1f)
@@ -119,6 +125,7 @@ fun JetpackActivationMainScreen(
                         viewState = targetState,
                         onContinueClick = onContinueClick
                     )
+
                     is JetpackActivationMainViewModel.ViewState.ErrorViewState -> ErrorState(
                         viewState = targetState,
                         onGetHelpClick = onGetHelpClick,
@@ -294,10 +301,13 @@ private fun AnimatedVisibilityScope.ErrorState(
             val retryButton = when (viewState.stepType) {
                 JetpackActivationMainViewModel.StepType.Installation ->
                     R.string.login_jetpack_installation_retry_installing
+
                 JetpackActivationMainViewModel.StepType.Activation ->
                     R.string.login_jetpack_installation_retry_activating
+
                 JetpackActivationMainViewModel.StepType.Connection ->
                     R.string.login_jetpack_installation_retry_authorizing
+
                 else -> null
             }
             retryButton?.let {
@@ -328,16 +338,19 @@ private fun JetpackActivationStep(
             JetpackActivationMainViewModel.StepState.Idle -> {
                 IdleCircle(indicatorModifier)
             }
+
             JetpackActivationMainViewModel.StepState.Ongoing -> {
                 CircularProgressIndicator(indicatorModifier)
             }
+
             JetpackActivationMainViewModel.StepState.Success -> {
                 Image(
                     painter = painterResource(id = R.drawable.ic_progress_circle_complete),
                     contentDescription = null,
                     modifier = indicatorModifier
                 )
             }
+
             is JetpackActivationMainViewModel.StepState.Error -> {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_gridicons_notice),
@@ -385,6 +398,7 @@ private fun ConnectionStepHint(connectionStep: JetpackActivationMainViewModel.Co
                     R.string.login_jetpack_steps_authorizing_validation,
                     R.color.color_on_surface_medium
                 )
+
             else ->
                 Pair(
                     R.string.login_jetpack_steps_authorizing_done,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt

@@ -29,6 +29,7 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_IPP_BANN
 import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_IPP_BANNER_SOURCE_ORDER_LIST
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
 import com.woocommerce.android.extensions.NotificationReceivedEvent
+import com.woocommerce.android.extensions.filter
 import com.woocommerce.android.extensions.filterNotNull
 import com.woocommerce.android.model.FeatureFeedbackSettings
 import com.woocommerce.android.model.RequestResult.SUCCESS
@@ -78,7 +79,6 @@ import org.wordpress.android.fluxc.store.ListStore
 import org.wordpress.android.fluxc.store.WCOrderStore
 import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderChanged
 import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderSummariesFetched
-import org.wordpress.android.mediapicker.util.filter
 import javax.inject.Inject
 
 private const val EMPTY_VIEW_THROTTLE = 250L