Merge branch 'develop' into Issue942

aau-giraf · Nov 8, 2023 · 88f5933 · 88f5933
2 parents c6773bc + 76bf9ee
commit 88f5933
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 549 deletions.
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -49,8 +49,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSCameraUsageDescription</key>
-	<string>Appen kræver adgang til dit kamera for at oprette nye piktogrammer.</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>

diff --git a/lib/blocs/new_citizen_bloc.dart b/lib/blocs/new_citizen_bloc.dart
@@ -98,17 +98,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() {

diff --git a/lib/blocs/take_image_with_camera_bloc.dart b/lib/blocs/take_image_with_camera_bloc.dart
diff --git a/lib/blocs/toolbar_bloc.dart b/lib/blocs/toolbar_bloc.dart
@@ -63,9 +63,6 @@ class ToolbarBloc extends BlocBase {
       case AppBarIcon.burgerMenu:
         _iconsToAdd.add(_createIconBurgermenu(callback));
         break;
-      case AppBarIcon.camera:
-        _iconsToAdd.add(_createIconCamera(callback));
-        break;
       case AppBarIcon.cancel:
         _iconsToAdd.add(_createIconCancel(callback));
         break;
@@ -163,14 +160,6 @@ class ToolbarBloc extends BlocBase {
     );
   }
 
-  IconButton _createIconCamera(VoidCallback callback) {
-    return IconButton(
-      icon: Image.asset('assets/icons/camera.png'),
-      tooltip: 'Åbn kamera',
-      onPressed: callback,
-    );
-  }
-
   IconButton _createIconCancel(VoidCallback callback) {
     return IconButton(
       icon: Image.asset('assets/icons/cancel.png'),

diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
@@ -13,7 +13,6 @@ import 'package:weekplanner/blocs/new_weekplan_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_image_bloc.dart';
 import 'package:weekplanner/blocs/settings_bloc.dart';
-import 'package:weekplanner/blocs/take_image_with_camera_bloc.dart';
 import 'package:weekplanner/blocs/timer_bloc.dart';
 import 'package:weekplanner/blocs/toolbar_bloc.dart';
 import 'package:weekplanner/blocs/upload_from_gallery_bloc.dart';
@@ -110,9 +109,5 @@ class Bootstrap {
     di.registerDependency<CopyResolveBloc>(() {
       return CopyResolveBloc(di.get<Api>());
     });
-
-    di.registerDependency<TakePictureWithCameraBloc>(() {
-      return TakePictureWithCameraBloc(di.get<Api>());
-    });
   }
 }
diff --git a/lib/models/enums/app_bar_icons_enum.dart b/lib/models/enums/app_bar_icons_enum.dart
@@ -15,9 +15,6 @@ enum AppBarIcon {
   /// Icon for opening burger menu
   burgerMenu,
 
-  /// Icon for opening camera
-  camera,
-
   /// Icon for cancelling action
   cancel,
 

diff --git a/lib/screens/new_citizen_screen.dart b/lib/screens/new_citizen_screen.dart
@@ -326,11 +326,12 @@ class _NewCitizenScreenState extends State<NewCitizenScreen> {
                     child: StreamBuilder<File>(
                         stream: widget._bloc.file,
                         builder: (BuildContext context,
-                            AsyncSnapshot<File> snapshot) =>
-                        snapshot.data != null
-                            ? widget._displayImage(snapshot.data)
-                            : widget._displayIfNoImage()),
-                  ),
+
+                                AsyncSnapshot<File> snapshot) =>
+                            snapshot.data != null
+                                ? widget._displayImage(snapshot.data)
+                                : widget._displayIfNoImage()),
+                  ),  
                 ),
               ],
             ),

diff --git a/lib/screens/pictogram_search_screen.dart b/lib/screens/pictogram_search_screen.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:weekplanner/blocs/pictogram_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/routes.dart';
-import 'package:weekplanner/screens/take_picture_with_camera_screen.dart';
 import 'package:weekplanner/screens/upload_image_from_phone_screen.dart';
 import 'package:weekplanner/widgets/bottom_app_bar_button_widget.dart';
 import 'package:weekplanner/widgets/giraf_app_bar_widget.dart';
@@ -148,15 +147,6 @@ class _PictogramSearchState extends State<PictogramSearch> {
                                   context, UploadImageFromPhone());
                             }
                           ),
-                          BottomAppBarButton(
-                              buttonText: 'Tag billede',
-                              buttonKey: 'TagBilledeButton',
-                              assetPath: 'assets/icons/camera.png',
-                              dialogFunction: (BuildContext context) {
-                                Routes().push(
-                                    context, TakePictureWithCamera());
-                              }
-                          )
                         ]
                       )))
             ]