Merge branch 'trunk' into issue/10574-budget-screen-logic

# Conflicts:
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/preview/BlazeCampaignCreationPreviewViewModel.kt

Author: JorgeMucientes

RELEASE-NOTES.txt

@@ -7,6 +7,7 @@
 17.3
 -----
 - [*] [Internal] Enhanced user experience in shipping label creation with automatic scrolling to the first invalid field upon form submission failure [https://github.com/woocommerce/woocommerce-android/pull/10657]
+- [*] [Internal] Enhanced product variation delete confirmation dialog visibility and functionality across device rotations [https://github.com/woocommerce/woocommerce-android/pull/10664]
 - [*] [Internal] Added a text along with the receipts file when it is shared [https://github.com/woocommerce/woocommerce-android/pull/10681]
 
 17.2

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/hub/AnalyticsHubViewModel.kt

@@ -148,6 +148,7 @@ class AnalyticsHubViewModel @Inject constructor(
     }
 
     private fun trackSeeReportInteraction(card: ReportCard) {
+        onTrackableUIInteraction()
         val period = ranges.selectionType.identifier
         val report = card.name.lowercase()
         tracker.track(

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

@@ -1,12 +1,14 @@
 package com.woocommerce.android.ui.blaze
 
 import android.os.Parcelable
+import com.woocommerce.android.OnChangedException
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.ui.products.ProductDetailRepository
 import com.woocommerce.android.util.TimezoneProvider
+import com.woocommerce.android.util.WooLog
 import kotlinx.coroutines.flow.map
 import kotlinx.parcelize.Parcelize
-import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao.BlazeAdSuggestionEntity
+import org.wordpress.android.fluxc.model.blaze.BlazeAdSuggestion
 import org.wordpress.android.fluxc.store.blaze.BlazeCampaignsStore
 import java.util.Date
 import javax.inject.Inject
@@ -29,44 +31,95 @@ class BlazeRepository @Inject constructor(
     fun observeLanguages() = blazeCampaignsStore.observeBlazeTargetingLanguages()
         .map { it.map { language -> Language(language.id, language.name) } }
 
-    suspend fun fetchLanguages() = blazeCampaignsStore.fetchBlazeTargetingLanguages()
+    suspend fun fetchLanguages(): Result<Unit> {
+        val result = blazeCampaignsStore.fetchBlazeTargetingLanguages(selectedSite.get())
+
+        return when {
+            result.isError -> {
+                WooLog.w(WooLog.T.BLAZE, "Failed to fetch languages: ${result.error}")
+                Result.failure(OnChangedException(result.error))
+            }
+            else -> Result.success(Unit)
+        }
+    }
 
     fun observeDevices() = blazeCampaignsStore.observeBlazeTargetingDevices()
         .map { it.map { device -> Device(device.id, device.name) } }
 
-    suspend fun fetchDevices() = blazeCampaignsStore.fetchBlazeTargetingDevices()
+    suspend fun fetchDevices(): Result<Unit> {
+        val result = blazeCampaignsStore.fetchBlazeTargetingDevices(selectedSite.get())
+
+        return when {
+            result.isError -> {
+                WooLog.w(WooLog.T.BLAZE, "Failed to fetch devices: ${result.error}")
+                Result.failure(OnChangedException(result.error))
+            }
+            else -> Result.success(Unit)
+        }
+    }
 
     fun observeInterests() = blazeCampaignsStore.observeBlazeTargetingTopics()
         .map { it.map { interest -> Interest(interest.id, interest.description) } }
 
-    suspend fun fetchInterests() = blazeCampaignsStore.fetchBlazeTargetingTopics()
+    suspend fun fetchInterests(): Result<Unit> {
+        val result = blazeCampaignsStore.fetchBlazeTargetingTopics(selectedSite.get())
 
-    suspend fun fetchLocations(query: String) = blazeCampaignsStore.fetchBlazeTargetingLocations(query).model
-        ?.map { location -> Location(location.id, location.name, location.parent?.name, location.type) }
+        return when {
+            result.isError -> {
+                WooLog.w(WooLog.T.BLAZE, "Failed to fetch interests: ${result.error}")
+                Result.failure(OnChangedException(result.error))
+            }
+            else -> Result.success(Unit)
+        }
+    }
+
+    suspend fun fetchLocations(query: String): Result<List<Location>> {
+        val result = blazeCampaignsStore.fetchBlazeTargetingLocations(
+            selectedSite.get(),
+            query
+        )
+
+        return when {
+            result.isError -> {
+                WooLog.w(WooLog.T.BLAZE, "Failed to fetch locations: ${result.error}")
+                Result.failure(OnChangedException(result.error))
+            }
+            else -> Result.success(
+                result.model?.map { location ->
+                    Location(location.id, location.name, location.parent?.name, location.type)
+                } ?: emptyList()
+            )
+        }
+    }
 
     suspend fun getMostRecentCampaign() = blazeCampaignsStore.getMostRecentBlazeCampaign(selectedSite.get())
 
-    suspend fun getAdSuggestions(productId: Long): List<AiSuggestionForAd>? {
-        fun List<BlazeAdSuggestionEntity>.mapToUiModel(): List<AiSuggestionForAd> {
+    suspend fun fetchAdSuggestions(productId: Long): Result<List<AiSuggestionForAd>> {
+        fun List<BlazeAdSuggestion>.mapToUiModel(): List<AiSuggestionForAd> {
             return map { AiSuggestionForAd(it.tagLine, it.description) }
         }
 
-        val suggestions = blazeCampaignsStore.getBlazeAdSuggestions(selectedSite.get(), productId)
-        return if (suggestions.isNotEmpty()) {
-            suggestions.mapToUiModel()
-        } else {
-            blazeCampaignsStore.fetchBlazeAdSuggestions(selectedSite.get(), productId).model?.mapToUiModel()
+        val result = blazeCampaignsStore.fetchBlazeAdSuggestions(selectedSite.get(), productId)
+
+        return when {
+            result.isError -> {
+                WooLog.w(WooLog.T.BLAZE, "Failed to fetch ad suggestions: ${result.error}")
+                Result.failure(OnChangedException(result.error))
+            }
+            else -> Result.success(result.model?.mapToUiModel() ?: emptyList())
         }
     }
 
-    fun getCampaignPreviewDetails(productId: Long): CampaignPreview {
+    suspend fun getCampaignPreviewDetails(productId: Long): CampaignPreview {
         val product = productDetailRepository.getProduct(productId)
+            ?: productDetailRepository.fetchProductOrLoadFromCache(productId)!!
+
         return CampaignPreview(
             productId = productId,
             userTimeZone = timezoneProvider.deviceTimezone.displayName,
-            targetUrl = product?.permalink ?: "",
+            targetUrl = product.permalink,
             urlParams = null,
-            campaignImageUrl = product?.firstImageUrl
+            campaignImageUrl = product.firstImageUrl
         )
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/ad/BlazeCampaignCreationEditAdViewModel.kt

@@ -43,7 +43,7 @@ class BlazeCampaignCreationEditAdViewModel @Inject constructor(
 
     private fun loadSuggestions() {
         viewModelScope.launch {
-            blazeRepository.getAdSuggestions(navArgs.productId)?.let { list ->
+            blazeRepository.fetchAdSuggestions(navArgs.productId).getOrNull()?.let { list ->
                 val index = list.indexOfFirst { it.tagLine == navArgs.tagline && it.description == navArgs.description }
                 val suggestions = list.map { AiSuggestionForAd(it.tagLine, it.description) }
                 if (index != -1) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/destination/BlazeCampaignCreationAdDestinationScreen.kt

@@ -1,27 +1,41 @@
 package com.woocommerce.android.ui.blaze.creation.destination
 
+import androidx.annotation.StringRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.RadioButton
+import androidx.compose.material.RadioButtonDefaults
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons.Filled
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.window.Dialog
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.blaze.creation.destination.BlazeCampaignCreationAdDestinationViewModel.ViewState
+import com.woocommerce.android.ui.compose.component.DialogButtonsRowLayout
 import com.woocommerce.android.ui.compose.component.Toolbar
+import com.woocommerce.android.ui.compose.component.WCTextButton
 import com.woocommerce.android.ui.compose.preview.LightDarkThemePreviews
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 
@@ -32,7 +46,8 @@ fun BlazeCampaignCreationAdDestinationScreen(viewModel: BlazeCampaignCreationAdD
             previewState,
             viewModel::onBackPressed,
             viewModel::onUrlPropertyTapped,
-            viewModel::onParameterPropertyTapped
+            viewModel::onParameterPropertyTapped,
+            viewModel::onDestinationUrlChanged
         )
     }
 }
@@ -42,7 +57,8 @@ fun AdDestinationScreen(
     viewState: ViewState,
     onBackPressed: () -> Unit,
     onUrlPropertyTapped: () -> Unit,
-    onParametersPropertyTapped: () -> Unit
+    onParametersPropertyTapped: () -> Unit,
+    onDestinationUrlChanged: (String) -> Unit
 ) {
     Scaffold(
         topBar = {
@@ -62,7 +78,7 @@ fun AdDestinationScreen(
         ) {
             AdDestinationProperty(
                 title = stringResource(id = R.string.blaze_campaign_edit_ad_destination_url_property_title),
-                value = viewState.destinationUrl,
+                value = viewState.targetUrl,
                 onPropertyTapped = onUrlPropertyTapped
             )
             Divider()
@@ -72,13 +88,22 @@ fun AdDestinationScreen(
                 onPropertyTapped = onParametersPropertyTapped
             )
         }
+
+        if (viewState.isUrlDialogVisible) {
+            AdDestinationUrlDialog(
+                viewState,
+                onDismissed = { onDestinationUrlChanged(viewState.targetUrl) },
+                onSaveTapped = onDestinationUrlChanged
+            )
+        }
     }
 }
 
 @Composable
 fun AdDestinationProperty(title: String, value: String, onPropertyTapped: () -> Unit) {
     Column(
-        modifier = Modifier
+        modifier =
+        Modifier
             .clickable { onPropertyTapped() }
             .padding(dimensionResource(id = R.dimen.major_100))
             .fillMaxWidth(1f)
@@ -98,18 +123,114 @@ fun AdDestinationProperty(title: String, value: String, onPropertyTapped: () ->
     }
 }
 
+@Composable
+fun AdDestinationUrlDialog(
+    viewState: ViewState,
+    onDismissed: () -> Unit,
+    onSaveTapped: (String) -> Unit,
+) {
+    Dialog(onDismissRequest = onDismissed) {
+        Column(
+            modifier =
+            Modifier
+                .background(MaterialTheme.colors.surface, MaterialTheme.shapes.medium)
+                .padding(dimensionResource(id = R.dimen.major_100)),
+            verticalArrangement = Arrangement.spacedBy(dimensionResource(id = R.dimen.major_100))
+        ) {
+            Text(
+                text = stringResource(id = R.string.blaze_campaign_edit_ad_destination_url_property_title),
+                style = MaterialTheme.typography.h6
+            )
+
+            var targetUrl by rememberSaveable {
+                mutableStateOf(viewState.targetUrl)
+            }
+
+            UrlOption(
+                url = viewState.productUrl,
+                targetUrl = targetUrl,
+                title = R.string.blaze_campaign_edit_ad_destination_product_url_option
+            ) {
+                targetUrl = viewState.productUrl
+            }
+
+            UrlOption(
+                url = viewState.siteUrl,
+                targetUrl = targetUrl,
+                title = R.string.blaze_campaign_edit_ad_destination_site_url_option
+            ) {
+                targetUrl = viewState.siteUrl
+            }
+
+            DialogButtonsRowLayout(
+                confirmButton = {
+                    WCTextButton(onClick = {
+                        onSaveTapped(targetUrl)
+                    }) {
+                        Text(text = stringResource(id = R.string.save))
+                    }
+                },
+                dismissButton = {
+                    WCTextButton(onClick = onDismissed) {
+                        Text(text = stringResource(id = android.R.string.cancel))
+                    }
+                },
+                neutralButton = null
+            )
+        }
+    }
+}
+
+@Composable
+private fun UrlOption(
+    url: String,
+    targetUrl: String,
+    @StringRes title: Int,
+    onOptionSelected: () -> Unit
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    Row(
+        modifier = Modifier.clickable(
+            indication = null,
+            interactionSource = interactionSource,
+            onClick = onOptionSelected
+        ),
+    ) {
+        RadioButton(
+            selected = url == targetUrl,
+            onClick = onOptionSelected,
+            colors = RadioButtonDefaults.colors(
+                selectedColor = MaterialTheme.colors.primary,
+                unselectedColor = colorResource(id = R.color.color_on_surface_medium)
+            )
+        )
+        Column {
+            Text(stringResource(title))
+            Text(
+                text = url,
+                style = MaterialTheme.typography.subtitle1,
+                color = colorResource(id = R.color.color_on_surface_medium)
+            )
+        }
+    }
+}
+
 @LightDarkThemePreviews
 @Composable
 fun PreviewAdDestinationScreen() {
     WooThemeWithBackground {
         AdDestinationScreen(
             viewState = ViewState(
-                destinationUrl = "https://woocommerce.com",
-                parameters = "utm_source=woocommerce\nutm_medium=android\nutm_campaign=blaze"
+                parameters = "utm_source=woocommerce\nutm_medium=android\nutm_campaign=blaze",
+                productUrl = "https://woocommerce.com/products/1",
+                siteUrl = "https://woocommerce.com",
+                targetUrl = "https://woocommerce.com/products/12",
+                isUrlDialogVisible = true
             ),
             onBackPressed = {},
             onUrlPropertyTapped = {},
-            onParametersPropertyTapped = {}
+            onParametersPropertyTapped = {},
+            onDestinationUrlChanged = {}
         )
     }
 }