From a40b7d7d521ce60a4a338daf992122780c56fa47 Mon Sep 17 00:00:00 2001 From: Joshua <8Joshua@web.de> Date: Thu, 12 Jul 2018 18:03:15 +0200 Subject: [PATCH] =?UTF-8?q?Kalender=20Farben=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuplanner/fragments/ScheduleFragment.java | 2 +- app/src/main/res/layout/fragment_schedule.xml | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 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 f3a80b8..652bad0 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java @@ -144,7 +144,7 @@ public class ScheduleFragment extends Fragment implements WeekView.EventClickLis Calendar start = Calendar.getInstance(); start.setTimeInMillis(e.getStartDate()); - events.add(new WeekViewEvent(1, e.getTitle(), start.get(Calendar.YEAR), start.get(Calendar.MONTH) + 1, start.get(Calendar.DAY_OF_MONTH), start.get(Calendar.HOUR_OF_DAY), start.get(Calendar.MINUTE), ende.get(Calendar.YEAR), ende.get(Calendar.MONTH) + 1, ende.get(Calendar.DAY_OF_MONTH), ende.get(Calendar.HOUR_OF_DAY), ende.get(Calendar.MINUTE))); + events.add(new WeekViewEvent(e.getId(), e.getTitle(), start.get(Calendar.YEAR), start.get(Calendar.MONTH) + 1, start.get(Calendar.DAY_OF_MONTH), start.get(Calendar.HOUR_OF_DAY), start.get(Calendar.MINUTE), ende.get(Calendar.YEAR), ende.get(Calendar.MONTH) + 1, ende.get(Calendar.DAY_OF_MONTH), ende.get(Calendar.HOUR_OF_DAY), ende.get(Calendar.MINUTE))); } } } diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml index 994fa9e..9f124d3 100644 --- a/app/src/main/res/layout/fragment_schedule.xml +++ b/app/src/main/res/layout/fragment_schedule.xml @@ -22,15 +22,19 @@ app:columnGap="8dp" app:noOfVisibleDays="5" app:headerRowBackgroundColor="#ffefefef" - app:dayBackgroundColor="#05000000" - app:todayBackgroundColor="#1848adff" - app:headerColumnBackground="#ffffffff" + app:dayBackgroundColor="@color/colorFUPrimary" + app:todayBackgroundColor="@color/colorFUPrimary" + app:headerColumnBackground="@color/colorFUPrimary" app:firstDayOfWeek="monday" app:showFirstDayOfWeekFirst="true" - app:futureWeekendBackgroundColor="@color/colorFUPrimary" - app:pastWeekendBackgroundColor="@color/colorFUPrimary" + app:futureWeekendBackgroundColor="@color/colorFURedLight" + app:pastWeekendBackgroundColor="@color/colorFURedLight" app:maxTime="21" - app:minTime="7"/> + app:minTime="7" + app:showDistinctPastFutureColor="true" + app:showDistinctWeekendColor="true" + app:hourSeparatorColor="@android:color/black" + app:showNowLine="true"/> \ No newline at end of file