From 9e969ba522bff18b7422f29f38aca700e43cd07e Mon Sep 17 00:00:00 2001
From: Dharanish <dharanish@evolbio.mpg.de>
Date: Tue, 25 Jun 2024 15:12:45 +0200
Subject: [PATCH] HistoryCard toast location

---
 .../common/dialogs/HistoryEditorDialog.kt          | 14 ++++++++++++++
 .../activities/habits/show/ShowHabitActivity.kt    | 12 ------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
index 02796eca4..9d8fef891 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
@@ -21,12 +21,14 @@ package org.isoron.uhabits.activities.common.dialogs
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AppCompatDialogFragment
 import org.isoron.platform.gui.AndroidDataView
 import org.isoron.platform.time.JavaLocalDateFormatter
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
+import org.isoron.uhabits.core.commands.BlockSkippedDayCommand
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
@@ -36,6 +38,7 @@ import org.isoron.uhabits.core.ui.views.HistoryChart
 import org.isoron.uhabits.core.ui.views.LightTheme
 import org.isoron.uhabits.core.ui.views.OnDateClickedListener
 import org.isoron.uhabits.core.utils.DateUtils
+import org.isoron.uhabits.utils.showMessage
 import java.util.Locale
 import kotlin.math.min
 
@@ -119,9 +122,20 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
     }
 
     override fun onCommandFinished(command: Command) {
+        val msg = getExecuteString(command)
+        if (msg != null) (dataView as View).showMessage(msg)
         refreshData()
     }
 
+    private fun getExecuteString(command: Command): String? {
+        return when (command) {
+            is BlockSkippedDayCommand -> {
+                getString(R.string.toast_day_auto_skip)
+            }
+            else -> null
+        }
+    }
+
     companion object {
         // HistoryEditorDialog handles multiple dialogs on its own,
         // because sometimes we want it to be shown under another dialog (e.g. NumberPopup)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
index 31b6fe33b..a380ad23f 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -38,7 +38,6 @@ import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
 import org.isoron.uhabits.activities.common.dialogs.NumberDialog
-import org.isoron.uhabits.core.commands.BlockSkippedDayCommand
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
@@ -140,20 +139,9 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
     }
 
     override fun onCommandFinished(command: Command) {
-        val msg = getExecuteString(command)
-        if (msg != null) activity.showMessage(msg)
         screen.refresh()
     }
 
-    private fun getExecuteString(command: Command): String? {
-        return when (command) {
-            is BlockSkippedDayCommand -> {
-                getString(R.string.toast_day_auto_skip)
-            }
-            else -> null
-        }
-    }
-
     inner class Screen : ShowHabitMenuPresenter.Screen, ShowHabitPresenter.Screen {
         override fun updateWidgets() {
             widgetUpdater.updateWidgets()