-
Notifications
You must be signed in to change notification settings - Fork 133
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/6881 what is wordpress #6891
Conversation
- The goal is to be able to change the UI freely from WooCommerce - Converted into Kotlin
…ouple-login-with-email-from-lib # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
@@ -0,0 +1,18 @@ | |||
package com.woocommerce.android.di |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WordPress login lib uses Dagger to inject deps on fragments. Since WooLoginEmailFragment
and WooLoginSiteAddressFragment
inherit from fragments that belong to the Login lib that are injecting their deps using:
@Override
public void onAttach(Context context) {
AndroidSupportInjection.inject(this);
super.onAttach(context);
}
So we need this module for injected deps in these fragments to work. The Hilt approach of annotating the fragment with @AndroidEntryPoint
won't work if the fragment also invokes:
AndroidSupportInjection.inject(this);
You can test the changes on this Pull Request by downloading an installable build, or scanning this QR code: |
Codecov Report
@@ Coverage Diff @@
## trunk #6891 +/- ##
============================================
- Coverage 44.57% 44.56% -0.02%
- Complexity 3007 3008 +1
============================================
Files 539 539
Lines 29828 29819 -9
Branches 3945 3942 -3
============================================
- Hits 13296 13289 -7
+ Misses 15291 15289 -2
Partials 1241 1241
Continue to review full report at Codecov.
|
<com.google.android.material.button.MaterialButton | ||
android:id="@+id/login_what_is_wordpress" | ||
style="@style/Widget.LoginFlow.Button.Tertiary" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:layout_marginStart="@dimen/margin_extra_large" | ||
android:layout_marginEnd="@dimen/margin_extra_large" | ||
android:text="@string/what_is_wordpress_link" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toBottomOf="@+id/login_continue_button" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copy pasted this layout file from the WordPress login library and then added this change.
Generated by 🚫 dangerJS |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code looks good, and feature works good
@JorgeMucientes this can be merged after fixing the merge conflict |
Closes: #6881
Description
Part of Experiment 2: Add more information about the login process in pe5sF9-6C-p2
Adds a new link to log in with WordPress email screen that redirects to web site explaining why WordPress.com is needed to log in inside WooCommerce
Additionally this PR decouples
LoginSiteAddressFragment
andLoginEmailFragment
from WordPress login library. This enables us to add changes to the UI in these 2 screens without updating the library.Testing instructions
unified_login_interaction, Properties: {"source":"default","flow":"wordpress_com","step":"enter_email_address","click":"what_is_wordpress_com","is_debug":true}
with property value"click":"what_is_wordpress_com"
is tracked in console log.Images/gif
LinkWhatIsWordPress.mp4
RELEASE-NOTES.txt
if necessary.