From 8ff993bf197caff9f20b5ee75116fec7c49ac40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sun, 12 May 2024 14:44:12 +0200 Subject: [PATCH] removed old marianum message structure --- .../mhsl/message/getMessages/getMessages.dart | 14 ------ .../message/getMessages/getMessagesCache.dart | 17 ------- .../getMessages/getMessagesResponse.dart | 28 ----------- .../getMessages/getMessagesResponse.g.dart | 49 ------------------- lib/main.dart | 2 - lib/model/message/messageProps.dart | 25 ---------- 6 files changed, 135 deletions(-) delete mode 100644 lib/api/mhsl/message/getMessages/getMessages.dart delete mode 100644 lib/api/mhsl/message/getMessages/getMessagesCache.dart delete mode 100644 lib/api/mhsl/message/getMessages/getMessagesResponse.dart delete mode 100644 lib/api/mhsl/message/getMessages/getMessagesResponse.g.dart delete mode 100644 lib/model/message/messageProps.dart diff --git a/lib/api/mhsl/message/getMessages/getMessages.dart b/lib/api/mhsl/message/getMessages/getMessages.dart deleted file mode 100644 index 34bfc6b..0000000 --- a/lib/api/mhsl/message/getMessages/getMessages.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'dart:convert'; - -import 'package:http/http.dart' as http; - -import '../../mhslApi.dart'; -import 'getMessagesResponse.dart'; - -class GetMessages extends MhslApi { - GetMessages() : super('message/messages.json'); - @override - GetMessagesResponse assemble(String raw) => GetMessagesResponse.fromJson(jsonDecode(raw)); - @override - Future request(Uri uri) => http.get(uri); -} diff --git a/lib/api/mhsl/message/getMessages/getMessagesCache.dart b/lib/api/mhsl/message/getMessages/getMessagesCache.dart deleted file mode 100644 index fcb9afe..0000000 --- a/lib/api/mhsl/message/getMessages/getMessagesCache.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'dart:convert'; - -import '../../../requestCache.dart'; -import 'getMessages.dart'; -import 'getMessagesResponse.dart'; - -class GetMessagesCache extends RequestCache { - GetMessagesCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) { - start('message'); - } - - @override - GetMessagesResponse onLocalData(String json) => GetMessagesResponse.fromJson(jsonDecode(json)); - - @override - Future onLoad() => GetMessages().run(); -} diff --git a/lib/api/mhsl/message/getMessages/getMessagesResponse.dart b/lib/api/mhsl/message/getMessages/getMessagesResponse.dart deleted file mode 100644 index 107c492..0000000 --- a/lib/api/mhsl/message/getMessages/getMessagesResponse.dart +++ /dev/null @@ -1,28 +0,0 @@ -import 'package:json_annotation/json_annotation.dart'; - -import '../../../apiResponse.dart'; - -part 'getMessagesResponse.g.dart'; - -@JsonSerializable(explicitToJson: true) -class GetMessagesResponse extends ApiResponse { - String base; - Set messages; - - GetMessagesResponse(this.base, this.messages); - - factory GetMessagesResponse.fromJson(Map json) => _$GetMessagesResponseFromJson(json); - Map toJson() => _$GetMessagesResponseToJson(this); -} - -@JsonSerializable(explicitToJson: true) -class GetMessagesResponseObject { - String name; - String date; - String url; - - GetMessagesResponseObject(this.name, this.date, this.url); - - factory GetMessagesResponseObject.fromJson(Map json) => _$GetMessagesResponseObjectFromJson(json); - Map toJson() => _$GetMessagesResponseObjectToJson(this); -} diff --git a/lib/api/mhsl/message/getMessages/getMessagesResponse.g.dart b/lib/api/mhsl/message/getMessages/getMessagesResponse.g.dart deleted file mode 100644 index 393b020..0000000 --- a/lib/api/mhsl/message/getMessages/getMessagesResponse.g.dart +++ /dev/null @@ -1,49 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'getMessagesResponse.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -GetMessagesResponse _$GetMessagesResponseFromJson(Map json) => - GetMessagesResponse( - json['base'] as String, - (json['messages'] as List) - .map((e) => - GetMessagesResponseObject.fromJson(e as Map)) - .toSet(), - )..headers = (json['headers'] as Map?)?.map( - (k, e) => MapEntry(k, e as String), - ); - -Map _$GetMessagesResponseToJson(GetMessagesResponse instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('headers', instance.headers); - val['base'] = instance.base; - val['messages'] = instance.messages.map((e) => e.toJson()).toList(); - return val; -} - -GetMessagesResponseObject _$GetMessagesResponseObjectFromJson( - Map json) => - GetMessagesResponseObject( - json['name'] as String, - json['date'] as String, - json['url'] as String, - ); - -Map _$GetMessagesResponseObjectToJson( - GetMessagesResponseObject instance) => - { - 'name': instance.name, - 'date': instance.date, - 'url': instance.url, - }; diff --git a/lib/main.dart b/lib/main.dart index 53189a2..b4bebb9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -25,7 +25,6 @@ import 'model/chatList/chatListProps.dart'; import 'model/chatList/chatProps.dart'; import 'model/files/filesProps.dart'; import 'model/holidays/holidaysProps.dart'; -import 'model/message/messageProps.dart'; import 'model/timetable/timetableProps.dart'; import 'storage/base/settingsProvider.dart'; import 'theming/darkAppTheme.dart'; @@ -71,7 +70,6 @@ Future main() async { ChangeNotifierProvider(create: (context) => ChatProps()), ChangeNotifierProvider(create: (context) => FilesProps()), - ChangeNotifierProvider(create: (context) => MessageProps()), ChangeNotifierProvider(create: (context) => HolidaysProps()), ], child: const Main(), diff --git a/lib/model/message/messageProps.dart b/lib/model/message/messageProps.dart deleted file mode 100644 index c2e2a37..0000000 --- a/lib/model/message/messageProps.dart +++ /dev/null @@ -1,25 +0,0 @@ - -import '../../api/apiResponse.dart'; -import '../../api/mhsl/message/getMessages/getMessagesCache.dart'; -import '../../api/mhsl/message/getMessages/getMessagesResponse.dart'; -import '../dataHolder.dart'; - -class MessageProps extends DataHolder { - GetMessagesResponse? _getMessagesResponse; - GetMessagesResponse get getMessagesResponse => _getMessagesResponse!; - - @override - List properties() => [_getMessagesResponse]; - - @override - void run({renew}) { - GetMessagesCache( - renew: renew, - onUpdate: (GetMessagesResponse data) => { - _getMessagesResponse = data, - notifyListeners(), - } - ); - } - -}