2012491
/
cpd_2022_zi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'scanner-provider' into 'main' 

Scanner provider

Closes #38

See merge request Crondung/hsma_cpd!34
main
Kai Mannweiler 2023-03-06 15:08:10 +00:00
parent 5ab6e598f9 80bc5985e7
commit 57710bcf22
9 changed files with 120 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -14,3 +14,13 @@ Die App lässt sich als Android- und iOS App ausführen und zu Debugzwecken eben
## App bedienen
Um die App nutzen zu können, müssen Settings eingelesen werden. Dazu kann entweder ein in die App integrierter QR-Code Scanner (mit dem beigefügten [QR-Code](./gruppe1_QR.png)) benutzt werden, oder zu Debugzwecken mit dem dafür vorgesehenen Button auf der Scannerseite über eine lokale JSON-Datei.
Es ist zu beachten, dass das verwendete QR-Code Scanner Package für Mobilgeräte optimiert ist. Deshalb kann es zu Abstürzen beim Verwenden des Scanners mit der Web-Version kommen.
Beim Verwenden der Web-Version sollten die Settings mit der lokalen JSON-Datei eingelesen werden.
Der Button zum Einlesen der lokalen JSON-Datei kann über die Variable <code>bool useLocalConfig</code> in der Datei [globals.dart](./lib/globals.dart) ein- und ausgeblendet werden.
## Authoren
- Hinrik Ehrenfried 2012537
- Patrick Meßmer 1911768
- Kai Mannweiler 2012491
- Julian Gegner 1922635

2
android/app/build.gradle
View File

@ -70,5 +70,7 @@ flutter {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.window:window:1.0.0'
implementation 'androidx.window:window-java:1.0.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
}

5
lib/globals.dart
View File

@ -3,5 +3,8 @@ library app.globals;
import 'package:smoke_cess_app/mock/db_mock.dart';
import 'package:smoke_cess_app/services/database_service.dart';
DatabaseService databaseService = DatabaseMock();
DatabaseService databaseService = DatabaseMock();
// DatabaseService databaseService = DatabaseService.instance;
// set this to read settings from local json file instead of scanning a qr code
bool useLocalConfig = false;

31
lib/pages/scanner_page.dart
View File

@ -4,8 +4,10 @@ import 'package:provider/provider.dart';
import 'package:smoke_cess_app/services/export_service.dart';
import 'package:smoke_cess_app/services/settings_service.dart';
import 'package:smoke_cess_app/services/notification_service.dart';
import 'package:smoke_cess_app/widgets/buttons/text_icon_button.dart';
import 'package:smoke_cess_app/widgets/scanner.dart';
import '../providers/settings_provider.dart';
import '../globals.dart' as globals;
class ScannerPage extends StatelessWidget {
const ScannerPage({super.key});
@ -16,7 +18,7 @@ class ScannerPage extends StatelessWidget {
}
void loadJSON(BuildContext context) async {
var settingsModel = context.read<SettingsProvider>();
SettingsProvider settingsModel = context.read<SettingsProvider>();
await loadSettingsFromLocalJSON();
settingsModel.initSettings();
NotificationService().setAllNotifications();
@ -32,25 +34,26 @@ class ScannerPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
SettingsProvider settingsProvider = context.watch<SettingsProvider>();
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const MyScanner(),
const SizedBox(height: 30),
ElevatedButton(
style: ElevatedButton.styleFrom(
textStyle: const TextStyle(fontSize: 20)),
onPressed: () => loadJSON(context),
child: const Text('Read JSON'),
),
const SizedBox(height: 30),
ElevatedButton(
style: ElevatedButton.styleFrom(
textStyle: const TextStyle(fontSize: 20)),
onPressed: export,
child: const Text('Export'),
)
if (!settingsProvider.scanning)
TextIconButton(
text: 'Export',
onPressed: ExportService().exportData,
iconData: Icons.upload),
if (globals.useLocalConfig && !settingsProvider.scanning)
ElevatedButton(
style: ElevatedButton.styleFrom(
textStyle: const TextStyle(fontSize: 20)),
onPressed: () => loadJSON(context),
child: const Text('Read JSON'),
),
],
));
}

7
lib/providers/settings_provider.dart
View File

