From b20f48cf560f9db2f8f2f5366608658cda24be65 Mon Sep 17 00:00:00 2001
From: Sebastian Seedorf <mail@sebse.de>
Date: Thu, 24 Oct 2019 12:11:39 +0200
Subject: [PATCH] Schedule Event Color

---
 .../fuplanner/fragments/ScheduleFragment.java |  2 +-
 .../fuplanner/services/kvv/types/Event.java   | 21 ++++++++++++++++++-
 app/src/main/res/layout/fragment_schedule.xml |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
index 08b2bbd..3cc5d73 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
@@ -140,7 +140,7 @@ public class ScheduleFragment extends Fragment implements
                         start.setTimeInMillis(e.getStartDate());
 
                         WeekViewEvent weekViewEvent = new WeekViewEvent(e.getModuleId()+"/"+e.getId(), e.getTitle(), e.getLocation(), start, end);
-                        weekViewEvent.setColor(e.getColor());
+                        weekViewEvent.setColor(e.getColor(getContext()));
                         events.add(weekViewEvent);
                     }
                 }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java
index 6dee558..952fd60 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/types/Event.java
@@ -1,5 +1,8 @@
 package de.sebse.fuplanner.services.kvv.types;
 
+import android.content.Context;
+import android.content.res.Configuration;
+
 import com.google.android.gms.common.internal.Objects;
 
 import java.io.Serializable;
@@ -8,6 +11,9 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
+
 import de.sebse.fuplanner.tools.ColorRGB;
 
 public class Event implements Serializable {
@@ -60,7 +66,7 @@ public class Event implements Serializable {
         return siteId;
     }
 
-    public ColorRGB getColor() {
+    public ColorRGB getColor(@Nullable Context context) {
         MessageDigest digest;
         try {
             digest = MessageDigest.getInstance("SHA-256");
@@ -79,8 +85,21 @@ public class Event implements Serializable {
 
         // range for more beautiful colors
         h = h / 30 * 30;
+
+        boolean nightMode = false;
+        if (context != null) {
+            int currentNightMode = context.getResources().getConfiguration().uiMode
+                    & Configuration.UI_MODE_NIGHT_MASK;
+            if (currentNightMode == Configuration.UI_MODE_NIGHT_YES) {
+                nightMode = true;
+            }
+        }
         int s = 100;
         int v = 80;
+        if (nightMode) {
+            s = 60;
+            v = 100;
+        }
 
         return hsvToRgb(h/360.0, s/100.0, v/100.0);
     }
diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml
index 656efbf..1dbd91e 100644
--- a/app/src/main/res/layout/fragment_schedule.xml
+++ b/app/src/main/res/layout/fragment_schedule.xml
@@ -25,7 +25,7 @@
         app:showNowLine="true"
         app:headerColumnTextColor="@color/fuHeaderText3"
         android:background="@color/fuBackgroundShadowed"
-        app:eventTextColor="@color/colorFUWhite"
+        app:eventTextColor="@color/fuBackgroundHighContrast"
         app:headerRowBackgroundColor="@color/fuBackgroundShadowed"
         app:futureWeekendBackgroundColor="@color/fuWeekendFuture"
         app:pastWeekendBackgroundColor="@color/fuWeekendPast"