Merge branch 'develop' into task/938

lib/blocs/new_citizen_bloc.dart

@@ -110,17 +110,6 @@ class NewCitizenBloc extends BlocBase {
     });
   }
 
-  /// pushes an imagePicker screen, then sets the pictogram image,
-  /// to the selected image from the gallery
-  void takePictureWithCamera() {
-    ImagePicker().pickImage(source: ImageSource.camera).then((XFile? f) {
-      if (f != null) {
-        _publishImage(File(f.path));
-        _checkInput();
-      }
-    });
-  }
-
   /// pushes an imagePicker screen, then sets the profile picture image,
   /// to the selected image from the gallery
   void chooseImageFromGallery() {

lib/screens/show_activity_screen.dart

@@ -646,6 +646,16 @@ 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) {

lib/widgets/weekplan_screen_widgets/activity_card.dart

@@ -352,7 +352,7 @@ class ActivityCard extends StatelessWidget {
                     height: 0,
                   );
                 }
-
+                
               default:
                 return Container(
                   width: 0,

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) {
+    if (activistModel.timer == null || activistModel.chosenActivity != null) {
       _activityBloc.completeActivity();
     } else {
       _timerBloc[index].playTimer();

pubspec.yaml

@@ -11,10 +11,9 @@ environment:
   sdk: ">=3.1.2"
 dependencies:
   api_client:
-    path: ../api_client
-    # git:
-    #   url: https://github.com/aau-giraf/api_client.git
-    #   ref: task/131 #develop
+    git:
+      url: https://github.com/aau-giraf/api_client.git
+      ref: develop
   audioplayers: ^1.1.1
   auto_size_text: ^3.0.0
   csv: ^5.0.1