Merge pull request #14713 from woocommerce/issue/WOOMOB-1361-bookings-empty-state

[CIAB] Bookings empty state

Author: AdamGrzybkowski

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/intro/BlazeCampaignCreationIntroScreen.kt

@@ -50,7 +50,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.woocommerce.android.R
-import com.woocommerce.android.ui.compose.annotatedStringResLegacy
+import com.woocommerce.android.ui.compose.annotatedStringRes
 import com.woocommerce.android.ui.compose.component.Toolbar
 import com.woocommerce.android.ui.compose.component.WCColoredButton
 import com.woocommerce.android.ui.compose.component.WCModalBottomSheet
@@ -242,11 +242,11 @@ private fun BlazeCampaignBottomSheetContent(
     onDismissClick: () -> Unit
 ) {
     val learnMoreItems = listOf(
-        annotatedStringResLegacy(R.string.blaze_campaign_creation_new_intro_learn_item_1),
-        annotatedStringResLegacy(R.string.blaze_campaign_creation_new_intro_learn_item_2),
-        annotatedStringResLegacy(R.string.blaze_campaign_creation_new_intro_learn_item_3),
-        annotatedStringResLegacy(R.string.blaze_campaign_creation_new_intro_learn_item_4),
-        annotatedStringResLegacy(R.string.blaze_campaign_creation_new_intro_learn_item_5),
+        annotatedStringRes(R.string.blaze_campaign_creation_new_intro_learn_item_1),
+        annotatedStringRes(R.string.blaze_campaign_creation_new_intro_learn_item_2),
+        annotatedStringRes(R.string.blaze_campaign_creation_new_intro_learn_item_3),
+        annotatedStringRes(R.string.blaze_campaign_creation_new_intro_learn_item_4),
+        annotatedStringRes(R.string.blaze_campaign_creation_new_intro_learn_item_5),
     )
 
     Column(

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/objective/BlazeCampaignObjectiveScreen.kt

@@ -34,7 +34,7 @@ import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.blaze.creation.objective.BlazeCampaignObjectiveViewModel.ObjectiveItem
 import com.woocommerce.android.ui.blaze.creation.objective.BlazeCampaignObjectiveViewModel.ObjectiveViewState
-import com.woocommerce.android.ui.compose.annotatedStringResLegacy
+import com.woocommerce.android.ui.compose.annotatedStringRes
 import com.woocommerce.android.ui.compose.component.BottomSheetSwitchColors
 import com.woocommerce.android.ui.compose.component.Toolbar
 import com.woocommerce.android.ui.compose.component.WCSwitch
@@ -184,7 +184,7 @@ fun ObjectiveListItem(
             )
             if (isSelected) {
                 Text(
-                    text = annotatedStringResLegacy(
+                    text = annotatedStringRes(
                         stringResId = R.string.blaze_campaign_objective_good_for,
                         suitableForDescription
                     ),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/payment/BlazeCampaignPaymentSummaryScreen.kt

@@ -38,7 +38,7 @@ import com.woocommerce.android.R
 import com.woocommerce.android.model.CreditCardType
 import com.woocommerce.android.ui.blaze.BlazeRepository
 import com.woocommerce.android.ui.blaze.creation.payment.BlazeCampaignPaymentSummaryViewModel.CampaignCreationState
-import com.woocommerce.android.ui.compose.annotatedStringRes
+import com.woocommerce.android.ui.compose.clickableAnnotatedStringRes
 import com.woocommerce.android.ui.compose.component.Toolbar
 import com.woocommerce.android.ui.compose.component.ToolbarWithHelpButton
 import com.woocommerce.android.ui.compose.component.WCColoredButton
@@ -143,7 +143,7 @@ private fun PaymentSummaryContent(
                 .padding(horizontal = dimensionResource(id = R.dimen.major_100))
         )
 
-        val termsOfServices = annotatedStringRes(
+        val termsOfServices = clickableAnnotatedStringRes(
             stringResId = R.string.blaze_campaign_payment_summary_terms_and_conditions,
             onUrlClick = { url ->
                 when (url) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/preview/BlazeCampaignCreationPreviewScreen.kt

@@ -60,7 +60,7 @@ import com.woocommerce.android.ui.blaze.creation.preview.BlazeCampaignCreationPr
 import com.woocommerce.android.ui.blaze.creation.preview.BlazeCampaignCreationPreviewViewModel.CampaignPreviewUiState
 import com.woocommerce.android.ui.compose.Render
 import com.woocommerce.android.ui.compose.animations.SkeletonView
-import com.woocommerce.android.ui.compose.annotatedStringRes
+import com.woocommerce.android.ui.compose.clickableAnnotatedStringRes
 import com.woocommerce.android.ui.compose.component.ToolbarWithHelpButton
 import com.woocommerce.android.ui.compose.component.WCColoredButton
 import com.woocommerce.android.ui.compose.component.WCTextButton
@@ -142,7 +142,7 @@ private fun ConfirmationFooter(
     onTosAccepted: (Boolean) -> Unit
 ) {
     val context = LocalContext.current
-    val campaignTosText = annotatedStringRes(
+    val campaignTosText = clickableAnnotatedStringRes(
         stringResId = previewState.campaignDetails.campaignTosText.stringRes,
         onUrlClick = { ChromeCustomTabUtils.launchUrl(context, AppUrls.BLAZE_CANCEL_INSTRUCTIONS) },
         args = previewState.campaignDetails.campaignTosText.params.map { it.getText() }.toTypedArray()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/creation/targets/BlazeCampaignTargetSelectionScreen.kt

@@ -226,7 +226,7 @@ private fun SearchList(
         }
 
         is SearchState.NoResults -> {
-            val image = painterResource(id = R.drawable.search_failed_illustration)
+            val image = painterResource(id = R.drawable.img_empty_search)
             val message = stringResource(id = string.blaze_campaign_creation_location_search_failed_message)
             ImageWithMessage(modifier, image, message)
         }
@@ -242,7 +242,7 @@ private fun SearchList(
             ) {
                 ImageWithMessage(
                     modifier = Modifier.fillMaxWidth(),
-                    image = painterResource(id = R.drawable.search_failed_illustration),
+                    image = painterResource(id = R.drawable.img_empty_search),
                     message = stringResource(id = string.blaze_campaign_creation_location_search_failed_message)
                 )
                 WCColoredButton(onClick = onRetrySearchTapped, text = stringResource(id = R.string.retry))