From f0bd6d1454f1fd0c8d53449d04e29fe11d9ad27a Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Sat, 11 Aug 2018 18:48:50 +0200
Subject: [PATCH] Fixed WeekView canvas under API 28 (Android P)

---
 .idea/misc.xml                                |  2 +-
 .../fragments/canteen/MealAdapter.java        |  2 +-
 .../moddetails/ModDetailGradebookAdapter.java |  2 +-
 .../fuplanner/tools/ui/weekview/WeekView.java | 16 ++++--
 .../main/res/layout/list_canteen_items.xml    | 51 +++++++++++++++++++
 ...book.xml => list_moddetails_gradebook.xml} |  0
 6 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/layout/list_canteen_items.xml
 rename app/src/main/res/layout/{list_modetails_gradebook.xml => list_moddetails_gradebook.xml} (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a8cce1b..4e024a8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,5 +25,5 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java
index dfa0d54..a341ec6 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java
@@ -88,7 +88,7 @@ class MealAdapter extends BaseExpandableListAdapter {
         Meal meal = getGroup(groupPosition);
         if (convertView == null) {
             convertView = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.list_all_items, parent, false);
+                    .inflate(R.layout.list_canteen_items, parent, false);
         }
 
         ItemViewHolder itemHolder = new ItemViewHolder(convertView);
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookAdapter.java
index 515ff0c..484a747 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailGradebookAdapter.java
@@ -61,7 +61,7 @@ class ModDetailGradebookAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                 return new HeaderViewHolder(view);
             case TYPE_GRADE:
                 view = LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.list_modetails_gradebook, parent, false);
+                        .inflate(R.layout.list_moddetails_gradebook, parent, false);
                 return new GradebookViewHolder(view);
             default:
                 //noinspection ConstantConditions
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 212f53b..5c9bd7c 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
@@ -741,7 +741,8 @@ public class WeekView extends View {
         canvas.drawRect(0, mHeaderHeight + mHeaderRowPadding * 2, mHeaderColumnWidth, getHeight(), mHeaderColumnBackgroundPaint);
 
         // Clip to paint in left column only.
-        canvas.clipRect(0, mHeaderHeight + mHeaderRowPadding * 2, mHeaderColumnWidth, getHeight(), Region.Op.REPLACE);
+        canvas.save();
+        canvas.clipRect(0, mHeaderHeight + mHeaderRowPadding * 2, mHeaderColumnWidth, getHeight());
 
         for (int i = 0; i < getNumberOfPeriods(); i++) {
             // If we are showing half hours (eg. 5:30am), space the times out by half the hour height
@@ -768,6 +769,7 @@ public class WeekView extends View {
             if (top < getHeight())
                 canvas.drawText(time, mTimeTextWidth + mHeaderColumnPadding, top + mTimeTextHeight, mTimeTextPaint);
         }
+        canvas.restore();
     }
 
     private void drawHeaderRowAndEvents(Canvas canvas) {
@@ -852,7 +854,8 @@ public class WeekView extends View {
         }
 
         // Clip to paint events only.
-        canvas.clipRect(mHeaderColumnWidth, mHeaderHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight / 2, getWidth(), getHeight(), Region.Op.REPLACE);
+        canvas.save();
+        canvas.clipRect(mHeaderColumnWidth, mHeaderHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight / 2, getWidth(), getHeight());
 
         // Iterate through each day.
         Calendar oldFirstVisibleDay = mFirstVisibleDay;
@@ -954,13 +957,17 @@ public class WeekView extends View {
             // In the next iteration, start from the next day.
             startPixel += mWidthPerDay + mColumnGap;
         }
+        canvas.restore();
 
         // Hide everything in the first cell (top left corner).
-        canvas.clipRect(0, 0, mTimeTextWidth + mHeaderColumnPadding * 2, mHeaderHeight + mHeaderRowPadding * 2, Region.Op.REPLACE);
+        canvas.save();
+        canvas.clipRect(0, 0, mTimeTextWidth + mHeaderColumnPadding * 2, mHeaderHeight + mHeaderRowPadding * 2);
         canvas.drawRect(0, 0, mTimeTextWidth + mHeaderColumnPadding * 2, mHeaderHeight + mHeaderRowPadding * 2, mHeaderBackgroundPaint);
+        canvas.restore();
 
         // Clip to paint header row only.
-        canvas.clipRect(mHeaderColumnWidth, 0, getWidth(), mHeaderHeight + mHeaderRowPadding * 2, Region.Op.REPLACE);
+        canvas.save();
+        canvas.clipRect(mHeaderColumnWidth, 0, getWidth(), mHeaderHeight + mHeaderRowPadding * 2);
 
         // Draw the header background.
         canvas.drawRect(0, 0, getWidth(), mHeaderHeight + mHeaderRowPadding * 2, mHeaderBackgroundPaint);
@@ -985,6 +992,7 @@ public class WeekView extends View {
             drawAllDayEvents(day, startPixel, canvas);
             startPixel += mWidthPerDay + mColumnGap;
         }
+        canvas.restore();
 
     }
 
diff --git a/app/src/main/res/layout/list_canteen_items.xml b/app/src/main/res/layout/list_canteen_items.xml
new file mode 100644
index 0000000..0552d62
--- /dev/null
+++ b/app/src/main/res/layout/list_canteen_items.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="5dip"
+    android:layout_margin="5dip">
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:typeface="sans"
+        tools:text="Test this new stuff!" />
+
+    <TextView
+        android:id="@+id/sub_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title"
+        android:layout_marginTop="5dip"
+        android:textColor="#343434"
+        android:textSize="12sp"
+        tools:text="Peter Bauer" />
+
+    <TextView
+        android:id="@+id/sub_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@id/sub_left"
+        android:layout_alignBottom="@id/sub_left"
+        android:textColor="#343434"
+        android:textSize="12sp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        tools:text="20.03.18 18:42 Uhr" />
+
+    <TextView
+        android:id="@+id/top_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@id/title"
+        android:layout_alignBottom="@id/title"
+        android:textColor="#343434"
+        android:textSize="12sp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        tools:text="Raum 105"
+        tools:ignore="RelativeOverlap" />
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_modetails_gradebook.xml b/app/src/main/res/layout/list_moddetails_gradebook.xml
similarity index 100%
rename from app/src/main/res/layout/list_modetails_gradebook.xml
rename to app/src/main/res/layout/list_moddetails_gradebook.xml