Issue/12894 blaze cta text input #12899

JorgeMucientes · 2024-11-08T16:55:47Z

Description

Adds a new input text field in the Blaze campaign creation flow to edit the CTA text of the ad. It also updates the style of the ad CTA to match the Blaze ad style.

Testing information

Log into a site with Blaze enabled
Trigger Blaze campaign creation flow
Once suggestions are loaded, click on Edit Ad button
Check the input text "Call to action" is prefilled for all 3 suggestions.
Edit the value of it and save it
Check the ad preview is updated with the edited value
Create the campaign and load the campaign detail review. Verify the ad CTA shows the value you entered.

The tests that have been performed

The above

Images/gif

editCTA.mp4

Changes applied to ad CTA:

defaultButton.mp4

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

Reviewer (or Author, in the case of optional code reviews):

Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement:

The PR is small and has a clear, single focus, or a valid explanation is provided in the description. If needed, please request to split it into smaller PRs.
Ensure Adequate Unit Test Coverage: The changes are reasonably covered by unit tests or an explanation is provided in the PR description.
Manual Testing: The author listed all the tests they ran, including smoke tests when needed (e.g., for refactorings). The reviewer confirmed that the PR works as expected on big (tablet) and small (phone) in case of UI changes, and no regressions are added.

dangermattic · 2024-11-08T16:57:40Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2024-11-08T17:01:38Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`819562f`
	Direct Download	`woocommerce-wear-prototype-build-pr12899-819562f.apk`

wpmobilebot · 2024-11-08T17:16:03Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`819562f`
	Direct Download	`woocommerce-prototype-build-pr12899-819562f.apk`

JorgeMucientes · 2024-11-11T09:56:54Z

Since the Ad in Blaze web shows the CTA in blue and under the description, I think we should replicate that exact same UI.

I'll proceed to apply those changes in this same PR

wpmobilebot · 2024-11-11T11:31:17Z

Project dependencies changes

The following changes in project dependencies were detected (configuration vanillaReleaseRuntimeClasspath):

list

Upgraded Dependencies
org.wordpress.fluxc.plugins:woocommerce:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0, (changed from 2.99.1)
org.wordpress.fluxc:fluxc-annotations:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0, (changed from 2.99.1)
org.wordpress:fluxc:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0, (changed from 2.99.1)

tree

