MarianumMobile/Client
MarianumMobile/Client
5
1
Fork 0
Code Issues 33 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'develop' into develop-moreEmojiReactions

Browse Source
This commit is contained in:
Lars Neuhaus 2024-04-02 16:26:33 +00:00
commit 0a577b5f48
12 changed files with 182 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api/mhsl/server/feedback/addFeedbackParams.dart
View File

@ -6,12 +6,14 @@ part 'addFeedbackParams.g.dart';
class AddFeedbackParams {
String user;
String feedback;
String? screenshot;
int appVersion;
AddFeedbackParams({
required this.user,
required this.feedback,
this.screenshot,
required this.appVersion,
});

2
lib/api/mhsl/server/feedback/addFeedbackParams.g.dart
View File

@ -10,6 +10,7 @@ AddFeedbackParams _$AddFeedbackParamsFromJson(Map<String, dynamic> json) =>
AddFeedbackParams(
user: json['user'] as String,
feedback: json['feedback'] as String,
screenshot: json['screenshot'] as String?,
appVersion: json['appVersion'] as int,
);
@ -17,5 +18,6 @@ Map<String, dynamic> _$AddFeedbackParamsToJson(AddFeedbackParams instance) =>
<String, dynamic>{
'user': instance.user,
'feedback': instance.feedback,
'screenshot': instance.screenshot,
'appVersion': instance.appVersion,
};

3
lib/app.dart
View File

@ -14,6 +14,7 @@ import 'api/mhsl/server/userIndex/update/updateUserindex.dart';
import 'model/breakers/Breaker.dart';
import 'model/breakers/BreakerProps.dart';
import 'model/chatList/chatListProps.dart';
import 'model/dataCleaner.dart';
import 'model/timetable/timetableProps.dart';
import 'notification/notificationController.dart';
import 'notification/notificationTasks.dart';
@ -87,6 +88,8 @@ class _AppState extends State<App> with WidgetsBindingObserver {
FirebaseMessaging.onMessageOpenedApp.listen((message) => NotificationController.onAppOpenedByNotification(message, context));
FirebaseMessaging.instance.getInitialMessage().then((message) => message == null ? null : NotificationController.onAppOpenedByNotification(message, context));
DataCleaner.cleanOldCache();
super.initState();
}

15
lib/model/dataCleaner.dart Normal file
View File

@ -0,0 +1,15 @@
import 'package:localstore/localstore.dart';
import '../widget/debug/cacheView.dart';
class DataCleaner {
static void cleanOldCache() async {
var cacheData = await Localstore.instance.collection(CacheView.collection).get();
cacheData?.forEach((key, value) async {
DateTime lastUpdate = DateTime.fromMillisecondsSinceEpoch(value['lastupdate']);
if(DateTime.now().subtract(const Duration(days: 200)).isAfter(lastUpdate)) {
await Localstore.instance.collection(CacheView.collection).doc(key.split('/').last).delete();
}
});
}
}

191
lib/view/pages/more/feedback/feedbackDialog.dart
View File

@ -1,10 +1,20 @@
import 'dart:convert';
import 'dart:typed_data';
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/focusBehaviour.dart';
import '../../../../widget/infoDialog.dart';
class FeedbackDialog extends StatefulWidget {
@ -15,64 +25,151 @@ class FeedbackDialog extends StatefulWidget {
}
class _FeedbackDialogState extends State<FeedbackDialog> {
final ImagePicker picker = ImagePicker();
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) {
return AlertDialog(
title: const Text('Feedback'),
content: Column(
mainAxisSize: MainAxisSize.min,
return Scaffold(
appBar: AppBar(
title: const Text('Feedback'),
),
body: Column(
mainAxisSize: MainAxisSize.max,
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')
const SizedBox(height: 5),
const Text('Feedback, Anregungen, Ideen, Fehler und Verbesserungen', textAlign: TextAlign.center),
const SizedBox(height: 15),
const Text('Bitte gib keine geheimen Daten wie z.B. Passwörter weiter.', textAlign: TextAlign.center, style: TextStyle(fontSize: 11)),
const SizedBox(height: 20),
Padding(
padding: const EdgeInsets.all(10),
child: TextField(
controller: _feedbackInput,
autofocus: true,
decoration: InputDecoration(
border: const OutlineInputBorder(),
label: const Text('Feedback und Verbesserungen'),
errorText: _textFieldEmpty ? 'Bitte gib eine Beschreibung an' : null,
),
minLines: 4,
maxLines: 7,
onTapOutside: (PointerDownEvent event) => FocusBehaviour.textFieldTapOutside(context),
),
// style: TextStyle(),
// expands: true,
minLines: 3,
maxLines: 5,
),
Visibility(
visible: _error != null,
child: Text('Senden fehlgeschlagen: $_error', style: const TextStyle(color: Colors.red))
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<SettingsProvider>(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)),
),
),
),
Padding(
padding: const EdgeInsets.only(right: 20, left: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
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(
user: AccountData().getUserSecret(),
feedback: _feedbackInput.text,
screenshot: _image != null ? base64Encode(_image!) : null,
appVersion: int.parse((await PackageInfo.fromPlatform()).buildNumber),
)
).run().then((value) {
Navigator.of(context).pop();
InfoDialog.show(context, 'Danke für dein Feedback!');
context.loaderOverlay.hide();
}).catchError((error, trace) {
setState(() {
_error = error.toString();
});
context.loaderOverlay.hide();
});
},
child: const Text('Senden'),
)
]
)
)
],
),
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'),
)
],
);
}
}

