From c4fe6b59222ef747a1166fb4881db011fc5b7f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20S=C3=B8ndergaard?= <jacob@cavas.dk>
Date: Thu, 16 Nov 2023 11:17:19 +0100
Subject: [PATCH] Fix merges

---
 lib/screens/show_activity_screen.dart                  | 10 ----------
 .../weekplan_screen_widgets/weekplan_day_column.dart   |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/screens/show_activity_screen.dart b/lib/screens/show_activity_screen.dart
index 7cf2e5a7d..ab9164d36 100644
--- a/lib/screens/show_activity_screen.dart
+++ b/lib/screens/show_activity_screen.dart
@@ -646,16 +646,6 @@ class ShowActivityScreen extends StatelessWidget {
       ),
     );
   }
-  // Give message after stopping timer
-  void _showToast(String message) {
-    Fluttertoast.showToast(
-      msg: message,
-      gravity: ToastGravity.CENTER,
-      timeInSecForIosWeb: 1,
-      backgroundColor: Colors.black,
-      textColor: Colors.white,
-    );
-  }
 
   // Give message after stopping timer
   void _showToast(String message) {
diff --git a/lib/widgets/weekplan_screen_widgets/weekplan_day_column.dart b/lib/widgets/weekplan_screen_widgets/weekplan_day_column.dart
index ff55caea5..22ab70417 100644
--- a/lib/widgets/weekplan_screen_widgets/weekplan_day_column.dart
+++ b/lib/widgets/weekplan_screen_widgets/weekplan_day_column.dart
@@ -480,7 +480,7 @@ class WeekplanDayColumn extends StatelessWidget {
     _timerBloc[index].addHandlerToRunningModeOnce();
     _timerBloc[index].initTimer();
 
-    if (activistModel.timer == null || activistModel.chosenActivity != null) {
+    if (activistModel.timer == null) {
       _activityBloc.completeActivity();
     } else {
       _timerBloc[index].playTimer();