Dark theme #3459

AndyScherzinger · 2019-01-15T00:12:51Z

Resolves #2188
improvement for #3107 (AMOLED, needs a black variant, not a dark grey to improve AMOLED)

dark theme implementation has been done by @dan0xii 🎉

TODO

~~update to material 1.1.0 (when released)~~ Update to material 1.1.0 #4749
Login screen has messed up colours on the server address box.
~~"Sharing" search box has black-on-grey text in dark mode.~~ "Sharing" search box has black-on-grey text in dark mode. #4750
~~Rename dialog doesn't match styling of other edittext boxes.~~ Rename dialog doesn't match styling of other edittext boxes. #4751
Toggle button background colour is difficult to see.
I've lightened the track up in dark mode. Example:
Share link expiration date picker button text is white-on-white or black-on-grey.
(Fix by dan0xii although the colours could be tweaked).
Issue in settings where theme is not applied immediately (possibly just API 22 and upwards).
(Possibly fixed. See Dark theme #3459 (comment)).
(TBC - dialogs have grey backgrounds) dialogs have a black background - to be discussed. A black dialog on a black activity background can't be distinguished anymore. Maybe we should go for a dark grey tone for the dialogs? (no sure though)
Preferences text on settings screen stays black on night theme but should be white instead

Note: Floating action button is black-on-primary colour on API 19.

tobiasKaminsky · 2019-01-15T10:10:40Z

I have external links on my productive instance, and it seems that they are wrongly colored:

AndyScherzinger · 2019-01-15T14:50:39Z

I have external links on my productive instance, and it seems that they are wrongly colored:

@tobiasKaminsky yes I also saw that, other than that the PR needs a lot of testing since with the move to AndroidX and supporting day/night via theming I had to abandon the Bridge base themes from the material components, so the theme crashes for legacy AppCompat UI elements (which we shouldn't have in placce anymore, but still), also I can't say if we need to upgrade dialogs, since material components 1.1.0 will introduce new dialog support classes... but well, this is Android dev life...

AndyScherzinger · 2019-10-28T17:17:36Z

@splitt3r thanks for testing, your issues should now be fixed with the latest commits 🚀

@tobiasKaminsky @dan0xii I'd be fine with merging this to master and start with small(er) fixes for papercuts

nextcloud-android-bot · 2019-10-28T17:20:16Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/11441.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 · 2019-10-28T17:22:50Z

Codacy

299

Lint

Type	master	PR
Warnings	59	63
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

Lint increased!

nextcloud-android-bot · 2019-10-28T17:30:38Z

Codacy

299

Lint

Type	master	PR
Warnings	59	63
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

Lint increased!

dan0xii · 2019-10-28T19:38:39Z

@tobiasKaminsky @dan0xii I'd be fine with merging this to master and start with small(er) fixes for papercuts

Agreed. I'll just continue to try and tidy up the theme to get it to look right and then I'll go back and try and make the code slicker.

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

nextcloud-android-bot · 2019-10-28T21:59:03Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/11443.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 · 2019-10-28T22:04:47Z

Codacy

299

Lint

Type	master	PR
Warnings	59	59
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

tobiasKaminsky · 2019-10-29T08:02:50Z

src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java


        Button providerButton = findViewById(R.id.signup);
-        providerButton.setBackgroundColor(getResources().getColor(R.color.primary_dark));
+        providerButton.setBackgroundColor(getResources().getColor(R.color.primary));


This might lead to problems with branding, please revert.

tobiasKaminsky · 2019-10-29T08:13:33Z

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

        Canvas c = new Canvas(resultBitmap);

-        c.drawColor(MainApp.getAppContext().getResources().getColor(R.color.background_color));
+        c.drawColor(MainApp.getAppContext().getResources().getColor(R.color.bg_default));


If we change this on demand to dark/light value, this will be permanent in cache and thus might be wrong.
Doing this dynamic would be a way, but for now I think we should just use light background for PNG as always.
(I'll create a ticket to investigate this later).

tobiasKaminsky · 2019-10-29T08:14:16Z

src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java

+                            new int[][]{new int[]{android.R.attr.state_checked},
+                                new int[]{}},
+                            new int[]{trackColor, trackColorUnchecked});
+//                            new int[]{trackColor, Color.parseColor("#4D000000")});


remove commented line

tobiasKaminsky · 2019-10-29T08:14:43Z

src/main/java/com/owncloud/android/ui/activity/BaseActivity.java

 * Base activity with common behaviour for activities dealing with ownCloud {@link Account}s .
 */
-public abstract class BaseActivity extends AppCompatActivity implements Injectable {
+public abstract class BaseActivity extends AppCompatActivity implements Injectable, SharedPreferences.OnSharedPreferenceChangeListener {


tobiasKaminsky · 2019-10-29T08:14:58Z

src/main/java/com/owncloud/android/ui/activity/BaseActivity.java

+     * Tracks whether the activity should be recreate()'d after a theme change
+     */
+    private boolean mThemeChangePending;
+    private boolean mPaused;


no m prefix

tobiasKaminsky · 2019-10-29T08:46:17Z

src/main/res/values-night/colors.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application


New license header, as it is a new file

tobiasKaminsky · 2019-10-29T08:46:59Z

src/main/res/values-v21/styles.xml

+
+    <style name="DatePickerStyle" parent="">
+        <item name="android:headerBackground">@color/bg_fallback_highlight</item>
+        <!-- TODO for < API21 -->


Is this a real todo? Then please remove it here and create a new issue with label "darkTheme".

removed since v16 simply shows a (holo) date picker atm. cc @dan0xii

tobiasKaminsky · 2019-10-29T08:47:13Z

src/main/res/values/colors.xml

    <color name="black">#000000</color>
-    <color name="white">#FFFFFF</color>
-    <color name="textColor">@color/black</color>
+    <!--<color name="white">#FFFFFF</color>-->


tobiasKaminsky · 2019-10-29T08:49:29Z

src/main/res/values/strings.xml

    <string name="prefs_imprint">Imprint</string>
+    <string name="prefs_value_theme_light">Light</string>
+    <string name="prefs_value_theme_dark">Dark</string>
+    <string name="prefs_key_theme">darkTheme</string>


This is a preference internal key, please move it

tobiasKaminsky · 2019-10-29T08:50:08Z

src/main/res/xml/preferences.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--


should be 2 lines (though I know that Android Studio likes to put this into one line…)

tobiasKaminsky · 2019-10-29T08:57:43Z

Only minor changes due to code review.
@dan0xii @AndyScherzinger this is an amazing work! 🎉 🎉 🎉 🎉

Once it is merged, I'll create some issues so that we can fix this in smaller steps.

AndyScherzinger · 2019-10-29T09:29:52Z

taking care of the review comments right now

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

AndyScherzinger · 2019-10-29T10:06:47Z

@tobiasKaminsky code review changes are ✔️ DONE

Feel free to re-review, test-drive and merge :)

nextcloud-android-bot · 2019-10-29T10:08:44Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/11455.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 · 2019-10-29T10:13:50Z

Codacy

299

Lint

Type	master	PR
Warnings	59	59
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	69
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	119
Security Warnings	44
Dodgy code Warnings	138
Total	423

AndyScherzinger · 2019-10-29T14:49:17Z

Hi everyone,
the initial work has been merged to master an will be paart of tomorrow's dev build. All further findings have been labeled feature: theming

dan0xii · 2019-10-29T17:00:47Z

So glad to get this merged. Thanks for the help getting it over the line, @AndyScherzinger.

2a43da6 Merge pull request #4746 from nextcloud/createChooser f8d7ddd Merge pull request #4758 from nextcloud/fixDarkTheme bee8770 - fix typo in styles - fix sign up with provider in dark primary color cc710b0 Merge pull request #3459 from nextcloud/dark_theme c1aa005 changes due to code review c801a2c Merge pull request #4744 from nextcloud/v3100_Alpha1 12fe91a use default open chooser with "just once", "always" 8b4481f [tx-robot] updated from transifex 2ea1f4e daily dev 20191029

tobiasKaminsky · 2019-11-01T12:17:21Z

And this is the link: https://github.com/nextcloud/android/issues?q=is%3Aopen+is%3Aissue+label%3A%22feature%3A+theming%22

Some are bugs, some are enhancements :-)

AndyScherzinger · 2019-11-01T13:10:56Z

So glad to get this merged. Thanks for the help getting it over the line, @AndyScherzinger.

Always a pleasure to help @dan0xii ❤️

AndyScherzinger added design 2. developing labels Jan 15, 2019

AndyScherzinger mentioned this pull request Jan 15, 2019

dark theme #2188

Closed

AndyScherzinger force-pushed the dark_theme branch from 6087ae9 to 1e2961e Compare January 15, 2019 14:37

nextcloud deleted a comment Jan 16, 2019

dan0xii force-pushed the dark_theme branch from 1e2961e to ba7f2a0 Compare January 16, 2019 12:12

This comment has been minimized.

Sign in to view

dan0xii force-pushed the dark_theme branch from fca6555 to 3b5c473 Compare January 16, 2019 13:27

This comment has been minimized.

Sign in to view

nextcloud deleted a comment Jan 17, 2019

dan0xii force-pushed the dark_theme branch from 11ee0b3 to ddd054b Compare January 17, 2019 21:57

nextcloud deleted a comment Jan 18, 2019

This comment has been minimized.

Sign in to view

AndyScherzinger force-pushed the dark_theme branch from ddd054b to 232aa15 Compare January 21, 2019 11:59

This comment has been minimized.

Sign in to view

AndyScherzinger force-pushed the dark_theme branch from 232aa15 to 4a1c4a5 Compare January 21, 2019 13:07

remove possible overdraws

3de5e8f

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

AndyScherzinger added 3. to review and removed 2. developing labels Oct 28, 2019

nextcloud deleted a comment Oct 28, 2019

tobiasKaminsky requested changes Oct 29, 2019

View reviewed changes

AndyScherzinger added the feature: theming label Oct 29, 2019

changes due to code review

c1aa005

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

nextcloud deleted a comment Oct 29, 2019

tobiasKaminsky merged commit cc710b0 into master Oct 29, 2019

delete-merged-branch bot deleted the dark_theme branch October 29, 2019 10:18

This was referenced Oct 29, 2019

"Sharing" search box has black-on-grey text in dark mode. #4750

Closed

Rename dialog doesn't match styling of other edittext boxes. #4751

Closed

AndyScherzinger added this to the Nextcloud App 3.10.0 milestone Oct 29, 2019

Uh oh!

Dark theme #3459

Dark theme #3459

Uh oh!

Conversation

AndyScherzinger commented Jan 15, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tobiasKaminsky commented Jan 15, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AndyScherzinger commented Jan 15, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

AndyScherzinger commented Oct 28, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nextcloud-android-bot commented Oct 28, 2019

Uh oh!

nextcloud-android-bot commented Oct 28, 2019

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Lint increased!

Uh oh!

nextcloud-android-bot commented Oct 28, 2019

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Lint increased!

Uh oh!

dan0xii commented Oct 28, 2019

Uh oh!

nextcloud-android-bot commented Oct 28, 2019

Uh oh!

nextcloud-android-bot commented Oct 28, 2019

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tobiasKaminsky commented Oct 29, 2019

Uh oh!

AndyScherzinger commented Oct 29, 2019

Uh oh!

AndyScherzinger commented Oct 29, 2019

AndyScherzinger commented Jan 15, 2019 •

edited

Loading

tobiasKaminsky commented Jan 15, 2019 •

edited

Loading

AndyScherzinger commented Oct 28, 2019 •

edited

Loading