From 3e9757210078e7c76e3025326befdfd5aaada76a Mon Sep 17 00:00:00 2001
From: Kacper Ziubryniewicz <kapi2289@gmail.com>
Date: Mon, 2 Dec 2019 19:36:19 +0100
Subject: [PATCH] [Dialog/Events] Use new event dialog in homework fragment and
 event list dialog.

---
 .../ui/dialogs/event/EventListDialog.kt       |  2 ++
 .../ui/modules/homework/HomeworkAdapter.java  | 21 ++++++++++++++-----
 .../ui/modules/homework/HomeworkFragment.kt   |  7 ++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.kt
index 4edfd598..beba4025 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.kt
@@ -64,6 +64,8 @@ class EventListDialog(
                                 activity,
                                 lesson?.profileId ?: profileId,
                                 lesson,
+                                date,
+                                time,
                                 onShowListener = onShowListener,
                                 onDismissListener = onDismissListener
                         )
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
index 38644e37..937472e0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
@@ -4,21 +4,23 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
+import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
-import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualV2Dialog;
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
 import pl.szczodrzynski.edziennik.utils.models.Date;
 
@@ -92,7 +94,16 @@ public class HomeworkAdapter extends RecyclerView.Adapter<HomeworkAdapter.ViewHo
 
         holder.homeworkItemEdit.setVisibility((homework.addedManually ? View.VISIBLE : View.GONE));
         holder.homeworkItemEdit.setOnClickListener(v -> {
-            new EventManualDialog(context).show(app, homework, null, null, EventManualDialog.DIALOG_HOMEWORK);
+            new EventManualV2Dialog(
+                    (MainActivity) context,
+                    homework.profileId,
+                    null,
+                    null,
+                    null,
+                    null,
+                    homework,
+                    null,
+                    null);
         });
 
         if (homework.sharedBy == null) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
index 6d498363..eef78ad4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt
@@ -13,9 +13,10 @@ import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeworkBinding
-import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualV2Dialog
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
@@ -56,7 +57,7 @@ class HomeworkFragment : Fragment() {
                 .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline)
                 .withOnClickListener(View.OnClickListener {
                     activity.bottomSheet.close()
-                    EventManualDialog(activity).show(app, null, null, null, EventManualDialog.DIALOG_HOMEWORK)
+                    EventManualV2Dialog(activity, App.profileId, defaultType = Event.TYPE_HOMEWORK)
                 }),
         BottomSheetSeparatorItem(true),
         BottomSheetPrimaryItem(true)
@@ -102,7 +103,7 @@ class HomeworkFragment : Fragment() {
         activity.navView.bottomBar.fabExtendedText = getString(R.string.add)
         activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon2.cmd_plus
         activity.navView.setFabOnClickListener(View.OnClickListener {
-            EventManualDialog(activity).show(app, null, null, null, EventManualDialog.DIALOG_HOMEWORK)
+            EventManualV2Dialog(activity, App.profileId)
         })
 
         activity.gainAttention()