@ -6,9 +6,16 @@ import '../models/settings.dart';
class SettingsProvider extends ChangeNotifier {
Settings? _settings;
bool _initialized = false;
bool _scanning = false;
Settings? get settings => _settings;
bool get initialized => _initialized;
bool get scanning => _scanning;
set scanning(bool value) {
_scanning = value;
notifyListeners();
}
SettingsProvider() {
initSettings();

4
lib/widgets/buttons/round_button_widget.dart
View File

@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
class RoundAddButton extends StatelessWidget {
class RoundButton extends StatelessWidget {
final VoidCallback onPressed;
final IconData iconData;
const RoundAddButton(
const RoundButton(
{super.key, required this.onPressed, required this.iconData});
@override

29
lib/widgets/buttons/text_icon_button.dart 100644
View File

@ -0,0 +1,29 @@
import 'package:flutter/material.dart';
class TextIconButton extends StatelessWidget {
final String text;
final VoidCallback onPressed;
final IconData iconData;
const TextIconButton(
{super.key,
required this.text,
required this.onPressed,
required this.iconData});
@override
Widget build(BuildContext context) {
return SizedBox(
width: MediaQuery.of(context).size.width * 0.4,
child: FloatingActionButton.extended(
label: Text(text),
backgroundColor: Theme.of(context).colorScheme.primary,
icon: Icon(
iconData,
size: 24.0,
),
onPressed: onPressed,
),
);
}
}

95
lib/widgets/scanner.dart
View File

@ -5,80 +5,81 @@ import 'package:provider/provider.dart';
import 'package:smoke_cess_app/models/settings.dart';
import 'package:smoke_cess_app/services/json_service.dart';
import 'package:smoke_cess_app/services/settings_service.dart';
import 'package:smoke_cess_app/widgets/buttons/text_icon_button.dart';
import '../providers/settings_provider.dart';
import '../services/notification_service.dart';
class MyScanner extends StatefulWidget {
class MyScanner extends StatelessWidget {
const MyScanner({super.key});
@override
State<StatefulWidget> createState() => MyScannerState();
}
Widget build(BuildContext context) {
SettingsProvider settingsProvider = context.watch<SettingsProvider>();
class MyScannerState extends State<MyScanner> {
bool scanning = false;
void handleSucces(String? rawValue) {
String qrText = rawValue!;
Map<String, dynamic> json = stringToJSON(qrText);
Settings settings = Settings.fromJson(json);
saveSettings(settings);
settingsProvider.initSettings();
NotificationService().setAllNotifications();
settingsProvider.scanning = false;
void handleSucces(String? rawValue) {
String qrText = rawValue!;
Map<String, dynamic> json = stringToJSON(qrText);
Settings settings = Settings.fromJson(json);
saveSettings(settings);
var settingsModel = context.read<SettingsProvider>();
settingsModel.initSettings();
NotificationService().setAllNotifications();
setState(() {
scanning = false;
AwesomeDialog(
context: context,
dialogType: DialogType.success,
title: 'Geschafft',
desc: 'Der Code wurde erfolgreich gescannt!',
).show();
});
}
}
void handleError() {
settingsProvider.scanning = false;
void handleError() {
setState(() {
scanning = false;
AwesomeDialog(
context: context,
dialogType: DialogType.error,
title: 'Fehler',
desc: 'Der QR-Code war fehlerhaft!',
).show();
});
}
void onDetect(capture) {
try {
final List<Barcode> barcodes = capture.barcodes;
for (final barcode in barcodes) {
if (barcode.rawValue != null) {
return handleSucces(barcode.rawValue);
}
}
} catch (e) {
handleError();
}
}
@override
Widget build(BuildContext context) {
return scanning
void onDetect(capture) {
try {
final List<Barcode> barcodes = capture.barcodes;
for (final barcode in barcodes) {
if (barcode.rawValue != null) {
return handleSucces(barcode.rawValue);
}
}
} catch (e) {
handleError();
}
}
return settingsProvider.scanning
? Expanded(
child: MobileScanner(
child: Stack(
alignment: Alignment.center,
children: [
MobileScanner(
fit: BoxFit.contain,
controller: MobileScannerController(
detectionTimeoutMs: 2000,
),
onDetect: onDetect))
: ElevatedButton(
style: ElevatedButton.styleFrom(
textStyle: const TextStyle(fontSize: 20)),
onPressed: () {
setState(() => scanning = true);
},
child: const Text('Scan QR Code'),
);
onDetect: onDetect,
),
ClipRRect(
borderRadius: BorderRadius.circular(20),
child: Container(
height: MediaQuery.of(context).size.height / 3,
width: MediaQuery.of(context).size.width * 0.8,
color: Colors.white.withOpacity(0.4))),
],
))
: TextIconButton(
text: "Scan",
onPressed: () => settingsProvider.scanning = true,
iconData: Icons.qr_code_scanner_outlined);
}
}

2
lib/widgets/view_form/view_form_page.dart
View File

@ -32,7 +32,7 @@ class ViewFormPage extends StatelessWidget {
if (!pageProvider.showForm)
Container(
margin: EdgeInsets.symmetric(vertical: height * 0.02),
child: RoundAddButton(
child: RoundButton(
iconData: Icons.add_outlined,
onPressed: tasksProvider.tasks[page] ?? true
? () => pageProvider.swap()