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

Gutenberg/integrate release 1.25.0 with dark mode #11580

Conversation

hypest
Copy link
Contributor

@hypest hypest commented Apr 2, 2020

Follow up to #11498 + #11569 to bring the Dark Mode Android feature on top of the v1.25.0 block editor release. This PR includes the block editor scrolling issue fix too.

Related PRs

gutenberg-mobile: wordpress-mobile/gutenberg-mobile#2098

To test:
The Dark Mode features have been tested as part of the individual PRs and this PR just tries to get the feature plus the fix of wordpress-mobile/gutenberg-mobile#2056 into the v1.25.0 release of the block editor.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

khaykov and others added 30 commits February 7, 2020 17:04
…ress-mobile/WordPress-Android into issue/11267-aztec-dark-mode
…web-preview

Issue/10648 material web preview
…id into feature/material-theme

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubfilterListItemViewHolder.kt
#	WordPress/src/main/res/layout/filtered_list_component.xml
…WordPress-Android into issue/10650-material-me-screen

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
…WordPress-Android into issue/10649-material-reader-post

# Conflicts:
#	WordPress/src/main/res/values/dimens.xml
…WordPress-Android into issue/10646-material-login-flow

# Conflicts:
#	WordPress/src/main/res/values/styles.xml
…reader-post

Issue/10649 material reader post
…WordPress-Android into issue/fix-lifecycle-crash-with-appcompat-1-1-0
…notifications-list

Issue/10651 material notifications list and settings
…WordPress-Android into issue/10651-material-notification-details
…id into feature/material-theme

# Conflicts:
#	WordPress/src/main/res/layout/reader_listitem_blog.xml
@hypest
Copy link
Contributor Author

hypest commented Apr 2, 2020

This probably not related to the Dark Mode, and I only encountered it once, and can't repro it anymore:

Doing TC006...

Looks like an older issue and Aztec related at that. There are some reports on Sentry from the past (opened a ticket). Doesn't seem like a blocker for the PR, thanks for reporting @khaykov !

@guarani
Copy link
Contributor

guarani commented Apr 2, 2020

There are some issues with switching between dark and light mode where the block picker bottom sheet doesn't pick up the new color. I had a quick look and haven't seen this reported anywhere.

I also see this happening to the group block "AppenderButton".

Here, after switching to light mode, the block picker is still in dark mode.

@cameronvoell
Copy link
Contributor

cameronvoell commented Apr 3, 2020

More testing see below:

Cover

  • Cover - Add Video Background from WordPress Media library - TC005 steps
  • Cover - Replace media - steps
  • Cover - Gradient background is rendered properly - steps
  • Cover - Gradient overlay is rendered properly - steps

DarkMode

  • Gallery block - Dark mode - steps
  • Shortcode block - Dark mode - steps
  • Media Text block - Dark mode - steps
  • Spacer block - Dark mode - steps
  • Button block - Dark mode - TC005 steps
  • Group - Dark mode - steps

Edit:

  • First cover test here TC005 steps does not seem to be working. I do not see the video playing in the editor in the cover block. Tried with a short 2 second video taken with my phone. Publishing the post did have the video in the cover block show up in the post properly.
  • Dark Mode TC005 steps for button block looks almost exactly like the test shows. I did notice that the "Button color settings are coming soon" text was not showing in the Button settings Bottom Sheet, and it could be revealed by scrolling, but I'm not sure if that's intended or not. See screenshots below:

image

@khaykov
Copy link
Member

khaykov commented Apr 3, 2020

There are some issues with switching between dark and light mode where the block picker bottom sheet doesn't pick up the new color. I had a quick look and haven't seen this reported anywhere.

I also see this happening to the group block "AppenderButton".

Here, after switching to light mode, the block picker is still in dark mode.

Just to clarify, this happens if the theme is switched outside of the app when editor is still open. Reopening the editor fixes the issue.

cc @marecar3

@marecar3
Copy link
Contributor

marecar3 commented Apr 3, 2020

More testing see below:

