Issue/fix material theme conflicts#11570
Conversation
popUpToInclusive is set to skip showing preview fragment on returning from ucrop fragment
Using popUpToInclusive for popping the start destination of the graph off the back stack in a multi-module project doesn't seem to be working. Explicitly invoking back action as a workaround. Related issue: https://issuetracker.google.com/issues/147312109
…ad-utils-post-msgs Add unit tests for UploadUtils getErrorMessageResId
…op-with-high-res-image Issue/11145 start ucrop with high res image
…nking-urls Untangle http:// and wordpress:// deeplinking URLs
…-stats-in-post-detail Fix empty stats in post detail
…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
…replaced with develop version).
Generated by 🚫 dangerJS |
|
You can test the changes on this Pull Request by downloading the APK here. |
There was a problem hiding this comment.
@khaykov I had a look at all 5 new commits and compared the branch to develop and unfortunately it looks like we still have some changes in the localization files and the release notes. I honestly don't understand what the differences are in some cases, but git definitely shows that there are changes. Here is how to check that:
git diff origin/develop $PATH_TO_FILE_OR_FOLDER
So when you run the following:
git diff origin/develop WordPress/src/main/res/*/strings.xml
You shouldn't see any changes that you haven't done yourself.
I don't know how you resolved these conflicts, but there is a super easy way to revert any file or folder to its version in another branch:
git checkout origin/develop $PATH_TO_FILE_OR_FOLDER
For release notes, that's super easy to do and will result in 0f9c9b8.
For localization, it's a bit more involved because there are so many files. The following would normally work:
git co origin/develop WordPress/src/main/res/values-**/strings.xml
However, in this case, this will result in git complaining about not knowing values-v28 and values-v29 folders. To get around that, you can pass in the -p argument to the previous command which will let you pick each patch manually. You can pretty much say yes to almost all the files except for a couple you have made changes to. This will result in 0f9c9b8.
Please have a look at these commits and make sure that they make sense. I suggest opening the develop version of a file and comparing it to the resulting string from these commits. One of them that I checked was https://github.com/wordpress-mobile/WordPress-Android/blob/develop/WordPress/src/main/res/values-el/strings.xml which you'll notice have a translation date of 2020-02-28 09:54:01+0000 which is different in your PR as 2019-10-15 10:29:56+0000.
Once you verify them, you can use the cherry-pick command to add both of these to this PR:
git cherry-pick 57dae949f5f13d326f73bdb2270246130efa989f 0f9c9b8de552212ea93edc2b7ac44ce976127c00
The other changes makes sense to me, but I suggest @malinajirka to look at it as well just to be sure. I did a quick test run of the dark theme and it looked all right, but Jirka if you can do the same it'd be even better!
Hope this helps!
P.S: I had to do some corrections to this comment after I posted it because the preview didn't work for a comment this big. 🙈
|
@oguzkocer Thank you so much for actionable commits and explanation of the process! Now I know what do if I'll encounter something like this next time 🙇I checked the difference with Still, no idea how it got all messed up like this, and why some lines are marked as changed. Maybe different whitespace character? |
I have no idea either, with the whitespace that was my guess too, but there are some other changes that shouldn't be in the feature branch I don't think. I wonder if any of the auto-merges caused that. I think this PR is good as is, but once it's merged I suggest checking if any other files are unintentionally modified. I wrote a p2 post about this just now, so have a look at that and feel free to ping me if you need help. |
|
@malinajirka We are a bit time pressured with this PR, so if you think there are any visual changes required to Pages items - let me know and I'll add them :) |
|
I'm sorry, I totally missed the ping. I've checked it and it looks good overall. I found one potential design issue not related to the merge - when a page is being uploaded a disabled overlay is shown. However, this overlay looks a bit weird in dark mode. Wdyt?
Note: Btw the same issue is present on the post list. |
This PR fixes conflicts between
feture/material-themeanddevelopbranches.Check the last 5 commits for fixes. We had conflicts in:
Outside of this, the only major conflict was related to recent update to Pages list item, that was aimed at visually matching them with the compact Post List item. I made sure the changes visually match each other and Material Theme:
To test:
PR submission checklist:
RELEASE-NOTES.txtif necessary.