From e6075774070e75fe1a570a8dc2f96469de15cb37 Mon Sep 17 00:00:00 2001
From: Kacper Ziubryniewicz <kapi2289@gmail.com>
Date: Wed, 25 Dec 2019 23:51:52 +0100
Subject: [PATCH] [Attendance] Add free attendance type.

---
 .../edudziennik/data/web/EdudziennikWebAttendance.kt   |  4 ++--
 .../data/db/modules/attendance/Attendance.java         |  1 +
 .../ui/modules/attendance/AttendanceAdapter.java       | 10 ++++++++--
 app/src/main/res/values/strings.xml                    |  1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
index 18df0181..b7a010c7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
@@ -40,8 +40,8 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
                             "nieobecność" -> Attendance.TYPE_ABSENT
                             "spóźnienie" -> Attendance.TYPE_BELATED
                             "nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED
-                            "dzień wolny" -> Attendance.TYPE_RELEASED
-                            "brak zajęć" -> Attendance.TYPE_RELEASED
+                            "dzień wolny" -> Attendance.TYPE_FREE
+                            "brak zajęć" -> Attendance.TYPE_FREE
                             "oddelegowany" -> Attendance.TYPE_RELEASED
                             else -> Attendance.TYPE_CUSTOM
                         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java
index b7ae5ca4..224be310 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java
@@ -35,6 +35,7 @@ public class Attendance {
     public static final int TYPE_BELATED = 4;
     public static final int TYPE_BELATED_EXCUSED = 5;
     public static final int TYPE_CUSTOM = 6;
+    public static final int TYPE_FREE = 7;
     @ColumnInfo(name = "attendanceType")
     public int type = TYPE_PRESENT;
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java
index e1e53f5a..1746b0dd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java
@@ -4,13 +4,14 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
@@ -21,6 +22,7 @@ import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.T
 import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED;
 import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED;
 import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED_EXCUSED;
+import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_FREE;
 import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT;
 import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED;
 
@@ -56,6 +58,10 @@ public class AttendanceAdapter extends RecyclerView.Adapter<AttendanceAdapter.Vi
         holder.attendanceTime.setText(attendance.startTime.getStringHM());
 
         switch (attendance.type) {
+            case TYPE_FREE:
+                holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xff166ee0, PorterDuff.Mode.MULTIPLY));
+                holder.attendanceType.setText(R.string.attendance_free_day);
+                break;
             case TYPE_ABSENT:
                 holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xfff44336, PorterDuff.Mode.MULTIPLY));
                 holder.attendanceType.setText(R.string.attendance_absent);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d8cfceb..f60689e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,6 +83,7 @@
     <string name="attendance_belated_excused" translatable="false">su</string>
     <string name="attendance_present" translatable="false">ob</string>
     <string name="attendance_released" translatable="false">zw</string>
+    <string name="attendance_free_day" translatable="false">w</string>
     <string name="attendances_absent">Nieobecności:</string>
     <string name="attendances_absent_unexcused">W tym nieusprawiedliwione:</string>
     <string name="attendances_belated">Spóźnienia:</string>