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: Base Login Screens #2266

Merged
merged 13 commits into from
Apr 17, 2020
Merged

Conversation

AmandaRiu
Copy link
Contributor

@AmandaRiu AmandaRiu commented Apr 17, 2020

Closes #1586 by pulling in the new theming added to the WordPress-Login-Lib and implementing the new styles and image assets. This PR does not include the login prologue or custom dialogs not included in the wordpress library. Those are coming next :)

NOTE: the app will crash if you try to login with a store that doesn't have Jetpack installed. That'll be fixed in the next PR when I convert that dialog. 👍

Site address screen

Light Dark
site-1-light site-1-dark

Email screen

Light Dark
email-light email-dark

Email password screen

The field icons have been removed with the latest changes to the wordpress library, but I'm not sure why. I'll have to do more digging to find out why that is so we can work on adding them back in in the next version. Here's what it used to look like for reference:

Screen Shot 2020-04-17 at 2 11 22 AM

Light Dark
email-password-light email-password-dark

Magic Link Request

There wasn't a way to style the avatar in this view so I had to duplicate the image asset.

Light Dark
magic-link-light magic-link-dark

Magic link sent

This screen is also embedded in the WordPress login library so in order to scale the image and move the link, I'll need to implement a new layout override - which can be done in the next version :)

Design Actual
d-magic-link-light

What is my site dialog

This dialog is embedded in the library so the only part I could change at this point is the picture. I'm pretty sure I can override the layout entirely so this change is still possible in the next version

Design Actual
d-site-help-light site-help-light
d-site-help-dark

Site Login

Just like the email password screen, the field icons have been removed with the latest changes to the wordpress library. I'll have to do more digging to find out why that is so we can work on adding them back in in the next version. Here's how the view used to look:

Screen Shot 2020-04-17 at 2 11 41 AM

Light Dark
site-login-light site-login-dark
site-login-email-sent-light site-login-email-sent-dark

AmandaRiu and others added 12 commits April 16, 2020 20:32
c826be2 Merge pull request #35 from wordpress-mobile/feature/login-style-changes-v2
1f6c6e4 Gutenberg/integrate release 1.25.0 with dark mode (#11580)
1d668f5 Merge pull request #11537 from wordpress-mobile/fix/10930-email-error-dissapears-on-rotation
fd66652 store the res id instead of the boolean so it supports multiple errors.
858decb utilized runnable that's posted when the UI has been drawn.
ab37113 removed clearing in text watcher.
3691e84 Fixed config change issues.
fd0c8c9 Merge pull request #34 from wordpress-mobile/merge/WordPress-Android/11492
c134376 Merge commit 'e80a69322fe65ad994bee1854a2343c2089af323' into issue/fix-login-subtree
5269196 Ignore onDiscoverySucceeded events if LoginBaseDiscoveryFragment is detached
775f096 Revert "Feature/material theme and Dark Theme support (#11469)" (#11486)
65d5c8f Feature/material theme and Dark Theme support (#11469)
e80a693 Merge pull request #33 from wordpress-mobile/merge/WordPress-Android/11051
7e46000 Fix validation in input of Email
4f4657f Add requested changes
d80e8e6 Remove whitespaces
b187035 Issue/10930 email address error is preserved on rotation

git-subtree-dir: libs/login
git-subtree-split: c826be2
- Add new basic login theme support. Nothing configured.
Dark Mode: Cleanup Stragglers and minor views
@peril-woocommerce
Copy link

peril-woocommerce bot commented Apr 17, 2020

Fails
🚫

Danger failed to run /app/danger-0.lk2v58b9eao.ts.

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.
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 darkmode/login-theme-1
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/woocommerce-android/2266
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/woocommerce-android/2266 and open a new PR.

Error TypeError

Cannot read property 'diff' of null
TypeError: Cannot read property 'diff' of null
    at checkCommitDiffs (/app/danger-0.lk2v58b9eao.ts:43:49)
    at process._tickCallback (internal/process/next_tick.js:68:7)

Dangerfile

38|         if (git === undefined) {
39|             console.log("About to crash due to an error")
40|             console.log("File:", thisFile)
41|             console.log("Danger Object: ", danger)
42| 
---------------------------------------------------^
43|             if (danger !== undefined) {
44|                 console.log("Danger is no longer defined")
45|             }
46|             else {

Generated by 🚫 dangerJS

@peril-woocommerce
Copy link

peril-woocommerce bot commented Apr 17, 2020

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

@AmandaRiu AmandaRiu marked this pull request as ready for review April 17, 2020 09:14
@AmandaRiu AmandaRiu added Login category: design Layout and style elements in the UI or user interface, including color and animations. labels Apr 17, 2020
@AmandaRiu AmandaRiu added this to In progress in Dark Mode via automation Apr 17, 2020
@AmandaRiu AmandaRiu added this to the 4.1 milestone Apr 17, 2020
@nbradbury nbradbury self-assigned this Apr 17, 2020
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.

Looks good! :shipit:

@nbradbury nbradbury merged commit 645cd83 into feature/darkmode-login Apr 17, 2020
Dark Mode automation moved this from In progress to Merged PRs Apr 17, 2020
@nbradbury nbradbury deleted the darkmode/login-theme-1 branch April 17, 2020 17:01
@AmandaRiu AmandaRiu changed the title Darkmode/login theme 1 Dark Mode: Base Login Screens Apr 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: design Layout and style elements in the UI or user interface, including color and animations. feature: login Related to any part of the log in or sign in flow, or authentication.
Projects
No open projects
Dark Mode
  
Merged PRs
Development

Successfully merging this pull request may close these issues.

None yet

4 participants