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.

Sign up for GitHub

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

Jump to bottom

Feature/material theme and Dark Theme support Try. 2 #11498

Closed
wants to merge 727 commits into from
Closed

Feature/material theme and Dark Theme support Try. 2 #11498

wants to merge 727 commits into from

Conversation

khaykov
Copy link
Member

@khaykov khaykov commented Mar 23, 2020 •
edited by marecar3
Loading

Because of the issue in block editor we postponed merging this into develop. Trying to do it again :)

This PR moves app to the material theme and adds Dark Theme support.

This is a feature branch and most of the commits were reviewed.

Gutenberg PR: [RNMobile] - WordPress/gutenberg#21139
Gutenberg Mobile PR: wordpress-mobile/gutenberg-mobile#2061

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 13:34
@khaykov
Fixed name of the variable with number.
41f49f8
@khaykov
Updated button styles.
b1087d0
@oguzkocer
Merge pull request #10970 from wordpress-mobile/issue/10638-material-…
5959aef 
…sharing-settings

Issue/10638 material sharing settings
@khaykov
Cleaning up a bit.
4e3b6cb
@khaykov
Updated editor side.
00baf39
@khaykov
Overloaded styles and colors.
f1a5b24
@khaykov
Updated style of dialogs in Aztec.
2120964
@khaykov
Fixed size of image picker in editor.
a300c81
@khaykov
Merge branch 'issue/10646-material-post-settings' of github.com:wordp…
c78c575 
…ress-mobile/WordPress-Android into issue/11267-aztec-dark-mode
@khaykov
Fixed lint issues.
70b0e5d
@khaykov
Fixed namespace issue.
0bd34fe
@malinajirka
Merge pull request #11169 from wordpress-mobile/issue/10648-material-…
769484e 
…web-preview

Issue/10648 material web preview
@khaykov
Applying separate tint to media button.
d367ee1
@khaykov
Overloading horizontal line drawable with listDivider background.
90c9314
@khaykov
Updated colors.
b43037f
@marecar3
Merge branch 'feature/material-theme' into gutenberg/dark_mode_integr…
ee4f8ec 
…ation
@marecar3
Update gb-mobile reference
9aecf92
@khaykov
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…
cc4bf98 
…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
@khaykov
Merge branch 'feature/material-theme' of github.com:wordpress-mobile/…
2a3124e 
…WordPress-Android into issue/10650-material-me-screen

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java
@khaykov
Merge branch 'feature/material-theme' of github.com:wordpress-mobile/…
64f6fc6 
…WordPress-Android into issue/10649-material-reader-post

# Conflicts:
#	WordPress/src/main/res/values/dimens.xml
@khaykov
Merge branch 'feature/material-theme' of github.com:wordpress-mobile/…
3364fab 
…WordPress-Android into issue/10646-material-login-flow

# Conflicts:
#	WordPress/src/main/res/values/styles.xml
@khaykov
Reverted cast.
852fd13
@khaykov
Merge pull request #11166 from wordpress-mobile/issue/10649-material-…
dc26e26 
…reader-post

Issue/10649 material reader post
@khaykov
Fixed indentation.
a519b5b
@khaykov
WPTextView to extend material version.
adbbae6
@khaykov
Fixed jetpack buttons.
071a498
@khaykov
Removed redundant progress logic from gravatar.
790c838
@khaykov
Removed redundant scroll restoration logic from site creation flow.
7c38e6f
@khaykov
Merge branch 'feature/material-theme' of github.com:wordpress-mobile/…
670c563 
…WordPress-Android into issue/fix-lifecycle-crash-with-appcompat-1-1-0
@khaykov
Fixed about activity navbar color.
3bcd64f
@marecar3 marecar3 self-requested a review March 25, 2020 08:35
@marecar3 marecar3 mentioned this pull request Mar 25, 2020
Closed
3 tasks
@hypest
Copy link
Contributor

hypest commented Mar 31, 2020 •
edited
Loading

