Merge branch 'flutter_beacon' of https://bitbucket.org/FransoletThomas/mymuseum-visitapp into flutter_beacon

# Conflicts:
#	.flutter-plugins-dependencies

lib/Screens/Visit/visit.dart

@@ -327,20 +327,57 @@ class _VisitPageState extends State<VisitPage> with WidgetsBindingObserver {
 
                         if(!controller.authorizationStatusOk) {
                           //await handleOpenLocationSettings();
-                          Map<Permission, PermissionStatus> statuses = await [
-                            Permission.bluetoothScan,
-                            Permission.bluetoothConnect,
-                            Permission.location,
-                          ].request();
+
                           print("STATUUSSSS ? ");
 
-                          print(statuses[Permission.bluetoothScan]);
-                          print(statuses[Permission.bluetoothConnect]);
-                          print(statuses[Permission.location]);
+                          if(Platform.isIOS) {
+                            Map<Permission, PermissionStatus> statuses0 = await [
+                              Permission.bluetooth,
+                            ].request();
 
-                          var status = await Permission.bluetoothScan.status;
+                            Map<Permission, PermissionStatus> statuses1 = await [
+                              Permission.bluetoothScan,
+                            ].request();
+
+                            Map<Permission, PermissionStatus> statuses2 = await [
+                              Permission.bluetoothConnect,
+                            ].request();
+
+                            Map<Permission, PermissionStatus> statuses3 = await [
+                              Permission.locationWhenInUse,
+                            ].request();
+
+                            Map<Permission, PermissionStatus> statuses4 = await [
+                              Permission.location,
+                            ].request();
+
+                            Map<Permission, PermissionStatus> statuses5 = await [
+                              Permission.locationAlways,
+                            ].request();
+
+                            print(statuses0[Permission.bluetooth]);
+                            print(statuses1[Permission.bluetoothScan]);
+                            print(statuses2[Permission.bluetoothConnect]);
+                            print(statuses3[Permission.locationWhenInUse]);
+                            print(statuses4[Permission.location]);
+                            print(statuses5[Permission.locationAlways]);
+
+                          } else {
+                            Map<Permission, PermissionStatus> statuses = await [
+                              Permission.bluetoothScan,
+                              Permission.bluetoothConnect,
+                              Permission.location,
+                            ].request();
+
+                            print(statuses[Permission.bluetoothScan]);
+                            print(statuses[Permission.bluetoothConnect]);
+                            print(statuses[Permission.location]);
+                            print(statuses[Permission.locationWhenInUse]);
+
+                            var status = await Permission.bluetoothScan.status;
+                            print(status);
+                          }
 
-                          print(status);
                         }
 
 

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+4
+version: 1.0.0+5
 
 environment:
   sdk: ">=2.16.2 <3.0.0"