From 07b32f1e32fb5df0eed9057ef6ba47d42eb3a91a Mon Sep 17 00:00:00 2001 From: Pupsi28 Date: Mon, 1 Apr 2024 12:57:27 +0200 Subject: [PATCH] added option to attach image to feedback --- .../pages/more/feedback/feedbackDialog.dart | 177 ++++++++---------- 1 file changed, 77 insertions(+), 100 deletions(-) diff --git a/lib/view/pages/more/feedback/feedbackDialog.dart b/lib/view/pages/more/feedback/feedbackDialog.dart index e37e858..3f63e26 100644 --- a/lib/view/pages/more/feedback/feedbackDialog.dart +++ b/lib/view/pages/more/feedback/feedbackDialog.dart @@ -6,10 +6,13 @@ import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; import 'package:loader_overlay/loader_overlay.dart'; import 'package:package_info/package_info.dart'; +import 'package:provider/provider.dart'; +import 'package:badges/badges.dart' as badges; import '../../../../api/mhsl/server/feedback/addFeedback.dart'; import '../../../../api/mhsl/server/feedback/addFeedbackParams.dart'; import '../../../../model/accountData.dart'; +import '../../../../storage/base/settingsProvider.dart'; import '../../../../widget/filePick.dart'; import '../../../../widget/infoDialog.dart'; @@ -26,6 +29,18 @@ class _FeedbackDialogState extends State { final TextEditingController _feedbackInput = TextEditingController(); Uint8List? _image; String? _error; + bool _textFieldEmpty = false; + + @override + void initState() { + super.initState(); + _feedbackInput.addListener(() { + setState(() { + _textFieldEmpty = _feedbackInput.text.isEmpty; + _error = null; + }); + }); + } @override Widget build(BuildContext context) { @@ -46,53 +61,85 @@ class _FeedbackDialogState extends State { child: TextField( controller: _feedbackInput, autofocus: true, - decoration: const InputDecoration( - border: OutlineInputBorder(), - label: Text('Feedback und Verbesserungen'), + decoration: InputDecoration( + border: const OutlineInputBorder(), + label: const Text('Feedback und Verbesserungen'), + errorText: _textFieldEmpty ? 'Bitte gib eine Beschreibung an' : null, ), - // style: TextStyle(), - // expands: true, minLines: 4, maxLines: 7, ), ), - if(_image != null) Container( - decoration: BoxDecoration( - borderRadius: const BorderRadius.all(Radius.circular(5)), - border: Border.all( - width: 3, - color: Theme.of(context).primaryColor, + const SizedBox(height: 10), + if(_image != null) Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + badges.Badge( + badgeContent: const Icon(Icons.close_outlined, size: 17), + badgeStyle: const badges.BadgeStyle( + padding: EdgeInsets.all(2), + ), + child: Container( + decoration: BoxDecoration( + borderRadius: const BorderRadius.all(Radius.circular(5)), + border: Border.all( + width: 3, + color: Theme.of(context).primaryColor, + ), + ), + height: 150, + child: Image( + image: Image.memory(_image!).image, + fit: BoxFit.contain, + ), + ), + onTap: () async { + setState(() { + _image = null; + }); + }, + ), + ], + ), + Padding( + padding: const EdgeInsets.all(5), + child: Visibility( + visible: _error != null, + child: Visibility( + visible: Provider.of(context, listen: false).val().devToolsEnabled, + replacement: const Text('Senden fehlgeschlagen, bitte überprüfe die Internetverbindung.', textAlign: TextAlign.center, style: TextStyle(color: Colors.red)), + child: Text('Senden fehlgeschlagen: \n $_error', textAlign: TextAlign.center, style: const TextStyle(color: Colors.red)), ), ), - height: 150, - child: Image( - image: Image.memory(_image!).image, - fit: BoxFit.contain, - ), - ), - Visibility( - visible: _error != null, - child: Text('Senden fehlgeschlagen: $_error', style: const TextStyle(color: Colors.red)), ), Padding( padding: const EdgeInsets.only(right: 20, left: 10), child: Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - IconButton( - onPressed: () async { - context.loaderOverlay.show(); - var imageData = await (await FilePick.galleryPick())?.readAsBytes(); - context.loaderOverlay.hide(); - setState(() { - _image = imageData; - }); - }, - icon: const Icon(Icons.attach_file_outlined), + Visibility( + visible: _image == null, + child: IconButton( + onPressed: () async { + context.loaderOverlay.show(); + var imageData = await (await FilePick.galleryPick())?.readAsBytes(); + context.loaderOverlay.hide(); + setState(() { + _image = imageData; + }); + }, + icon: const Icon(Icons.attach_file_outlined), + ), ), const Expanded(child: SizedBox.shrink()), TextButton( onPressed: () async { + if(_feedbackInput.text.isEmpty){ + setState(() { + _textFieldEmpty = true; + }); + return; + } context.loaderOverlay.show(); AddFeedback( AddFeedbackParams( @@ -122,75 +169,5 @@ class _FeedbackDialogState extends State { ), ); - /* - return Scaffold( - appBar: AppBar( - title: const Text('Raumplan'), - ), - body: PhotoView( - imageProvider: Image.asset('assets/img/raumplan.jpg').image, - minScale: 0.5, - maxScale: 2.0, - backgroundDecoration: BoxDecoration(color: Theme.of(context).colorScheme.background), - ), - ); - */ - - /* - return AlertDialog( - - title: const Text('Feedback'), - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - const Text('Feedback, Anregungen, Ideen, Fehler und Verbesserungen'), - const SizedBox(height: 10), - const Text('Bitte gib keine geheimen Daten wie z.B. Passwörter weiter.', style: TextStyle(fontSize: 10)), - const SizedBox(height: 10), - TextField( - controller: _feedbackInput, - autofocus: true, - decoration: const InputDecoration( - border: OutlineInputBorder(), - label: Text('Feedback und Verbesserungen') - ), - // style: TextStyle(), - // expands: true, - minLines: 3, - maxLines: 5, - ), - Visibility( - visible: _error != null, - child: Text('Senden fehlgeschlagen: $_error', style: const TextStyle(color: Colors.red)) - ) - ], - ), - actions: [ - TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('Abbrechen')), - TextButton( - onPressed: () async { - AddFeedback( - AddFeedbackParams( - user: AccountData().getUserSecret(), - feedback: _feedbackInput.text, - appVersion: int.parse((await PackageInfo.fromPlatform()).buildNumber) - ) - ) - .run() - .then((value) { - Navigator.of(context).pop(); - InfoDialog.show(context, 'Danke für dein Feedback!'); - }) - .catchError((error, trace) { - setState(() { - _error = error.toString(); - }); - }); - }, - child: const Text('Senden'), - ) - ], - ); - */ } }