From 7b4fd9dfabd664d2dd70665d4a28211c3d631080 Mon Sep 17 00:00:00 2001
From: Joshua <8Joshua@web.de>
Date: Sun, 16 Sep 2018 14:51:34 +0200
Subject: [PATCH] =?UTF-8?q?Weekview=20design=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/sebse/fuplanner/fragments/canteen/MealFragment.java  | 6 +++---
 .../java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java | 5 +++--
 app/src/main/res/layout/fragment_schedule.xml               | 3 ++-
 app/src/main/res/values-de/strings.xml                      | 1 +
 app/src/main/res/values/strings.xml                         | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
index 51ffb8f..16eadf2 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
@@ -44,9 +44,9 @@ public class MealFragment extends Fragment {
      * Use this factory method to create a new instance of
      * this fragment using the provided parameters.
      *
-     * @param canteenId Item position in module list.
-     * @param dayPosition Item position in module list.
-     * @return A new instance of fragment ModDetailAnnounceFragment.
+     * @param canteenId ID der Kantine.
+     * @param dayPosition anzuzeigender Tag.
+     * @return A new instance of fragment MealFragment.
      */
     public static MealFragment newInstance(int canteenId, int dayPosition) {
         MealFragment fragment = new MealFragment();
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 31ecfbe..65ffd20 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
@@ -47,6 +47,7 @@ import java.util.Locale;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.tools.ColorRes;
 import de.sebse.fuplanner.tools.UtilsDate;
+import de.sebse.fuplanner.tools.UtilsUi;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 import static de.sebse.fuplanner.tools.ui.weekview.WeekViewUtil.daysBetween;
@@ -61,7 +62,7 @@ import static de.sebse.fuplanner.tools.ui.weekview.WeekViewUtil.today;
  */
 @SuppressWarnings("unused")
 public class WeekView extends View {
-
+///////////////////////////////////////////Änderung in zeile 991 überprüfen!!!!!!!!!!!!!!!!!!!!!
     private enum Direction {
         NONE, LEFT, RIGHT, VERTICAL
     }
@@ -987,7 +988,7 @@ public class WeekView extends View {
             String dayLabel = getDateTimeInterpreter().interpretDate(day);
             if (dayLabel == null)
                 throw new IllegalStateException("A DateTimeInterpreter must not return null date");
-            canvas.drawText(dayLabel, startPixel + mWidthPerDay / 2, mHeaderTextHeight + mHeaderRowPadding, isToday ? mTodayHeaderTextPaint : mHeaderTextPaint);
+            canvas.drawText(dayLabel, startPixel + mWidthPerDay / 2, mHeaderTextHeight + mHeaderRowPadding+ UtilsUi.convertPixelsToDp(40, mContext), isToday ? mTodayHeaderTextPaint : mHeaderTextPaint);
             drawAllDayEvents(day, startPixel, canvas);
             startPixel += mWidthPerDay + mColumnGap;
         }
diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml
index 2824a27..09c7122 100644
--- a/app/src/main/res/layout/fragment_schedule.xml
+++ b/app/src/main/res/layout/fragment_schedule.xml
@@ -18,7 +18,7 @@
         app:headerRowPadding="12dp"
         app:columnGap="8dp"
         app:noOfVisibleDays="5"
-        app:headerRowBackgroundColor="#ffefefef"
+        app:headerRowBackgroundColor="@color/colorFUGray"
         app:firstDayOfWeek="monday"
         app:showFirstDayOfWeekFirst="true"
         app:futureWeekendBackgroundColor="@color/colorFURedLight"
@@ -31,6 +31,7 @@
         app:hourSeparatorColor="@android:color/black"
         app:showNowLine="true"
         app:defaultEventColor="@color/colorFUBlue"
+        app:headerColumnBackground="@color/colorFUGray"
         />
 
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0c14665..11c1630 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -54,4 +54,5 @@
     <string name="soups">Suppen</string>
     <string name="starters">Vorspeisen</string>
     <string name="others">Sonstiges</string>
+    <string name="resourcen">Ressourcen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8b35712..3ebe3e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,4 +61,5 @@
     <string name="soups">Soups</string>
     <string name="starters">Starters</string>
     <string name="others">Others</string>
+    <string name="resourcen">Resourcen</string>
 </resources>