From ad6990d353396cf597bd93e18321a559cd769d4a Mon Sep 17 00:00:00 2001
From: Scrimbly <38977720+scrimbly@users.noreply.github.com>
Date: Thu, 13 Feb 2020 20:50:50 -0600
Subject: [PATCH] Add ListHabitsBehavior to show 'Habit dismissed' popup
 message.

---
 .../uhabits/activities/habits/list/ListHabitsScreen.kt     | 1 +
 .../habits/list/views/HabitCardListController.kt           | 1 +
 android/uhabits-android/src/main/res/values/strings.xml    | 1 +
 .../core/ui/screens/habits/list/ListHabitsBehavior.java    | 7 ++++++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
index f8c3bf705..90834fa60 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -184,6 +184,7 @@ class ListHabitsScreen
                         DATABASE_REPAIRED -> R.string.database_repaired
                         COULD_NOT_GENERATE_BUG_REPORT -> R.string.bug_report_failed
                         FILE_NOT_RECOGNIZED -> R.string.file_not_recognized
+                        HABIT_DISMISSED -> R.string.toast_habit_dismissed
                     })
     }
 
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
index d89ab363a..12104d58b 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt
@@ -49,6 +49,7 @@ class HabitCardListController @Inject constructor(
 
     override fun onSwiped(position: Int, direction: Int) {
         adapter.dismiss(position)
+        behavior.onDismissedHabit(adapter.getItem(position))
     }
 
     override fun drop(from: Int, to: Int) {
diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml
index af088952a..eb41cc20e 100644
--- a/android/uhabits-android/src/main/res/values/strings.xml
+++ b/android/uhabits-android/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="color_picker_default_title">Change color</string>
 
     <string name="toast_habit_created">Habit created</string>
+    <string name="toast_habit_dismissed">Habit dismissed</string>
     <string name="toast_habit_deleted">Habits deleted</string>
     <string name="toast_habit_restored">Habits restored</string>
     <string name="toast_nothing_to_undo">Nothing to undo</string>
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
index 11491e5bf..e5eab0947 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
@@ -113,6 +113,11 @@ public class ListHabitsBehavior
         screen.showIntroScreen();
     }
 
+    public void onDismissedHabit(Habit habit)
+    {
+        screen.showMessage(Message.HABIT_DISMISSED);
+    }
+
     public void onReorderHabit(@NonNull Habit from, @NonNull Habit to)
     {
         taskRunner.execute(() -> habitList.reorder(from, to));
@@ -159,7 +164,7 @@ public class ListHabitsBehavior
     public enum Message
     {
         COULD_NOT_EXPORT, IMPORT_SUCCESSFUL, IMPORT_FAILED, DATABASE_REPAIRED,
-        COULD_NOT_GENERATE_BUG_REPORT, FILE_NOT_RECOGNIZED
+        COULD_NOT_GENERATE_BUG_REPORT, FILE_NOT_RECOGNIZED, HABIT_DISMISSED
     }
 
     public interface BugReporter