devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated packages, did things and maybe finally fixed login issue

Browse Source
This commit is contained in:
Kima
2024-11-12 23:27:14 +01:00
parent 939761695f
commit 2dafe5ed02
12 changed files with 258 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
refilc_mobile_ui/lib/screens/settings/settings_screen.dart
View File

@@ -42,6 +42,7 @@ import 'package:refilc_mobile_ui/screens/settings/accounts/account_view.dart';
import 'package:refilc_mobile_ui/screens/settings/notifications_screen.dart';
import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart';
import 'package:refilc_mobile_ui/screens/settings/settings_helper.dart';
import 'package:refilc_mobile_ui/screens/settings/submenu/code_scanner.dart';
import 'package:refilc_mobile_ui/screens/settings/submenu/extras_screen.dart';
import 'package:refilc_mobile_ui/screens/settings/submenu/personalize_screen.dart';
import 'package:flutter/foundation.dart';
@@ -1012,14 +1013,15 @@ class SettingsScreenState extends State<SettingsScreen>
children: [
PanelButton(
leading: Icon(
FeatherIcons.map,
Icons.qr_code,
size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95),
),
title: Text("stickermap".i18n),
onPressed: () => launchUrl(
Uri.parse("https://stickermap.refilc.hu"),
mode: LaunchMode.inAppBrowserView,
title: Text("qr_scanner".i18n),
onPressed: () => Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const CodeScannerScreen(),
),
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12.0),
@@ -1034,6 +1036,22 @@ class SettingsScreenState extends State<SettingsScreen>
),
title: Text("news".i18n),
onPressed: () => _openNews(context),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(4.0),
bottom: Radius.circular(4.0),
),
),
PanelButton(
leading: Icon(
FeatherIcons.map,
size: 22.0,
color: AppColors.of(context).text.withOpacity(0.95),
),
title: Text("stickermap".i18n),
onPressed: () => launchUrl(
Uri.parse("https://stickermap.refilc.hu"),
mode: LaunchMode.inAppBrowserView,
),
borderRadius: const BorderRadius.vertical(
top: Radius.circular(4.0),
bottom: Radius.circular(12.0),

3
refilc_mobile_ui/lib/screens/settings/settings_screen.i18n.dart
View File

@@ -131,6 +131,7 @@ extension SettingsLocalization on String {
"feedback": "Feedback",
"other": "Other",
"stickermap": "Sticker Map",
"qr_scanner": "QR Scanner",
},
"hu_hu": {
"heads_up": "Figyelem!",
@@ -260,6 +261,7 @@ extension SettingsLocalization on String {
"feedback": "Visszajelzés",
"other": "Egyéb",
"stickermap": "Matrica térkép",
"qr_scanner": "QR Kódolvasó",
},
"de_de": {
"heads_up": "Achtung!",
@@ -389,6 +391,7 @@ extension SettingsLocalization on String {
"feedback": "Feedback",
"other": "Sonstiges",
"stickermap": "Sticker Map",
"qr_scanner": "QR-Scanner",
},
};

136
refilc_mobile_ui/lib/screens/settings/submenu/code_scanner.dart Normal file
View File

@@ -0,0 +1,136 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
import 'package:refilc_mobile_ui/screens/settings/settings_screen.i18n.dart';
class CodeScannerScreen extends StatefulWidget {
const CodeScannerScreen({super.key});
@override
State<StatefulWidget> createState() => _CodeScannerScreenState();
}
class _CodeScannerScreenState extends State<CodeScannerScreen> {
Barcode? result;
QRViewController? controller;
final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
// In order to get hot reload to work we need to pause the camera if the platform
// is android, or resume the camera if the platform is iOS.
@override
void reassemble() {
super.reassemble();
if (Platform.isAndroid) {
controller!.pauseCamera();
}
controller!.resumeCamera();
}
// @override
// void initState() {
// super.initState();
// controller!.resumeCamera();
// }
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Colors.transparent,
title: Text('qr_scanner'.i18n),
leading: const BackButton(),
actions: [
IconButton(
icon: FutureBuilder(
future: controller?.getFlashStatus(),
builder: (context, snapshot) {
return Icon(
snapshot.data == true
? FeatherIcons.zapOff
: FeatherIcons.zap,
);
},
),
onPressed: () async {
await controller?.toggleFlash();
setState(() {});
},
),
],
),
body: _buildQrView(context),
// body: Column(
// children: <Widget>[
// Expanded(flex: 4, child: _buildQrView(context)),
// // Expanded(
// // flex: 1,
// // child: FittedBox(
// // fit: BoxFit.contain,
// // child: Column(
// // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
// // children: <Widget>[
// // if (result != null)
// // Text(
// // 'Barcode Type: ${describeEnum(result!.format)} Data: ${result!.code}')
// // else
// // const Text('Scan a code'),
// // ],
// // ),
// // ),
// // )
// ],
// ),
);
}
Widget _buildQrView(BuildContext context) {
// For this example we check how width or tall the device is and change the scanArea and overlay accordingly.
var scanArea = (MediaQuery.of(context).size.width < 400 ||
MediaQuery.of(context).size.height < 400)
? 150.0
: 280.0;
// To ensure the Scanner view is properly sizes after rotation
// we need to listen for Flutter SizeChanged notification and update controller
return QRView(
key: qrKey,
onQRViewCreated: _onQRViewCreated,
overlay: QrScannerOverlayShape(
borderColor: Theme.of(context).primaryColor,
borderRadius: 10,
borderLength: 30,
borderWidth: 10,
cutOutSize: scanArea,
),
onPermissionSet: (ctrl, p) => _onPermissionSet(context, ctrl, p),
);
}
void _onQRViewCreated(QRViewController controller) {
setState(() {
this.controller = controller;
});
controller.scannedDataStream.listen((scanData) {
setState(() {
result = scanData;
});
});
}
void _onPermissionSet(BuildContext context, QRViewController ctrl, bool p) {
// log('${DateTime.now().toIso8601String()}_onPermissionSet $p');
if (!p) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('no Permission')),
);
}
}
@override
void dispose() {
controller?.dispose();
super.dispose();
}
}

1
refilc_mobile_ui/lib/screens/settings/submenu/share_theme_popup.dart
View File

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:provider/provider.dart';
// import 'package:refilc/models/settings.dart';
import 'package:refilc/models/shared_theme.dart';
import 'package:refilc/theme/colors/colors.dart';
import 'package:refilc_kreta_api/providers/share_provider.dart';
import 'package:refilc_mobile_ui/common/action_button.dart';