-+--- org.wordpress:fluxc:2.99.1
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.6.1 (*)
-|    +--- androidx.room:room-ktx:2.6.1
-|    |    +--- androidx.room:room-common:2.6.1 (*)
-|    |    +--- androidx.room:room-runtime:2.6.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
-|    |    +--- androidx.room:room-common:2.6.1 (c)
-|    |    \--- androidx.room:room-runtime:2.6.1 (c)
-|    +--- com.google.dagger:dagger:2.51.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:2.99.1
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
++--- org.wordpress:fluxc:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0 (*)
+|    +--- androidx.room:room-runtime:2.6.1 (*)
+|    +--- androidx.room:room-ktx:2.6.1
+|    |    +--- androidx.room:room-common:2.6.1 (*)
+|    |    +--- androidx.room:room-runtime:2.6.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
+|    |    +--- androidx.room:room-common:2.6.1 (c)
+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
+|    +--- com.google.dagger:dagger:2.51.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:2.99.1
-     +--- org.wordpress:fluxc:2.99.1 (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.51.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-     +--- androidx.room:room-runtime:2.6.1 (*)
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:2.99.1
-     +--- androidx.room:room-ktx:2.6.1 (*)
-     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0
+     +--- org.wordpress:fluxc:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0 (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.51.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+     +--- androidx.room:room-runtime:2.6.1 (*)
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:trunk-cc17141a0e910d5b808ba6bbfb4b7d393d3517a0
+     +--- androidx.room:room-ktx:2.6.1 (*)
+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)

hichamboushaba · 2024-11-11T14:00:25Z

...ain/kotlin/com/woocommerce/android/ui/blaze/creation/ad/BlazeCampaignCreationEditAdScreen.kt

+    Text(
+        text = stringResource(
+            id = string.blaze_campaign_edit_ad_characters_remaining,
+            viewState.descriptionCharactersRemaining
+        ),
+        style = MaterialTheme.typography.caption,
+        color = colorResource(id = color.color_on_surface_disabled),
+        modifier = Modifier
+            .padding(top = dimensionResource(id = dimen.minor_100))
+            .fillMaxWidth()
+    )


Not a review, but just a suggestion here, instead of using a separate Text field here, we can simplify this by using the helper argument of the WCOutlinedTextField, it should then prevent design discrepancies between this screen and other screens where we use the same pattern.

The helper can be used to show an error if we pass isError = true, this could be helpful if we want to follow what iOS does by showing it as error when the value is empty (This is a point that I think we should fix for Android, as empty values are accepted for tagline and description, where they shouldn't be).

Good point @hichamboushaba I've applied your suggestion to keep the component's experience consistent across the different screens.
Also added support for the case where either tagline or description are empty.

codecov-commenter · 2024-11-11T15:59:56Z

Codecov Report

Attention: Patch coverage is 30.76923% with 27 lines in your changes missing coverage. Please review.

Project coverage is 40.19%. Comparing base (c8db73c) to head (819562f).
Report is 23 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...reation/ad/BlazeCampaignCreationEditAdViewModel.kt	8.69%	21 Missing ⚠️
...om/woocommerce/android/ui/blaze/BlazeRepository.kt	50.00%	3 Missing ⚠️
...n/preview/BlazeCampaignCreationPreviewViewModel.kt	70.00%	0 Missing and 3 partials ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              trunk   #12899   +/-   ##
=========================================
  Coverage     40.18%   40.19%           
  Complexity     5804     5804           
=========================================
  Files          1259     1259           
  Lines         71561    71589   +28     
  Branches       9980     9984    +4     
=========================================
+ Hits          28760    28773   +13     
- Misses        40168    40181   +13     
- Partials       2633     2635    +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

hichamboushaba

Nice work @JorgeMucientes, code looks good, and changes worked overall well, I found two minor issues, but I'm pre-approving.
The first issue is a in the comment below, and the other is about updating the logic of the "Suggested by AI" label, it keeps showing even if we edit the CTA field, I believe we need to update this logic to account for it too.

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

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

JorgeMucientes · 2024-11-13T22:28:04Z

Thanks for the review and the input @hichamboushaba I fixed both of the issues.

JorgeMucientes added 3 commits November 8, 2024 16:04

Add new text input field to enter ad cta text

0c379e6

Save entered cta text between screen navigation

5041aa7

Show updated cta text in ad preview

022e01b

JorgeMucientes marked this pull request as draft November 8, 2024 16:55

JorgeMucientes added 2 commits November 8, 2024 18:13

Add missing ctaText navarg

60cac22

Add ctaText to campaign creation details

8162173

Fix minor UI issues to display the correct ctaText suggestion

c29b0d9

JorgeMucientes requested a review from hichamboushaba November 11, 2024 09:54

JorgeMucientes added the feature: blaze Related to the Blaze project label Nov 11, 2024

JorgeMucientes added this to the 21.2 milestone Nov 11, 2024

JorgeMucientes added the type: task An internally driven task. label Nov 11, 2024

JorgeMucientes added 4 commits November 11, 2024 10:58

Suppress detekt long method warning

b231f77

Update FluxC version

49c711c

Update preview to show the ad cta with the same style as Blaze dsp

fd75281

Fix rounding for default button

66f5b1b

JorgeMucientes mentioned this pull request Nov 11, 2024

Add support for creating Blaze campaigns with custom cta_text field wordpress-mobile/WordPress-FluxC-Android#3108

Merged

JorgeMucientes requested a review from irfano November 11, 2024 11:28

JorgeMucientes marked this pull request as ready for review November 11, 2024 11:28

hichamboushaba reviewed Nov 11, 2024

View reviewed changes

JorgeMucientes added 3 commits November 11, 2024 16:15

Fix unit tests compile issues

2252ef0

Remove compose duplicated code and re use existing component

41112ea

Fix code indentation issue

3480f07

JorgeMucientes added the status: do not merge Dependent on another PR, ready for review but not ready for merge. label Nov 11, 2024

hichamboushaba self-assigned this Nov 12, 2024

hichamboushaba approved these changes Nov 13, 2024

View reviewed changes

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/blaze/BlazeRepository.kt Outdated Show resolved Hide resolved

JorgeMucientes added 3 commits November 13, 2024 22:02

Remove leftover TODO

0778bf4

Check if cta text changes when updating isAdContentGeneratedByAi status

1f9d78f

Updates FluxC changeset to latest trunk

7a9af96

JorgeMucientes removed the status: do not merge Dependent on another PR, ready for review but not ready for merge. label Nov 13, 2024

Merge branch 'trunk' into issue/12894-blaze-cta-text-input

df71f0f

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

JorgeMucientes enabled auto-merge November 13, 2024 22:28

JorgeMucientes added 2 commits November 14, 2024 08:58

Fix wrong indentation

f1670b2

Remove unnecessary safe call to a non-null receiver

819562f

JorgeMucientes merged commit b60474a into trunk Nov 14, 2024
15 checks passed

JorgeMucientes deleted the issue/12894-blaze-cta-text-input branch November 14, 2024 08:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Issue/12894 blaze cta text input #12899

Issue/12894 blaze cta text input #12899

Uh oh!

JorgeMucientes commented Nov 8, 2024 •

edited

Loading

Uh oh!

dangermattic commented Nov 8, 2024 •

edited

Loading

Uh oh!

wpmobilebot commented Nov 8, 2024 •

edited

Loading

Uh oh!

wpmobilebot commented Nov 8, 2024 •

edited

Loading

Uh oh!

JorgeMucientes commented Nov 11, 2024

Uh oh!

wpmobilebot commented Nov 11, 2024 •

edited

Loading

Uh oh!

hichamboushaba Nov 11, 2024

Uh oh!

JorgeMucientes Nov 11, 2024

Uh oh!

codecov-commenter commented Nov 11, 2024 •

edited

Loading

Uh oh!

hichamboushaba left a comment

Uh oh!

Uh oh!

JorgeMucientes commented Nov 13, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Issue/12894 blaze cta text input #12899

Issue/12894 blaze cta text input #12899

Uh oh!

Conversation

JorgeMucientes commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing information

The tests that have been performed

Images/gif

Reviewer (or Author, in the case of optional code reviews):

Uh oh!

dangermattic commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JorgeMucientes commented Nov 11, 2024

Uh oh!

wpmobilebot commented Nov 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project dependencies changes

Uh oh!

hichamboushaba Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Nov 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

hichamboushaba left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JorgeMucientes commented Nov 13, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

JorgeMucientes commented Nov 8, 2024 •

edited

Loading

dangermattic commented Nov 8, 2024 •

edited

Loading

wpmobilebot commented Nov 8, 2024 •

edited

Loading

wpmobilebot commented Nov 8, 2024 •

edited

Loading

wpmobilebot commented Nov 11, 2024 •

edited

Loading

codecov-commenter commented Nov 11, 2024 •

edited

Loading