From a0a76109a19e0402c743529538c34f9b18c58cf5 Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Fri, 13 Jul 2018 13:39:35 +0200
Subject: [PATCH] Added default event color property to WeekView (untested)

---
 .../fuplanner/tools/ui/weekview/WeekView.java  |  2 ++
 app/src/main/res/color/menu_text_color.xml     |  2 +-
 app/src/main/res/layout/app_bar_main.xml       |  2 +-
 app/src/main/res/layout/fragment_schedule.xml  |  7 +++----
 app/src/main/res/layout/fragment_startup.xml   |  2 +-
 app/src/main/res/layout/list_all_show_more.xml |  2 +-
 app/src/main/res/values-v21/styles.xml         | 18 +++++++++---------
 app/src/main/res/values/attrs.xml              |  1 +
 app/src/main/res/values/colors.xml             |  6 +++---
 app/src/main/res/values/styles.xml             |  6 +++---
 10 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
index 9afa5ec..b7af25c 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
@@ -499,6 +499,8 @@ public class WeekView extends View {
             if (a.getBoolean(R.styleable.WeekView_dropListenerEnabled, false))
                 this.enableDropListener();
             mMinOverlappingMinutes = a.getInt(R.styleable.WeekView_minOverlappingMinutes, 0);
+
+            mDefaultEventColor = a.getColor(R.styleable.WeekView_defaultEventColor, mDefaultEventColor);
         } finally {
             a.recycle();
         }
diff --git a/app/src/main/res/color/menu_text_color.xml b/app/src/main/res/color/menu_text_color.xml
index e5d6c20..321366a 100644
--- a/app/src/main/res/color/menu_text_color.xml
+++ b/app/src/main/res/color/menu_text_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorFUSecondary" android:state_checked="true" />
+    <item android:color="@color/colorFUBlue" android:state_checked="true" />
     <item android:color="@color/colorFUBlack" android:state_checked="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index d7898f3..f835238 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -16,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@color/colorFUPrimary"
+            android:background="@color/colorFUGreen"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </android.support.design.widget.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml
index 9273cb9..2824a27 100644
--- a/app/src/main/res/layout/fragment_schedule.xml
+++ b/app/src/main/res/layout/fragment_schedule.xml
@@ -6,9 +6,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".fragments.ScheduleFragment">
 
-
-
-
     <de.sebse.fuplanner.tools.ui.weekview.WeekView
         android:id="@+id/weekView"
         android:layout_width="match_parent"
@@ -32,7 +29,9 @@
         app:showDistinctPastFutureColor="true"
         app:showDistinctWeekendColor="true"
         app:hourSeparatorColor="@android:color/black"
-        app:showNowLine="true"/>
+        app:showNowLine="true"
+        app:defaultEventColor="@color/colorFUBlue"
+        />
 
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_startup.xml b/app/src/main/res/layout/fragment_startup.xml
index 7da0ee5..8da4531 100644
--- a/app/src/main/res/layout/fragment_startup.xml
+++ b/app/src/main/res/layout/fragment_startup.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorFUPrimary"
+    android:background="@color/colorFUGreen"
     android:fitsSystemWindows="true"
     tools:context="de.sebse.fuplanner.fragments.StartupFragment">
 
diff --git a/app/src/main/res/layout/list_all_show_more.xml b/app/src/main/res/layout/list_all_show_more.xml
index db95e44..90a243a 100644
--- a/app/src/main/res/layout/list_all_show_more.xml
+++ b/app/src/main/res/layout/list_all_show_more.xml
@@ -14,6 +14,6 @@
         android:textStyle="bold"
         android:typeface="sans"
         android:gravity="center"
-        android:textColor="@color/colorFUSecondary"
+        android:textColor="@color/colorFUBlue"
         />
 </LinearLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 713824d..a5bb54c 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -2,19 +2,19 @@
 <resources>
 
     <style name="FUTheme" parent="Theme.AppCompat.Light.NoActionBar" >
-        <item name="android:colorPrimary">@color/colorFUPrimary</item>
-        <item name="android:colorAccent">@color/colorFUSecondary</item>
-        <item name="android:colorPrimaryDark">@color/colorFUPrimaryDark</item>
+        <item name="android:colorPrimary">@color/colorFUGreen</item>
+        <item name="android:colorAccent">@color/colorFUBlue</item>
+        <item name="android:colorPrimaryDark">@color/colorFUGreenDark</item>
         <item name="android:colorBackground">@color/colorFUGray</item>
         <item name="android:statusBarColor">?android:attr/colorPrimaryDark</item>
-        <item name="colorPrimary">@color/colorFUPrimary</item>
-        <item name="colorPrimaryDark">@color/colorFUPrimaryDark</item>
-        <item name="colorAccent">@color/colorFUSecondary</item>
+        <item name="colorPrimary">@color/colorFUGreen</item>
+        <item name="colorPrimaryDark">@color/colorFUGreenDark</item>
+        <item name="colorAccent">@color/colorFUBlue</item>
     </style>
 
     <style name="FUTheme_Dialog" parent="android:Theme.Material.Light.Dialog.NoActionBar" >
-        <item name="android:colorPrimary">@color/colorFUPrimary</item>
-        <item name="android:colorPrimaryDark">@color/colorFUPrimaryDark</item>
-        <item name="android:colorAccent">@color/colorFUSecondary</item>
+        <item name="android:colorPrimary">@color/colorFUGreen</item>
+        <item name="android:colorPrimaryDark">@color/colorFUGreenDark</item>
+        <item name="android:colorAccent">@color/colorFUBlue</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 516f902..40ac869 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -65,5 +65,6 @@
         <attr name="zoomFocusPoint" format="fraction" />
         <attr name="zoomFocusPointEnabled" format="boolean" />
         <attr name="dropListenerEnabled" format="boolean" />
+        <attr name="defaultEventColor" format="color" />
     </declare-styleable>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2f96b05..889bfa4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorFUPrimary">#99cc00</color>
-    <color name="colorFUPrimaryDark">#2f4000</color>
+    <color name="colorFUGreen">#99cc00</color>
+    <color name="colorFUGreenDark">#2f4000</color>
     <color name="colorFUWhite">#FDFDFD</color>
     <color name="colorFUGray">#cccccc</color>
-    <color name="colorFUSecondary">#003366</color>
+    <color name="colorFUBlue">#003366</color>
     <color name="colorFUBlack">#333333</color>
     <color name="colorFURedLight">#f5cccc</color>
     <color name="colorFURedLight2">#cca3a3</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bedb89c..bd904cc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,9 +15,9 @@
 
     <style name="FUTheme" parent="Theme.AppCompat.Light.NoActionBar" >
         <item name="android:colorBackground">@color/colorFUGray</item>
-        <item name="colorPrimary">@color/colorFUPrimary</item>
-        <item name="colorPrimaryDark">@color/colorFUPrimaryDark</item>
-        <item name="colorAccent">@color/colorFUSecondary</item>
+        <item name="colorPrimary">@color/colorFUGreen</item>
+        <item name="colorPrimaryDark">@color/colorFUGreenDark</item>
+        <item name="colorAccent">@color/colorFUBlue</item>
     </style>
 
 </resources>