Enh/dark theme optimizations #6332

AndyScherzinger · 2020-06-22T16:50:14Z

Resolves #6323

edge case improvements (dark/light):

active drawer menu item contrast
primary button coloring

OPEN

light-theme+white for MaterialButtons
dark-theme+white for MaterialButtons
FAB coloring black/white extreme scenarios for dark/light themes
probably any MaterialButton (maybe add a theming method for buttons handling all edge cases and securing consistent theming, to be done for standard and borderless buttons)
replace use of elementColor(...) with primaryColor(...) and drop method

cc @dan0xii for collaboration

Testing

Writing tests is very important. Please try to write some tests for your PR.
If you need help, please do not hesitate to ask in this PR for help.

unit tests
instrumented tests
UI tests

Tests written, or not not needed

nextcloud-android-bot · 2020-06-23T09:39:46Z

master-Unit test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14587-Unit-master

nextcloud-android-bot · 2020-06-23T09:43:38Z

stable-Unit test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14587-Unit-stable

AndyScherzinger · 2020-06-23T10:10:56Z

Button coloring examples

`#ffffff` server primary, client light theme	`#ffffff` server primary, client dark theme

`#000000` server primary, client light theme	`#000000` server primary, client dark theme

@jancborchardt see screenshots above this is the edge case handling I created for light/dark scenarios and primary buttons. Would this be fine for you?

Default Nextcloud blue

`#0082C9` server primary, client light theme	`#0082C9` server primary, client dark theme

jancborchardt

Looks veeeery nice! :)

nextcloud-android-bot · 2020-06-23T14:09:32Z

master-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

nextcloud-android-bot · 2020-06-23T14:12:13Z

stable-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14597-Screenshot-stable

nextcloud-android-bot · 2020-06-24T20:57:35Z

stable-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14633-Screenshot-stable

nextcloud-android-bot · 2020-06-24T20:58:24Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14633-Screenshot-master

nextcloud-android-bot · 2020-06-24T21:55:21Z

stable-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

nextcloud-android-bot · 2020-06-24T21:55:43Z

master-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

nextcloud-android-bot · 2020-06-24T21:57:49Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14639-Screenshot-master

nextcloud-android-bot · 2020-06-24T22:01:13Z

stable-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

nextcloud-android-bot · 2020-06-24T22:21:17Z

stable-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14640-Screenshot-stable

nextcloud-android-bot · 2020-06-24T22:26:29Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14640-Screenshot-master

nextcloud-android-bot · 2020-06-24T22:35:06Z

stable-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

nextcloud-android-bot · 2020-06-24T22:38:56Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14641-Screenshot-master

nextcloud-android-bot · 2020-06-25T11:07:45Z

stable-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14646-Screenshot-stable

nextcloud-android-bot · 2020-06-25T11:09:03Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14646-Screenshot-master

nextcloud-android-bot · 2020-06-25T11:18:16Z

stable-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14648-Screenshot-stable

nextcloud-android-bot · 2020-06-25T11:18:30Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14648-Screenshot-master

nextcloud-android-bot · 2020-06-25T22:53:14Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14690.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.

nextcloud-android-bot · 2020-06-25T23:00:37Z

stable-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14690-Screenshot-stable

nextcloud-android-bot · 2020-06-25T23:02:10Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14690-Screenshot-master

nextcloud-android-bot · 2020-06-25T23:06:04Z

Codacy

391

Lint

Type	master	PR
Warnings	85	85
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	61
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	339

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	62
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	340

nextcloud-android-bot · 2020-06-25T23:34:55Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14694.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.

nextcloud-android-bot · 2020-06-25T23:38:45Z

master-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14694-Screenshot-master

nextcloud-android-bot · 2020-06-25T23:42:02Z

stable-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/14694-Screenshot-stable

nextcloud-android-bot · 2020-06-25T23:42:53Z

Codacy

391

Lint

Type	master	PR
Warnings	85	85
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	61
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	339

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	62
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	340

Signed-off-by: Andy Scherzinger <[email protected]>

…button theming Signed-off-by: Andy Scherzinger <[email protected]>

Signed-off-by: Andy Scherzinger <[email protected]>

nextcloud-android-bot · 2020-06-26T13:22:40Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14723.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.

… [skip ci] Signed-off-by: nextcloud-android-bot <[email protected]>

nextcloud-android-bot · 2020-06-26T13:36:00Z

Codacy

391

Lint

Type	master	PR
Warnings	85	85
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	61
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	339

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	62
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	340