FWIW, I managed to pinpoint a commit that seems to be the first to introduce the editor scrolling issue (wordpress-mobile/gutenberg-mobile#2056) and looks to be 5e4f3b0. The one before it (94871fe) doesn't manifest the issue. Note, both commits fail to build on their own. I had to add the PostSettingsCardView style back (see this diff) to temprarily fix the build.

khaykov and others added 12 commits March 31, 2020 15:31
@khaykov
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
71c4aae 
…ss-Android into issue/fix-material-theme-conflicts

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt
#	WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt
#	WordPress/src/main/res/layout/edit_post_settings_fragment.xml
#	WordPress/src/main/res/layout/page_list_item.xml
#	WordPress/src/main/res/values-ar/strings.xml
#	WordPress/src/main/res/values-cs/strings.xml
#	WordPress/src/main/res/values-de/strings.xml
#	WordPress/src/main/res/values-en-rGB/strings.xml
#	WordPress/src/main/res/values-es-rCL/strings.xml
#	WordPress/src/main/res/values-es-rMX/strings.xml
#	WordPress/src/main/res/values-es-rVE/strings.xml
#	WordPress/src/main/res/values-es/strings.xml
#	WordPress/src/main/res/values-fr/strings.xml
#	WordPress/src/main/res/values-he/strings.xml
#	WordPress/src/main/res/values-id/strings.xml
#	WordPress/src/main/res/values-it/strings.xml
#	WordPress/src/main/res/values-ja/strings.xml
#	WordPress/src/main/res/values-ko/strings.xml
#	WordPress/src/main/res/values-nl/strings.xml
#	WordPress/src/main/res/values-pl/strings.xml
#	WordPress/src/main/res/values-ro/strings.xml
#	WordPress/src/main/res/values-ru/strings.xml
#	WordPress/src/main/res/values-sq/strings.xml
#	WordPress/src/main/res/values-sv/strings.xml
#	WordPress/src/main/res/values-tr/strings.xml
#	WordPress/src/main/res/values-zh-rCN/strings.xml
#	WordPress/src/main/res/values-zh-rHK/strings.xml
#	WordPress/src/main/res/values-zh-rTW/strings.xml
#	fastlane/metadata/android/release_notes.xml
@khaykov
Fixed conflict in release notes (reverted to develop version).
5b2e6b6
@khaykov
Fixed conflicts in localized strings.xml (using develop version).
925dda6
@khaykov
Removed duplicate string that got mixed into localized strings file (…
bc304f9 
…replaced with develop version).
@khaykov
Fixed conflicts from aligning Pages list item style to Compact Post l…
619b120 
…ist item.
@khaykov
Fixed conflict in post settings fragment (change in drawable reference).
9677788
@marecar3
Update gb mobile reference
e3d8791
@marecar3
Update gb mobile reference
d194bb2
@marecar3
Update gb mobile reference
182dab0
@oguzkocer @khaykov
Revert language specific string resources to origin/develop versions
45f4540
@oguzkocer @khaykov
Reverse release notes to origin/develop version
4a37ab3
@khaykov
Merge pull request #11570 from wordpress-mobile/issue/fix-material-th…
d2c5d0d 
…eme-conflicts

Issue/fix material theme conflicts
@hypest hypest mentioned this pull request Apr 2, 2020
Merged
3 tasks
@peril-wordpress-mobile
Copy link

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@hypest
Copy link
Contributor

hypest commented Apr 2, 2020

In the effort to try to merge this work to the block editor release (1.25.0, ongoing at the time of writing), we'll stop working on this PR and instead focus on the PR that is targeting the release: #11580

@marecar3
Copy link
Contributor

marecar3 commented Apr 3, 2020

Closing in favor: #11580

@marecar3 marecar3 closed this Apr 3, 2020
@khaykov khaykov deleted the feature/material-theme branch April 15, 2020 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marecar3 marecar3 Awaiting requested review from marecar3

Assignees
No one assigned
Labels
[Type] Enhancement
Projects
None yet
Milestone
14.6
Development

Successfully merging this pull request may close these issues.
8 participants
@khaykov @marecar3 @hypest @oguzkocer @malinajirka @renanferrari @theck13 @planarvoid