Fix merges

aau-giraf · Nov 16, 2023 · c4fe6b5 · c4fe6b5
1 parent 9d5149e
commit c4fe6b5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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();