diff --git a/README.md b/README.md index 58bee92..c3a144e 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ git clone --recursive https://github.com/khoren93/flutter_zxing.git Use Melos to install the dependencies of the flutter_zxing project. Melos is a tool that helps you manage multiple Dart packages in a single repository. To install Melos, use the following command: ```bash -pub global activate melos +flutter pub global activate melos ``` To install the dependencies of the flutter_zxing project, use the following command: diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index ea41eec..0e0b4dd 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -216,6 +216,7 @@ }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -252,6 +253,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index c89a9ad..c285f9e 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -49,5 +49,7 @@ $(APP_DISPLAY_NAME) needs camera access to scan barcodes CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/example/pubspec.lock b/example/pubspec.lock index 91869f9..8bf93f2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -166,7 +166,7 @@ packages: path: ".." relative: true source: path - version: "1.0.0-beta.9" + version: "1.0.0" font_awesome_flutter: dependency: "direct main" description: @@ -406,4 +406,4 @@ packages: version: "6.2.2" sdks: dart: ">=2.18.0 <4.0.0" - flutter: ">=3.3.0" + flutter: ">=3.0.0" diff --git a/zxscanner/ios/Runner.xcodeproj/project.pbxproj b/zxscanner/ios/Runner.xcodeproj/project.pbxproj index 344008d..947d36c 100644 --- a/zxscanner/ios/Runner.xcodeproj/project.pbxproj +++ b/zxscanner/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -270,6 +270,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -306,6 +307,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/zxscanner/lib/pages/home_page.dart b/zxscanner/lib/pages/home_page.dart index 1daaa32..31bfa04 100644 --- a/zxscanner/lib/pages/home_page.dart +++ b/zxscanner/lib/pages/home_page.dart @@ -46,6 +46,7 @@ class _HomePageState extends State { // ignore: avoid_dynamic_calls body: pages()[selectedIndex], bottomNavigationBar: ConvexAppBar( + disableDefaultTabController: true, style: TabStyle.fixedCircle, backgroundColor: Theme.of(context).bottomAppBarTheme.color, color: Theme.of(context).unselectedWidgetColor, diff --git a/zxscanner/pubspec.lock b/zxscanner/pubspec.lock index 4361422..f52fac8 100644 --- a/zxscanner/pubspec.lock +++ b/zxscanner/pubspec.lock @@ -361,10 +361,10 @@ packages: dependency: "direct main" description: name: flutter_zxing - sha256: "863fd475c9a75f228a0b8b1464a009fcd89463f06149b96537d31f849f4a5fbb" + sha256: fe7fb8d53ade636758fde71a90f85197346e2fd61e268c2bad287f1fa33abf63 url: "https://pub.dev" source: hosted - version: "1.0.0-beta.9" + version: "1.0.0" font_awesome_flutter: dependency: "direct main" description: diff --git a/zxscanner/pubspec.yaml b/zxscanner/pubspec.yaml index c270547..ffc8977 100644 --- a/zxscanner/pubspec.yaml +++ b/zxscanner/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: sdk: flutter flutter_markdown: ^0.6.13 flutter_mobx: ^2.0.6 - flutter_zxing: 1.0.0-beta.9 + flutter_zxing: ^1.0.0 font_awesome_flutter: ^10.3.0 hive: ^2.2.3 hive_flutter: ^1.1.0