From c183428107ba0a035198bc509cd8c02c19b79964 Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Sat, 13 Nov 2021 19:56:17 +0100
Subject: [PATCH] Prevent changing the current day by accident when excusing
 absences (#1599)

---
 .../ui/modules/attendance/AttendanceFragment.kt   | 15 +++++++--------
 .../ui/modules/attendance/AttendancePresenter.kt  |  4 ++++
 .../ui/modules/attendance/AttendanceView.kt       |  2 ++
 app/src/main/res/layout/fragment_attendance.xml   |  9 +++++----
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index c6ee60ee..bd9a6692 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -12,6 +12,7 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ActionMode
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.datepicker.CalendarConstraints
 import com.google.android.material.datepicker.MaterialDatePicker
@@ -216,13 +217,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showExcuseButton(show: Boolean) {
-        with(binding.attendanceExcuseButton) {
-            if (show) {
-                show()
-            } else {
-                hide()
-            }
-        }
+        binding.attendanceExcuseButton.isVisible = show
     }
 
     override fun showAttendanceDialog(lesson: Attendance) {
@@ -293,12 +288,16 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showExcuseCheckboxes(show: Boolean) {
-        attendanceAdapter.apply {
+        with(attendanceAdapter) {
             excuseActionMode = show
             notifyDataSetChanged()
         }
     }
 
+    override fun showDayNavigation(show: Boolean) {
+        binding.attendanceNavContainer.isVisible = show
+    }
+
     override fun finishActionMode() {
         actionMode?.finish()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 5ed14f67..54d29bcf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -174,6 +174,8 @@ class AttendancePresenter @Inject constructor(
         view?.apply {
             showExcuseCheckboxes(true)
             showExcuseButton(false)
+            enableSwipe(false)
+            showDayNavigation(false)
         }
         attendanceToExcuseList.clear()
         return true
@@ -183,6 +185,8 @@ class AttendancePresenter @Inject constructor(
         view?.apply {
             showExcuseCheckboxes(false)
             showExcuseButton(true)
+            enableSwipe(true)
+            showDayNavigation(true)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index 738f2ff8..7ddd75f4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -60,6 +60,8 @@ interface AttendanceView : BaseView {
 
     fun showExcuseCheckboxes(show: Boolean)
 
+    fun showDayNavigation(show: Boolean)
+
     fun finishActionMode()
 
     fun popView()
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 6f6f648a..4996b85d 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -1,14 +1,15 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".ui.modules.attendance.AttendanceFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="50dp">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/attendanceProgress"
@@ -170,4 +171,4 @@
             app:srcCompat="@drawable/ic_chevron_right"
             app:tint="?colorPrimary" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
-</FrameLayout>
+</LinearLayout>