android
android copied to clipboard
wip: material3
warning: very early stages, do not do anything with this yet
- [ ] needs https://github.com/nextcloud/android-common/pull/7
- [x] background and icons on tabs
- [x] background to surface for bottom sheets
- [x] settings activity background color wrong most of the time
- [ ] preview activity toolbar text color
- [ ] fix theming coloring on screenshot tests
- [ ] icon coloring on multi-seclect toolbar
- [x] overflow menu tinting on profile toolbar
- [x] adapt color for ripple effect on toolbar
MaterialButtons - [x] fast scrollers color
- [x] account selection dialog: the selected "check" is tinted to old primary
- [x] account info (click on user while in manageaccountsactivity) background is old primary
- [ ] account info (click on user while in manageaccountsactivity) colors are default primary right after login (as FDA doesn't refresh after login)
- [ ] 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
- [x] markwon markdown rendering not respecting dark/light primary color
Fixes #10640, #10643
NOTE FOR REVIEWERS: I suggest enabling "hide whitespace changes" in the github diff for a more pleasant experience
Codecov Report
Merging #10717 (7245e2a) into master (2cbd6d9) will increase coverage by
27.72%. The diff coverage is30.97%.
:exclamation: 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%) |
:arrow_up: |
| ...wncloud/android/files/BootupBroadcastReceiver.java | 0.00% <ø> (ø) |
|
| ... and 395 more |
Sharing fragment got revamped for m3:
| before (M2) | after (M3) |
|---|---|
![]() |
![]() |
@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.
seems you removed all dividers except the one for folder info. Is this intentional?
@AlvaroBrey yes, that was one of the feedback items from the designers in the m3 files app review call.
Fine by me from a smoke testing perspective since I run this branch as my production setup since the beginning.
Only bug I consistently have is that the theming of the settings activity is mixed (light toolbar, dark content, separator lines) when opening the first time, but is okay the second time (light toolbar, light content, no separator lines) on my OP9Pro on Android 12.
I just tested this and it looks good 🚀 some small details are something for follow-ups.
However it seems like that templates are not shown anymore. Not sure though if that bug is already present in master.
| 3.21.2 | this pr |
|---|---|
![]() |
![]() |
@szaimen this works fine for me on c.nc.c could you maybe test there again so we know it's is not a server issue you are facing?
@szaimen this works fine for me on c.nc.c could you maybe test there again so we know it's is not a server issue you are facing?
Since this is the exact same account on the same server I don't think it is a server issue ;)
I use the external storage app if that is important
@AndyScherzinger I can open an issue if you think that the issue is unrelated ot this PR :)
@szaimen yes please and maybe send a test account to the devs? :) And yes, external storage might play a role, can't say for sure but then the client shouldn't matter imho.
@szaimen try dragging the bottomsheet up. It doesn't auto-expand anymore I think. We should probably add a drag indicator or something
@szaimen try dragging the bottomsheet up. It doesn't auto-expand anymore I think. We should probably add a drag indicator or something
I tried but they are simply not shown :/
Another thing: the plus butron should be greyed out when the directory is read only:

Edit by repo admin: put the screenshot in a collapsed section
Another thing: the plus button should be greyed out when the directory is read only:
fixed via https://github.com/nextcloud/android/pull/10717/commits/09bbded5679f8ba3a2fbcdbe2b2227df27b54c54 thanks @szaimen
Moved the file template problem to https://github.com/nextcloud/android/issues/10798
Fine by me from a smoke testing perspective since I run this branch as my production setup since the beginning.
Only bug I consistently have is that the theming of the settings activity is mixed (light toolbar, dark content, separator lines) when opening the first time, but is okay the second time (light toolbar, light content, no separator lines) on my OP9Pro on Android 12.
I can no longer reproduce that since https://github.com/nextcloud/android/pull/10717/commits/4d6f74e22bb01051f987857aab38757260b1bf0c, are you sure it's still happening on this branch when up to date?
I can no longer reproduce that since https://github.com/nextcloud/android/commit/4d6f74e22bb01051f987857aab38757260b1bf0c, are you sure it's still happening on this branch when up to date?
Yes, constantly on my phone, I'll check if reproducable in an emulator
Yes, constantly on my phone, I'll check if reproducable in an emulator
Actually I can reproduce it, although only the dividers, not the rest.

Initial launch of settings on Android 12 with-google-api x86_64bit emulator
@AlvaroBrey looking at the light color of the settings screen text I expect it is just the background color that went wrong
Rebased on master, fixed conflicts and build errors
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/10717.apk
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
Codacy
Lint
| Type | master | PR |
| Warnings | 85 | 84 |
| Errors | 0 | 0 |
SpotBugs
| Category | Base | New |
|---|---|---|
| Bad practice | 28 | 28 |
| Correctness | 46 | 46 |
| Dodgy code | 355 | 353 |
| Internationalization | 9 | 9 |
| Multithreaded correctness | 9 | 9 |
| Performance | 58 | 58 |
| Security | 28 | 28 |
| Total | 533 | 531 |
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/10717.apk
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/6279-IT-master-16-27
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!
🎉🎉🎉🎉🎉
Whoop Whoop! 🎉
Nice to see this being merged 😎



