GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/fix-ios-camera' into 'main' 

fix: QR Code scanner in iOS

See merge request famedly/fluffychat!596
This commit is contained in:
Krille Fear 2021-11-30 18:27:58 +00:00
parent 184ede2b6c 96082e5330
commit 585e3ca6da
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pages/new_private_chat/new_private_chat.dart
View File

@ -72,8 +72,7 @@ class NewPrivateChatController extends State<NewPrivateChat> {
); );
void openScannerAction() async { void openScannerAction() async {
final status = await Permission.camera.request(); await Permission.camera.request();
if (!status.isGranted) return;
await showModalBottomSheet( await showModalBottomSheet(
context: context, context: context,
useRootNavigator: false, useRootNavigator: false,

4
macos/Flutter/GeneratedPluginRegistrant.swift
View File

@ -6,8 +6,8 @@ import FlutterMacOS
import Foundation import Foundation
import audioplayers import audioplayers
import desktop_drop
import file_selector_macos import file_selector_macos
import firebase_core
import flutter_local_notifications import flutter_local_notifications
import geolocator_apple import geolocator_apple
import package_info import package_info
@ -20,8 +20,8 @@ import wakelock_macos
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
AudioplayersPlugin.register(with: registry.registrar(forPlugin: "AudioplayersPlugin")) AudioplayersPlugin.register(with: registry.registrar(forPlugin: "AudioplayersPlugin"))
DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))

6
pubspec.lock
View File

@ -993,14 +993,14 @@ packages:
name: permission_handler name: permission_handler
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "8.1.6" version: "8.3.0"
permission_handler_platform_interface: permission_handler_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: permission_handler_platform_interface name: permission_handler_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.6.1" version: "3.7.0"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
@ -1098,7 +1098,7 @@ packages:
name: qr_code_scanner name: qr_code_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.5.2" version: "0.6.1"
qr_flutter: qr_flutter:
dependency: "direct main" dependency: "direct main"
description: description:

4
pubspec.yaml
View File

@ -53,11 +53,11 @@ dependencies:
open_noti_settings: ^0.2.0 open_noti_settings: ^0.2.0
package_info_plus: ^1.2.1 package_info_plus: ^1.2.1
path_provider: ^2.0.5 path_provider: ^2.0.5
permission_handler: ^8.1.6 permission_handler: ^8.3.0
pin_code_text_field: ^1.8.0 pin_code_text_field: ^1.8.0
provider: ^6.0.1 provider: ^6.0.1
punycode: ^1.0.0 punycode: ^1.0.0
qr_code_scanner: ^0.5.2 qr_code_scanner: ^0.6.1
qr_flutter: ^4.0.0 qr_flutter: ^4.0.0
receive_sharing_intent: ^1.4.5 receive_sharing_intent: ^1.4.5
record: ^3.0.0 record: ^3.0.0