Skip to content

🎨 Material 3️⃣#10717

Merged
AlvaroBrey merged 144 commits intomasterfrom
feature/material3
Oct 14, 2022
Merged

🎨 Material 3️⃣#10717
AlvaroBrey merged 144 commits intomasterfrom
feature/material3

Conversation

@AlvaroBrey
Copy link
Member

@AlvaroBrey AlvaroBrey commented Sep 6, 2022

  • needs ui: more theming utilities (for Files) android-common#7
  • change common version to tag
  • background and icons on tabs
  • background to surface for bottom sheets
  • settings activity background color wrong most of the time
  • icon coloring on multi-seclect toolbar
  • overflow menu tinting on profile toolbar
  • adapt color for ripple effect on toolbar MaterialButtons
  • fast scrollers color
  • account selection dialog: the selected "check" is tinted to old primary
  • account info (click on user while in manageaccountsactivity) background is old primary
  • pop-up menu background on content as well as overflow menu background on toolbar are still blue, best to go for generic dark/light grey/white tones and theme hard via styles.xml
  • markwon markdown rendering not respecting dark/light primary color
  • link share details fragment
  • backup contacts and calendars fragment
  • multi-select (actionmode) color is plain wrong
  • preview activity toolbar text color
  • fix theming coloring on screenshot tests
  • colors are default primary right after login (as FDA doesn't refresh after login)
    • FDA does refresh after login, but the user capabilities aren't fetched yet
      • capabilities are fetched in AuthenticatorActivity but not stored
      • done in e7d6715
  • what to do with login/etc screens, and drawer header? it doesn't work very well. see https://github.com/nextcloud/android/tree/m3-firstrun for some attempts
    • Generally we need to discuss what to do with places (like drawer header and login screen) where we used to expect the primary color with no changes.
    • Decided that for now they will be left as is

Fixes #10640, #10643

NOTE FOR REVIEWERS: I suggest enabling "hide whitespace changes" in the github diff for a more pleasant experience

@AlvaroBrey AlvaroBrey changed the title wip: material3:wq wip: material3 Sep 6, 2022
@codecov
Copy link

codecov bot commented Sep 6, 2022

Codecov Report

Merging #10717 (7245e2a) into master (2cbd6d9) will increase coverage by 27.72%.
The diff coverage is 30.97%.

❗ Current head 7245e2a differs from pull request most recent head e9ae7dc. Consider uploading reports for the commit e9ae7dc to get more accurate results

Additional details and impacted files
@@              Coverage Diff              @@
##             master   #10717       +/-   ##
=============================================
+ Coverage      3.25%   30.98%   +27.72%     
- Complexity      419     3220     +2801     
=============================================
  Files           547      538        -9     
  Lines         40738    40475      -263     
  Branches       5624     5628        +4     
=============================================
+ Hits           1327    12542    +11215     
+ Misses        39331    26056    -13275     
- Partials         80     1877     +1797     
Impacted Files Coverage Δ
...java/com/nextcloud/client/di/ComponentsModule.java 0.00% <ø> (ø)
.../java/com/nextcloud/client/jobs/FilesExportWork.kt 0.00% <0.00%> (ø)
...java/com/nextcloud/client/jobs/NotificationWork.kt 0.00% <0.00%> (ø)
...ava/com/nextcloud/client/logger/ui/LogsActivity.kt 0.00% <0.00%> (ø)
...n/java/com/nextcloud/client/media/PlayerService.kt 0.00% <0.00%> (ø)
.../nextcloud/client/onboarding/WhatsNewActivity.java 0.00% <0.00%> (ø)
...ent/widget/DashboardWidgetConfigurationActivity.kt 0.00% <0.00%> (ø)
.../android/authentication/DeepLinkLoginActivity.java 0.00% <ø> (ø)
...loud/android/datamodel/ThumbnailsCacheManager.java 38.77% <0.00%> (+38.77%) ⬆️
...wncloud/android/files/BootupBroadcastReceiver.java 0.00% <ø> (ø)
... and 395 more

@AlvaroBrey AlvaroBrey linked an issue Sep 7, 2022 that may be closed by this pull request
3 tasks
@AndyScherzinger AndyScherzinger force-pushed the feature/material3 branch 2 times, most recently from 65bed8e to 461f292 Compare September 12, 2022 20:55
@AlvaroBrey AlvaroBrey linked an issue Sep 14, 2022 that may be closed by this pull request
@AndyScherzinger AndyScherzinger force-pushed the feature/material3 branch 2 times, most recently from d0dc2a9 to 6a15212 Compare September 25, 2022 08:36
@AndyScherzinger
Copy link
Member

AndyScherzinger commented Sep 25, 2022

Sharing fragment got revamped for m3:

before (M2) after (M3)
share_after share_after

@AndyScherzinger AndyScherzinger changed the title wip: material3 wip: 🎨 Material 3️⃣ Sep 25, 2022
@AndyScherzinger AndyScherzinger changed the title wip: 🎨 Material 3️⃣ WIP: 🎨 Material 3️⃣ Sep 25, 2022
@AndyScherzinger AndyScherzinger force-pushed the feature/material3 branch 8 times, most recently from a23fd35 to 4948ae8 Compare September 28, 2022 13:21
@AlvaroBrey
Copy link
Member Author

@tobiasKaminsky @AndyScherzinger this is finally ready for testing/review. Still pending merge of the common PR and doing a tag release there, before this can be merged.

This ended up, as feared, being a monstrous PR both in terms of amount of commits and modified files. Most changes to existing files are pretty straightforward so I'd recommend focusing on new and deleted files. But specially needed is some smoke testing.

To see a before/after, the easiest way is to use the diff view for the screenshots, which are also updated in this PR.

@AlvaroBrey AlvaroBrey changed the title WIP: 🎨 Material 3️⃣ 🎨 Material 3️⃣ Oct 11, 2022
AlvaroBrey and others added 7 commits October 14, 2022 11:30
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
…date screenshot

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
…bility

Needed to draw the next screen correctly

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
…match app dark mode

Probably a quirk of the severely deprecated PreferenceActivity

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
AlvaroBrey added a commit to nextcloud/android-common that referenced this pull request Oct 14, 2022
Introduces a bunch of new theming functions for common Android and Androidx components

Files PR: nextcloud/android#10717

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Co-authored-by: Andy Scherzinger <info@andy-scherzinger.de>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey
Copy link
Member Author

Rebased on master, fixed conflicts and build errors

This caused the creators to be invisible

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@AlvaroBrey AlvaroBrey marked this pull request as ready for review October 14, 2022 14:06
@AlvaroBrey AlvaroBrey enabled auto-merge (squash) October 14, 2022 14:07
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@github-actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/10717.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@github-actions
Copy link

Codacy

Lint

TypemasterPR
Warnings8584
Errors00

SpotBugs

CategoryBaseNew
Bad practice2828
Correctness4646
Dodgy code355353
Internationalization99
Multithreaded correctness99
Performance5858
Security2828
Total533531

@github-actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/10717.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@nextcloud-android-bot
Copy link
Collaborator

@AlvaroBrey AlvaroBrey disabled auto-merge October 14, 2022 18:30
@AlvaroBrey
Copy link
Member Author

Time to finally merge this and get it into dev! This took a great deal of effort. Thanks @AndyScherzinger for all your contributions, and also thanks @szaimen, @tobiasKaminsky for the help!

@AlvaroBrey AlvaroBrey merged commit ac20b55 into master Oct 14, 2022
@delete-merged-branch delete-merged-branch bot deleted the feature/material3 branch October 14, 2022 18:32
@AlvaroBrey AlvaroBrey added this to the Nextcloud App 3.22.0 milestone Oct 14, 2022
@szaimen
Copy link
Contributor

szaimen commented Oct 14, 2022

🎉🎉🎉🎉🎉

@AndyScherzinger
Copy link
Member

Whoop Whoop! 🎉

Nice to see this being merged 😎

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

🎨 Use Material 3️⃣theming implementation 🎨 Material 3️⃣ [3.21.0 RC1] Settings window theme

4 participants