2
lib/view/pages/overhang.dart
View File

@ -74,7 +74,7 @@ class Overhang extends StatelessWidget {
title: const Text('Du hast eine Idee?'),
subtitle: const Text('Fehler und Verbessungsvorschläge'),
trailing: const Icon(Icons.arrow_right),
onTap: () => showDialog(context: context, barrierDismissible: false, builder: (context) => const FeedbackDialog()),
onTap: () => pushScreen(context, withNavBar: false, screen: const FeedbackDialog()),
),
],
),

2
lib/view/pages/talk/chatView.dart
View File

@ -115,7 +115,7 @@ class _ChatViewState extends State<ChatView> {
scale: 1.5,
opacity: 1,
repeat: ImageRepeat.repeat,
invertColors: AppTheme.isDarkMode(context)
invertColors: AppTheme.isDarkMode(context),
)
),
child: data.primaryLoading() ? const LoadingSpinner() : Column(

2
lib/view/pages/talk/components/chatTextfield.dart
View File

@ -14,6 +14,7 @@ import '../../../../api/marianumcloud/webdav/webdavApi.dart';
import '../../../../model/chatList/chatProps.dart';
import '../../../../storage/base/settingsProvider.dart';
import '../../../../widget/filePick.dart';
import '../../../../widget/focusBehaviour.dart';
import '../../files/fileUploadDialog.dart';
class ChatTextfield extends StatefulWidget {
@ -156,6 +157,7 @@ class _ChatTextfieldState extends State<ChatTextfield> {
}
setDraft(text);
},
onTapOutside: (PointerDownEvent event) => FocusBehaviour.textFieldTapOutside(context),
),
),
const SizedBox(width: 15),

3
lib/view/pages/timetable/customTimetableEventEditDialog.dart
View File

@ -15,6 +15,7 @@ import '../../../api/mhsl/customTimetableEvent/update/updateCustomTimetableEvent
import '../../../api/mhsl/customTimetableEvent/update/updateCustomTimetableEventParams.dart';
import '../../../model/accountData.dart';
import '../../../model/timetable/timetableProps.dart';
import '../../../widget/focusBehaviour.dart';
import '../../../widget/infoDialog.dart';
import 'customTimetableColors.dart';
@ -67,6 +68,7 @@ class _AddCustomTimetableEventDialogState extends State<CustomTimetableEventEdit
labelText: 'Terminname',
border: OutlineInputBorder()
),
onTapOutside: (PointerDownEvent event) => FocusBehaviour.textFieldTapOutside(context),
),
),
ListTile(
@ -78,6 +80,7 @@ class _AddCustomTimetableEventDialogState extends State<CustomTimetableEventEdit
labelText: 'Beschreibung',
border: OutlineInputBorder()
),
onTapOutside: (PointerDownEvent event) => FocusBehaviour.textFieldTapOutside(context),
),
),
const Divider(),

4
lib/widget/debug/cacheView.dart
View File

@ -11,7 +11,7 @@ import '../../../widget/placeholderView.dart';
import 'jsonViewer.dart';
class CacheView extends StatefulWidget {
final collection = 'MarianumMobile';
static String collection = 'MarianumMobile';
const CacheView({super.key});
@override
@ -34,7 +34,7 @@ class _CacheViewState extends State<CacheView> {
@override
void initState() {
files = Localstore.instance.collection(widget.collection).get();
files = Localstore.instance.collection(CacheView.collection).get();
super.initState();
}

7
lib/widget/focusBehaviour.dart Normal file
View File

@ -0,0 +1,7 @@
import 'package:flutter/cupertino.dart';
class FocusBehaviour {
static void textFieldTapOutside(BuildContext context) {
FocusScope.of(context).requestFocus(FocusNode());
}
}

23
lib/widget/quickMenu.dart
View File

@ -1,23 +0,0 @@
import 'package:flutter/material.dart';
class QuickMenu {
static void quickMenu(BuildContext context, BuildContext widgetContext, List<PopupMenuItem<dynamic>> items) {
final RenderBox overlay = Overlay.of(context).context.findRenderObject() as RenderBox;
final RenderBox widgetRenderBox = widgetContext.findRenderObject() as RenderBox;
final Offset position = widgetRenderBox.localToGlobal(Offset.zero);
showMenu(
context: context,
position: RelativeRect.fromRect(
Rect.fromPoints(
position,
position.translate(0, 0),
),
Offset.zero & overlay.size,
),
items: items,
);
}
}