Cover

  • Cover - Add Video Background from WordPress Media library - TC005 steps

Edit:

  • First cover test here TC005 steps does not seem to be working. I do not see the video playing in the editor in the cover block. Tried with a short 2 second video taken with my phone. Publishing the post did have the video in the cover block show up in the post properly.

Hey, @cameronvoell @hypest I have tested the issue with video in a cover block against this branch and I didn't manage to reproduce it on my Pixel 3, Android 10.

Test material was:

  • longer download video from the web
  • longer taken video by my phone
  • 2 secs video taken by my phone (it's not presented in bellow .gif but it's working)

ezgif com-video-to-gif (20)

@SergioEstevao
Copy link
Contributor

For the record I also managed to create a cover with a video in Android, and it was playing the video in the editor. @cameronvoell did you just created and uploaded the video before trying to use it? I was thinking if it was some video processing delay on the server going on.

@marecar3
Copy link
Contributor

marecar3 commented Apr 3, 2020

Dark Mode TC005 steps for button block looks almost exactly like the test shows. I did notice that the "Button color settings are coming soon" text was not showing in the Button settings Bottom Sheet, and it could be revealed by scrolling, but I'm not sure if that's intended or not. See screenshots below:

I can also reproduce this behavior and I am also not sure if it's intended or not.

@marecar3
Copy link
Contributor

marecar3 commented Apr 3, 2020

There are some issues with switching between dark and light mode where the block picker bottom sheet doesn't pick up the new color. I had a quick look and haven't seen this reported anywhere.

I also see this happening to the group block "AppenderButton".

Here, after switching to light mode, the block picker is still in dark mode.

Good catch @guarani, I can also reproduce it on the Android device and not on the iOS device.

@hypest hypest requested a review from marecar3 April 3, 2020 12:13
@hypest
Copy link
Contributor Author

hypest commented Apr 3, 2020

First cover test here TC005 steps does not seem to be working. I do not see the video playing in the editor in the cover block. Tried with a short 2 second video taken with my phone. Publishing the post did have the video in the cover block show up in the post properly.

I'm able to see the issue on my end. It could be something related to what @SergioEstevao said above, since I do see the video starting after letting the block stay there for a bit. It's unfortunate that the block background in Dark Mode is full black, making it look like there's nothing there. I've opened a ticket about it but I don't think it's a blocker.

@hypest
Copy link
Contributor Author

hypest commented Apr 3, 2020

Dark Mode TC005 steps for button block looks almost exactly like the test shows. I did notice that the "Button color settings are coming soon" text was not showing in the Button settings Bottom Sheet, and it could be revealed by scrolling, but I'm not sure if that's intended or not.

It's obviously unfortunate that that sheet is long enough that it reaches the limit of expanding vs scrolling. I expect that to be a bit random anyway, depending on the device screen too so, I don't think this is a blocker.

@hypest
Copy link
Contributor Author

hypest commented Apr 3, 2020

The "residual dark mode" that @guarani found and @marecar3 verified, happening when device changes theme while in the editor is an annoyance but should happen too often. @marecar3, please open a ticket about it to be handled separately, but this is not a blocker in the meantime.

@hypest hypest removed the request for review from cameronvoell April 3, 2020 12:43
@marecar3
Copy link
Contributor

marecar3 commented Apr 3, 2020

The "residual dark mode" that @guarani found and @marecar3 verified, happening when device changes theme while in the editor is an annoyance but should happen too often. @marecar3, please open a ticket about it to be handled separately, but this is not a blocker in the meantime.

Thanks. Here is the opened issues: wordpress-mobile/gutenberg-mobile#2108

Copy link
Contributor

@marecar3 marecar3 left a comment

Choose a reason for hiding this comment

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

LGTM! 🚀