nextcloud-android-bot · 2020-06-26T13:39:03Z

Here is an overview of what got changed by this pull request:

Complexity increasing per file
==============================
- src/main/java/com/owncloud/android/utils/ThemeUtils.java  1

See the complete overview on Codacy

nextcloud-android-bot · 2020-06-26T13:52:42Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14724.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.

nextcloud-android-bot · 2020-06-26T14:04:48Z

Codacy

391

Lint

Type	master	PR
Warnings	85	85
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	61
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	339

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	27
Correctness Warnings	62
Internationalization Warnings	9
Malicious code vulnerability Warnings	4
Multithreaded correctness Warnings	9
Performance Warnings	74
Security Warnings	44
Dodgy code Warnings	111
Total	340

AndyScherzinger added the 2. developing label Jun 22, 2020

AndyScherzinger assigned AndyScherzinger and dan0xii Jun 22, 2020

AndyScherzinger mentioned this pull request Jun 22, 2020

Black primary color on Android dark theme #6323

Closed

AndyScherzinger force-pushed the enh/darkThemeOptimizations branch from 95585ec to e8b1831 Compare June 23, 2020 09:12

jancborchardt approved these changes Jun 23, 2020

View reviewed changes

AndyScherzinger force-pushed the enh/darkThemeOptimizations branch from acd018f to 2f7d8c2 Compare June 24, 2020 20:09

AndyScherzinger force-pushed the enh/darkThemeOptimizations branch from 2f7d8c2 to d6fdb67 Compare June 24, 2020 21:22

AndyScherzinger force-pushed the enh/darkThemeOptimizations branch from c377d33 to a856513 Compare June 25, 2020 11:01

AndyScherzinger force-pushed the enh/darkThemeOptimizations branch from 80f15ce to 9644e9c Compare June 25, 2020 11:41

AndyScherzinger removed their assignment Jun 25, 2020

AndyScherzinger force-pushed the enh/darkThemeOptimizations branch from 0efadad to 9b7cdef Compare June 25, 2020 21:53

AndyScherzinger added 8 commits June 26, 2020 15:15

proper button coloring for dark theme + black primary color

20d2ef9

Signed-off-by: Andy Scherzinger <[email protected]>

proper coloring of drawer items in black/white edge case scenarios

643454c

Signed-off-by: Andy Scherzinger <[email protected]>

Introduce light/dark theme / black/white primary-color-aware primary-…

7005cde

…button theming Signed-off-by: Andy Scherzinger <[email protected]>

move primary action button theming to new theming method

5b76892

Signed-off-by: Andy Scherzinger <[email protected]>

improve edge case FAB coloring

a7088c8

Signed-off-by: Andy Scherzinger <[email protected]>

remove unused method

8af257d

Signed-off-by: Andy Scherzinger <[email protected]>

remove element color references

0ad81bd

Signed-off-by: Andy Scherzinger <[email protected]>

update screenshots

5f73a5e

Signed-off-by: Andy Scherzinger <[email protected]>

AndyScherzinger force-pushed the enh/darkThemeOptimizations branch from 145c296 to 5f73a5e Compare June 26, 2020 13:16

Drone: update FindBugs results to reflect reduced error/warning count…

79f4270

… [skip ci] Signed-off-by: nextcloud-android-bot <[email protected]>

tobiasKaminsky merged commit 3c609a3 into master Jun 29, 2020

delete-merged-branch bot deleted the enh/darkThemeOptimizations branch June 29, 2020 08:28

Uh oh!

Enh/dark theme optimizations #6332

Enh/dark theme optimizations #6332

Uh oh!

Conversation

AndyScherzinger commented Jun 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing

Uh oh!

nextcloud-android-bot commented Jun 23, 2020

Uh oh!

nextcloud-android-bot commented Jun 23, 2020

Uh oh!

AndyScherzinger commented Jun 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jancborchardt left a comment

Choose a reason for hiding this comment

Uh oh!

nextcloud-android-bot commented Jun 23, 2020

Uh oh!

nextcloud-android-bot commented Jun 23, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 24, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Uh oh!

nextcloud-android-bot commented Jun 25, 2020

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Uh oh!

nextcloud-android-bot commented Jun 26, 2020

Uh oh!

nextcloud-android-bot commented Jun 26, 2020

Codacy

Lint

AndyScherzinger commented Jun 22, 2020 •

edited

Loading

AndyScherzinger commented Jun 23, 2020 •

edited

Loading