Skip to content
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

Dark Mode v2: Site address help #2330

Merged
merged 3 commits into from
Apr 28, 2020
Merged

Conversation

AmandaRiu
Copy link
Contributor

@AmandaRiu AmandaRiu commented Apr 28, 2020

This PR fixes #2325 by overriding the site address help dialog to better match designs. The most recent designs call for the image to be on top, then the title, then the body. Since the login library is shared, the closest I could get was to override the dialog content layout which places the image above the body - but cannot move the title since that's set in the login library when setting the alert dialog title.

@Garance91540 This is the closest I could get by overriding the login library layout. The dialog text is set programmatically in the login library and that's where android places the title - so overriding the layout only changes the body and image arrangement. Ideally we'd not be overriding layout files just because it then makes it difficult to track where to make changes, but if you think the changes are worth it, we can push it. Here are the comparisons:

Never mind! I figured out a clean way to do this :) I just check if the login mode is "Woo" and only add the title if it's not. This way we could add the title to the layout as well. Updated the screenshots. I also updated the dialog theme to fix the padding on the button bars so they are 24dp.

Design v1 v2
Screen Shot 2020-04-27 at 5 41 49 PM Screen Shot 2020-04-27 at 5 39 55 PM Screen Shot 2020-04-28 at 11 49 44 AM
Screen Shot 2020-04-27 at 5 41 58 PM Screen Shot 2020-04-27 at 5 42 26 PM Screen Shot 2020-04-28 at 11 49 58 AM

Update release notes:

  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

The most recent designs call for the image to be above the text.
Since the login library is shared, the closest I could get was to
override the dialog content layout - but cannot include the title
arrangement changes since that's set on the dialog in the login library.
@AmandaRiu AmandaRiu added the needs: design Requires design input/work from a designer. label Apr 28, 2020
@AmandaRiu AmandaRiu added this to the 4.2 milestone Apr 28, 2020
@AmandaRiu AmandaRiu added this to In progress in Dark Mode v2 via automation Apr 28, 2020
@AmandaRiu AmandaRiu moved this from In progress to Review in Dark Mode v2 Apr 28, 2020
@peril-woocommerce
Copy link

peril-woocommerce bot commented Apr 28, 2020

You can test the changes on this Pull Request by downloading the APK here.

@AmandaRiu
Copy link
Contributor Author

Actually, let me take another look at this. Since it's just a title, moving it all into the view may not be a big deal...

@peril-woocommerce
Copy link

peril-woocommerce bot commented Apr 28, 2020

Warnings
⚠️ PR is missing at least one label.
Messages
📖

This PR contains changes in the subtree libs/login/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPress-Login-Flow-Android. Follow these handy steps!
WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history!

  1. cd woocommerce-android
  2. git checkout darkmodev2/2325-site-add-help
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/woocommerce-android/2330
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/woocommerce-android/2330 and open a new PR.

Generated by 🚫 dangerJS

@AmandaRiu AmandaRiu marked this pull request as ready for review April 28, 2020 04:24
Copy link

@Garance91540 Garance91540 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking great! Thank you!

@nbradbury nbradbury removed the needs: design Requires design input/work from a designer. label Apr 28, 2020
@nbradbury nbradbury self-assigned this Apr 28, 2020
@nbradbury nbradbury self-requested a review April 28, 2020 19:19
Copy link
Contributor

@nbradbury nbradbury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Dark Mode v2
  
Done
Development

Successfully merging this pull request may close these issues.

Dark Mode v2: Site Address Help
3 participants