@marecar3 marecar3 merged commit 4585d19 into gutenberg/integrate_release_1.25.0 Apr 3, 2020
@marecar3 marecar3 deleted the gutenberg/integrate_release_1.25.0-with-dark-mode branch April 3, 2020 14:52
@hypest hypest restored the gutenberg/integrate_release_1.25.0-with-dark-mode branch April 6, 2020 07:32
hypest added a commit that referenced this pull request Apr 6, 2020
@designsimply designsimply mentioned this pull request May 2, 2020
AmandaRiu added a commit that referenced this pull request May 23, 2020
cfc0675d21 Add title to the layout override for the site help dialog
63fc73efa0 Use wrap_content for image width so wider images will scale better
68b0c58437 Merge commit '8487e6f4cfee09193f48b803fcf1eb2252355022' into darkmode/login-theme-1
c826be2ccb Merge pull request #35 from wordpress-mobile/feature/login-style-changes-v2
1f6c6e4bca Gutenberg/integrate release 1.25.0 with dark mode (#11580)
1d668f54a5 Merge pull request #11537 from wordpress-mobile/fix/10930-email-error-dissapears-on-rotation
fd6665242f store the res id instead of the boolean so it supports multiple errors.
858decb8b1 utilized runnable that's posted when the UI has been drawn.
ab37113dbf removed clearing in text watcher.
3691e848b8 Fixed config change issues.
fd0c8c97e8 Merge pull request #34 from wordpress-mobile/merge/WordPress-Android/11492
c134376ee6 Merge commit 'e80a69322fe65ad994bee1854a2343c2089af323' into issue/fix-login-subtree
526919648d Ignore onDiscoverySucceeded events if LoginBaseDiscoveryFragment is detached
775f096826 Revert "Feature/material theme and Dark Theme support (#11469)" (#11486)
65d5c8f67b Feature/material theme and Dark Theme support (#11469)
e80a69322f Merge pull request #33 from wordpress-mobile/merge/WordPress-Android/11051
40824a4333 Merge commit '0c3930794ed0c77e4926d334674e85263ef2a651' into update_login_lib_with_signup_sheet_nav_bar_buttons_visibility_fix
fec863d2f8 Resolved merge conflict by removing SignupBottomSheetDialog.java file.
f2d8c102ad Merge branch 'develop' into issue/10908-navigation-bar-buttons-not-visible-with-signup-sheet
7e46000166 Fix validation in input of Email
fccc72b9a4 Merge pull request #32 from wordpress-mobile/merge/WordPress-Android/11172
d634c91e9f Merge commit '371f14160a780fbd7797d71921859d0fee5764d5' into update-login-lib-with-password-toggle-fix
cd81dd1ce9 Add custom selector for password button
8f444b2d13 Merge branch 'issue/10908-navigation-bar-buttons-not-visible-with-signup-sheet' of https://github.com/wordpress-mobile/WordPress-Android into issue/10908-navigation-bar-buttons-not-visible-with-signup-sheet
b53dda144c Add null check for design_bottom_sheet layout
521d09f42c Update libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPBottomSheetDialogFragment.java
7178f5c123 Show full width navigation bar and restrict max width for large screens
8a768d3dd2 Partial fix for terms of service announcement bering read twice.
989fb1d5a2 Remove empty line after brace
2d5d733080 Extract parts of code from onCreateView to onViewCreated
a24d5289ab Eliminate setRetainInstance(true)
2e71a00135 Remove dialog.setOnDismissListener
cfff7a060d Avoid using a parameter in Fragment's constructor
8b09b2d836 Convert BottomSheetDialog to BottomSheetDialogFragment and update styles
a87d595f7a Merge pull request #1796 from woocommerce/release/merge-3.3
f18c390619 Fix signup bottom sheet navigation bar buttons not visible issue
4f4657fb64 Add requested changes
e407a7f304 Revert erroneously deleted code during merge
821d29b90b Revert erroneously deleted code during merge
188cc0ee64 Check if view is null before accessing property
1a4414eec7 Merge commit 'bd659986940153549bfc26a8f6a4104bf748fe3c' into hotfix/1778-npe
d2b8135e1e Added logic to fetch the correct SiteModel from the local db for the incoming url
d80e8e616d Remove whitespaces
b18703520d Issue/10930 email address error is preserved on rotation
3421ca9534 Merge branch 'develop' into test
a20471e8c1 Merge branch 'develop' of https://github.com/woocommerce/woocommerce-android into feature/refund-by-items-master
7757f052b7 Merge branch 'develop' into feature/edit-product-master
f869be0bfc Merge branch 'feature/refund-by-items-master' into 0nko/refund-items-list
ea896f6172 Merge pull request #10833 from wordpress-mobile/issue/10832-fix-npe-in-login-fragment
64678168e4 check if listener is null before handling discovery error
1de03a5522 check if listener is null before handling discovery error
a6e0946af0 Update gradle plugin to version 3.5.3
a23213aa25 Fixed wrong key variable
c89899f001 Updated Glide version to 4.10.0 in the login module
2dd431ccdd Updated Glide version in the login lib
e3211148cd Merge pull request #10787 from wordpress-mobile/anitaa/woo-login-changes
00f6bd2e62 Added flag that checks if login has started.
d5e8683cf6 Added period to login with site credentials
eee4c53fa7 Fixed bug when the forgot password url in username password screen was not valid
2810b14e28 Upgrade gradle plugin to version 3.5.2
daf7384622 Merge pull request #1552 from woocommerce/login-lib-changes
f75cbaaacd Merge commit '4e588147352f8fe88f1417a03a00114dd7d51640' into login-lib-changes
b2d28c652d Add signup flow name parameter to signup auth email request

git-subtree-dir: libs/login
git-subtree-split: cfc0675d2167b938369cf1896083453a593e9b8e
mzorz added a commit that referenced this pull request Jun 12, 2020
1a43e016c6 Merge pull request #29 from wordpress-mobile/issue/28-empty-img-tag-crash-fix
a4c24373e5 Updated the release version to 1.24
a33296f4d6 Check if img source is null before checking for image smileys
1dd7406ad5 Merge pull request #27 from wordpress-mobile/combined-updates-from-wpandroid
b918b23ac5 Check if announcement is available in App Settings before showing option. Updated AppLog to include announcement related tracker.
94e23e28c1 Rename build.gradle fields with invalid name syntax
d0be1240ca Make sure url utils recognizes atomic image proxy as valid image url.
9bdbdff3a9 Merge branch 'feature/support-private-at-sites' of https://github.com/wordpress-mobile/WordPress-Android into feature/support-private-at-sites
fcc5c99e37 Updated Photon utils to utilize new url for private AT proxy.
130195092f Gutenberg/integrate release 1.25.0 with dark mode (#11580)
a25096c291 Restoring Utils lib version to 1.24
edfef1e58c Merge branch 'develop' into issue/11249-media-not-load-jetpack
60d516266e Merge pull request #11536 from wordpress-mobile/add/log-persistence
1aceca9950 Make the linter happy
18c8447fe3 Change provider visibility
dac4e5ce38 Fixes to LogFileHelpersTest
76f9f75f5d Variablize recent created files test
a4d0a773e7 Small fixes for LogFileCleanerTest
24ac53fabf Make the queue private
64ea6a8cdf Use correct hungarian notation for static member
1c978ca61a Refactor tests to match project refactoring
565b88903c Persist log files in a background thread
3ae86d48e4 Refactor LogEntry.toString method
b900bdda83 Refactor LogFileHelpers to not use context and be a LogFileProvider
225e1db645 Upgrading lib version.
6fd47e8eb6 Using the assertThat pattern.
0948a93056 Adding connected testing.
dc5c2e3cd6 Refactor LogFileWriter to use LogFileProvider instead of context
2d5d0b65c0 Refactor LogFileCleaner to not need context and use a LogFileProvider instead
84b7a8a87d Minor changes in LogFileWriter to make it more idiomatic
8cfa0950aa Merge branch 'develop' into issue/11249-media-not-load-jetpack
31a14daeb4 Bump the utils minSdkVersion to 18
f65fd78414 Add log persistence
fe3960d6b7 Updating ssl logic for photon addresses.
1b4b31bf88 Merge pull request #11524 from wordpress-mobile/fix/wordpressutils-tests
6c80419806 Fix WordPressUtils tests
def5be4e88 Revert "Feature/material theme and Dark Theme support (#11469)" (#11486)
16540e85f1 Feature/material theme and Dark Theme support (#11469)
0ae297bbd3 Adding ssl parameter to query for Photon https.
89725645a6 made method name more meaningful.
76343d3d6d Added util function to check if a Uri is a content one.
75790052ef Merge pull request #11072 from wordpress-mobile/issue-10843/latitude_fix_api_29
981eb82158 Merge branch 'develop' into try/media-upload-completion-processor
8799a19ec4 removes safe check due to nature of RecyclerView
7906f07645 Fixed latitude missing column issue on api 29
882a64faf3 updated gradle wrapper of utils project.
b012d38c3f resolved conflicts and merged utils subtree
e8aae6d282 Merge branch 'develop' into try/media-upload-completion-processor
da19376391 Add MediaFile method to generate attachment page url
e35a9e0cd8 Used delegate safe method for focused accessibility event listener
de02499434 Merge remote-tracking branch 'origin/develop' into issue/10894-aztec-media-talkback
1812393e22 Added accessibility heading
30aa9a3132 Added a safe way to set accessibility delegates.
870518ff07 Moved method to util class that's more appropriate for it's behavior
a998f6e877 added annotations to event listener method
43013a5a79 Moved behavior to Utils so that it can be replicated in other areas.
54ca204429 Removed unused imports.
373db7c13f Removed unneeded whitespace and added necessary whiteline
785da6617b WP Media Picker now announces when an image is selected.
75f0913259 "Done" button now has a content description of "Cancel"
42ec1fb96c Disabled hint announcements and applied accessibility headings
916e2b0d96 Add comment to downloadExternalMedia method
573ba7f5e8 Clean up AddMediaToEditor logic
dda3a1ebb8 Merge pull request #10565 from wordpress-mobile/clean-up-after-legacy-editor
d84fb1f61f Upgrade Gradle to 5.4.1, gradle plugin to 3.5.1 and fix various errors
0511354994 Remove WPEditText
19d3f4aaf0 Optimize AppLog
b4401cd84f Fix simple date format concurrency issue
15ee1b27d0 Remove usages of buggy DateTimeUtils methods
e9f01e5e3c Fixed loop.
47eec63356 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into issue/9815-email-verification-reminder
25d1310312 Fix AndroidX import order
a21c7120d8 Fix import ordering for androidx
35b99bc73e Migrate to AndroidX
d40e8773bb Merge branch 'issue/9815-create-call-to-action' into issue/9815-add-reminder-message
892eacce49 Make getPath private again
ae6291c612 Use existing method instead of creating a new one in MediaUtils
10b59f8d06 Implement comments from PR
f1b21d0acc Add logging for the failing cases
702881b26f A crash fix for uploaded docs
cc1c0334a8 Added reminder message toast after domain has been registered
9a14564929 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into issue/9452-domain-suggestions
a4d8873a2e Update style config from style-config-android
1c10935b8c Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into issue/9452-domain-suggestions
971cf76d96 Remove unused get snackbar duration method from accessibility utils class
28b0685ae7 Update is accessibility enabled method in accessibility utils for simplicity
a418cb7dc8 Update get snackbar duration method in accessibility utils for indefinite constant
e0dd4824c9 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into issue/9452-domain-suggestions
506f9883ce refactored ToastUtils to be able to pass gravity as param. Also showing toast after back-dating a scheduled post on top anchor now
e164cd7a61 Fixing merge conflicts from domain register branch.
586222ec51 Merge pull request #8164 from usamahamid/feature/domain-register
50de29e20a Introduced Domain Suggestion Network request in ViewModel

git-subtree-dir: libs/utils
git-subtree-split: 1a43e016c63bd9dc19f3e27d39b8dc1cba7c5263
@khaykov khaykov deleted the gutenberg/integrate_release_1.25.0-with-dark-mode branch June 26, 2020 02:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.