diff --git a/android/app/build.gradle b/android/app/build.gradle index b6aabd2f064ab2916d1ff8f962edfc4a2773bdf7..693c4a8b0e4fc7311c08424132805795e95dd590 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -36,7 +36,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.deggendorf_app" - minSdkVersion flutter.minSdkVersion + minSdkVersion 20 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/lib/bottom_navigation_bar_buttons/event/barwidget.dart b/lib/bottom_navigation_bar_buttons/event/barwidget.dart index 4547b587a2bef2eef357bd4dbf6833e5cc042e43..b6d70a31c418741d21c2c544e62aa314a83864e4 100644 --- a/lib/bottom_navigation_bar_buttons/event/barwidget.dart +++ b/lib/bottom_navigation_bar_buttons/event/barwidget.dart @@ -1,11 +1,10 @@ +import 'package:deggendorf_app/bottom_navigation_bar_buttons/event/qr_scanner.dart'; import 'package:flutter/material.dart'; import 'package:deggendorf_app/bottom_navigation_bar_buttons/event/imageslides.dart'; import 'package:deggendorf_app/bottom_navigation_bar_buttons/event/infobox_text.dart'; - class BarWidget extends StatefulWidget { - const BarWidget({Key? key, - required this.barName}) : super(key: key); + const BarWidget({Key? key, required this.barName}) : super(key: key); final String barName; @@ -17,26 +16,27 @@ class _BarWidgetState extends State<BarWidget> { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar( - backgroundColor: Colors.green, - title: Text( - "Bar: ${widget.barName}", style: TextStyle(fontSize: 20, color: Colors.white), + appBar: AppBar( + backgroundColor: Colors.green, + title: Text( + "Bar: ${widget.barName}", + style: TextStyle(fontSize: 20, color: Colors.white), + ), ), - ), - body: Padding( - padding: EdgeInsets.all(20), - child: Column( - children: [ - ImageSlides(), - InfoBox(), - ], - ) - ), - floatingActionButton: FloatingActionButton( - onPressed: null, - backgroundColor: Colors.green, - child: Icon(Icons.qr_code_scanner), - ) - ); + body: Padding( + padding: EdgeInsets.all(20), + child: Column( + children: [ + ImageSlides(), + InfoBox(), + ], + )), + floatingActionButton: FloatingActionButton( + onPressed: () { + QrScanner(); + }, + backgroundColor: Colors.green, + child: Icon(Icons.qr_code_scanner), + )); } -} \ No newline at end of file +} diff --git a/lib/bottom_navigation_bar_buttons/event/qr_scanner.dart b/lib/bottom_navigation_bar_buttons/event/qr_scanner.dart new file mode 100644 index 0000000000000000000000000000000000000000..e0520d9056454d8a2794bd132a12a23799aaeb4b --- /dev/null +++ b/lib/bottom_navigation_bar_buttons/event/qr_scanner.dart @@ -0,0 +1,16 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class QrScanner extends StatefulWidget { + const QrScanner({Key? key}) : super(key: key); + + @override + _QrScannerState createState() => _QrScannerState(); +} + +class _QrScannerState extends State { + @override + Widget build(BuildContext context) { + return Scaffold(body: Container(color: Colors.greenAccent)); + } +} diff --git a/pubspec.lock b/pubspec.lock index 5e73cde2bccfe1cd0a777b50acf3e3da19948d61..aff5472bbd3de9375fa2c044fa8717082ac7ba09 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: carousel_slider url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.1.1" characters: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" cupertino_icons: dependency: "direct main" description: @@ -77,7 +77,7 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.1" file: dependency: transitive description: @@ -134,7 +134,7 @@ packages: name: google_fonts url: "https://pub.dartlang.org" source: hosted - version: "2.3.1" + version: "2.3.3" http: dependency: "direct main" description: @@ -148,7 +148,7 @@ packages: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" js: dependency: transitive description: @@ -204,49 +204,49 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.10" path_provider_android: dependency: transitive description: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.12" + version: "2.0.14" path_provider_ios: dependency: transitive description: name: path_provider_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.9" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.1.7" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.7" pedantic: dependency: transitive description: @@ -282,41 +282,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "5.0.0" + qr_code_scanner: + dependency: "direct main" + description: + name: qr_code_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.0" shared_preferences: dependency: "direct main" description: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.13" + version: "2.0.15" shared_preferences_android: dependency: transitive description: name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "2.0.12" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: @@ -330,14 +337,14 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sky_engine: dependency: transitive description: flutter @@ -405,7 +412,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.5.1" + version: "2.5.2" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index cfda7582b7a58821b8757a4730833e20f56c6e67..9db89e5351bd9ff49d9f474371a5c26f24d4fe33 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -40,6 +40,7 @@ dependencies: shared_preferences: ^2.0.13 carousel_slider: ^4.0.0 flutter_speed_dial: ^4.3.0 + qr_code_scanner: ^0.7.0 dev_dependencies: