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

Refactor codebase resolving warnings and remove self-package imports

Browse Source
This commit is contained in:
Elias Müller
2023-06-03 11:27:14 +02:00
parent 6d0898d6ac
commit f0da6f2596
79 changed files with 204 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/api/marianumcloud/talk/chat/getChat.dart
View File

@ -1,11 +1,11 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:http/src/response.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/chat/getChatResponse.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/talkApi.dart';
import 'package:http/http.dart';
import '../talkApi.dart';
import 'getChatParams.dart';
import 'getChatResponse.dart';
class GetChat extends TalkApi<GetChatResponse> {
String chatToken;

8
lib/api/marianumcloud/talk/chat/getChatCache.dart
View File

@ -1,9 +1,9 @@
import 'dart:convert';
import 'package:marianum_mobile/api/marianumcloud/talk/chat/getChat.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/chat/getChatParams.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/chat/getChatResponse.dart';
import 'package:marianum_mobile/api/requestCache.dart';
import '../../../requestCache.dart';
import 'getChat.dart';
import 'getChatParams.dart';
import 'getChatResponse.dart';
class GetChatCache extends RequestCache<GetChatResponse> {
String chatToken;

3
lib/api/marianumcloud/talk/chat/getChatParams.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiParams.dart';
import '../../../apiParams.dart';
part 'getChatParams.g.dart';

5
lib/api/marianumcloud/talk/chat/getChatResponse.dart
View File

@ -1,6 +1,7 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoomResponse.dart';
import '../../../apiResponse.dart';
import '../room/getRoomResponse.dart';
part 'getChatResponse.g.dart';

2
lib/api/marianumcloud/talk/chat/richObjectStringProcessor.dart
View File

@ -1,5 +1,5 @@
import 'package:marianum_mobile/api/marianumcloud/talk/chat/getChatResponse.dart';
import 'getChatResponse.dart';
class RichObjectStringProcessor {
static String parseToString(String message, Map<String, RichObjectString>? data) {

4
lib/api/marianumcloud/talk/room/getRoom.dart
View File

@ -1,10 +1,10 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoomResponse.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/talkApi.dart';
import '../talkApi.dart';
import 'getRoomParams.dart';
import 'getRoomResponse.dart';
class GetRoom extends TalkApi<GetRoomResponse> {

6
lib/api/marianumcloud/talk/room/getRoomCache.dart
View File

@ -1,10 +1,10 @@
import 'dart:convert';
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoomParams.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoomResponse.dart';
import 'package:marianum_mobile/api/requestCache.dart';
import '../../../requestCache.dart';
import 'getRoom.dart';
import 'getRoomParams.dart';
import 'getRoomResponse.dart';
class GetRoomCache extends RequestCache<GetRoomResponse> {
GetRoomCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {

2
lib/api/marianumcloud/talk/room/getRoomResponse.dart
View File

@ -1,6 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
import '../chat/getChatResponse.dart';
part 'getRoomResponse.g.dart';

6
lib/api/marianumcloud/talk/sendMessage/sendMessage.dart
View File

@ -1,9 +1,9 @@
import 'package:http/http.dart' as http;
import 'package:http/src/response.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/sendMessage/sendMessageParams.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/talkApi.dart';
import 'package:http/http.dart';
import '../../../apiParams.dart';
import '../talkApi.dart';
import 'sendMessageParams.dart';
class SendMessage extends TalkApi {
String chatToken;

3
lib/api/marianumcloud/talk/sendMessage/sendMessageParams.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiParams.dart';
import '../../../apiParams.dart';
part 'sendMessageParams.g.dart';

2
lib/api/marianumcloud/talk/sendMessage/sendMessageResponse.dart
View File

@ -1,4 +1,4 @@
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
class SendMessageResponse extends ApiResponse {

4
lib/api/marianumcloud/talk/talkApi.dart
View File

@ -1,9 +1,9 @@
import 'package:http/http.dart' as http;
import 'package:marianum_mobile/api/apiError.dart';
import 'package:marianum_mobile/api/apiRequest.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../../apiError.dart';
import '../../apiParams.dart';
import '../../apiRequest.dart';
enum TalkApiMethod {
get,

7
lib/api/marianumcloud/webdav/queries/downloadFile/downloadFile.dart
View File

@ -1,7 +1,8 @@
import 'package:marianum_mobile/api/apiResponse.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/downloadFile/downloadFileParams.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/webdavApi.dart';
import '../../../../apiResponse.dart';
import '../../webdavApi.dart';
import 'downloadFileParams.dart';
class DownloadFile extends WebdavApi<DownloadFileParams> {
DownloadFileParams params;

3
lib/api/marianumcloud/webdav/queries/downloadFile/downloadFileParams.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiParams.dart';
import '../../../../apiParams.dart';
part 'downloadFileParams.g.dart';

9
lib/api/marianumcloud/webdav/queries/listFiles/listFiles.dart
View File

@ -1,10 +1,11 @@
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/cacheableFile.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/listFilesParams.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/listFilesResponse.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/webdavApi.dart';
import 'package:nextcloud/nextcloud.dart';
import '../../webdavApi.dart';
import 'cacheableFile.dart';
import 'listFilesParams.dart';
import 'listFilesResponse.dart';
class ListFiles extends WebdavApi<ListFilesParams> {
ListFilesParams params;

9
lib/api/marianumcloud/webdav/queries/listFiles/listFilesCache.dart
View File

@ -1,9 +1,10 @@
import 'dart:convert';
import 'package:crypto/crypto.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/listFiles.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/listFilesParams.dart';
import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/listFilesResponse.dart';
import 'package:marianum_mobile/api/requestCache.dart';
import '../../../../requestCache.dart';
import 'listFiles.dart';
import 'listFilesParams.dart';
import 'listFilesResponse.dart';
class ListFilesCache extends RequestCache<ListFilesResponse> {
String path;

2
lib/api/marianumcloud/webdav/queries/listFiles/listFilesResponse.dart
View File

@ -1,6 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../../apiResponse.dart';
import 'cacheableFile.dart';
part 'listFilesResponse.g.dart';

2
lib/api/marianumcloud/webdav/webdavApi.dart
View File

@ -1,7 +1,7 @@
import 'package:marianum_mobile/api/apiRequest.dart';
import 'package:nextcloud/nextcloud.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../../apiRequest.dart';
import '../../apiResponse.dart';
abstract class WebdavApi<T> extends ApiRequest {

5
lib/api/mhsl/message/getMessages/getMessages.dart
View File

@ -1,8 +1,9 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:marianum_mobile/api/mhsl/message/getMessages/getMessagesResponse.dart';
import 'package:marianum_mobile/api/mhsl/message/messageApi.dart';
import '../messageApi.dart';
import 'getMessagesResponse.dart';
class GetMessages extends MessageApi<GetMessagesResponse> {

5
lib/api/mhsl/message/getMessages/getMessagesCache.dart
View File

@ -1,9 +1,8 @@
import 'dart:convert';
import 'package:marianum_mobile/api/mhsl/message/getMessages/getMessagesResponse.dart';
import 'package:marianum_mobile/api/requestCache.dart';
import '../../../requestCache.dart';
import 'getMessages.dart';
import 'getMessagesResponse.dart';
class GetMessagesCache extends RequestCache<GetMessagesResponse> {
GetMessagesCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {

3
lib/api/mhsl/message/getMessages/getMessagesResponse.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
part 'getMessagesResponse.g.dart';

3
lib/api/requestCache.dart
View File

@ -1,7 +1,8 @@
import 'dart:convert';
import 'package:localstore/localstore.dart';
import 'package:marianum_mobile/api/webuntis/webuntisError.dart';
import 'webuntis/webuntisError.dart';
abstract class RequestCache<T> {
static const int cacheNothing = 0;

2
lib/api/webuntis/queries/authenticate/authenticate.dart
View File

@ -2,9 +2,9 @@ import 'dart:async';
import 'dart:convert';
import 'dart:developer';
import 'package:marianum_mobile/api/webuntis/webuntisApi.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../../webuntisApi.dart';
import 'authenticateParams.dart';
import 'authenticateResponse.dart';

3
lib/api/webuntis/queries/authenticate/authenticateParams.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiParams.dart';
import '../../../apiParams.dart';
part 'authenticateParams.g.dart';

3
lib/api/webuntis/queries/authenticate/authenticateResponse.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
part 'authenticateResponse.g.dart';

3
lib/api/webuntis/queries/getHolidays/getHolidays.dart
View File

@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:marianum_mobile/api/webuntis/webuntisApi.dart';
import '../../webuntisApi.dart';
import 'getHolidaysResponse.dart';
class GetHolidays extends WebuntisApi {

6
lib/api/webuntis/queries/getHolidays/getHolidaysCache.dart
View File

@ -1,8 +1,8 @@
import 'dart:convert';
import 'package:marianum_mobile/api/requestCache.dart';
import 'package:marianum_mobile/api/webuntis/queries/getHolidays/getHolidays.dart';
import 'package:marianum_mobile/api/webuntis/queries/getHolidays/getHolidaysResponse.dart';
import '../../../requestCache.dart';
import 'getHolidays.dart';
import 'getHolidaysResponse.dart';
class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
GetHolidaysCache({onUpdate}) : super(RequestCache.cacheDay, onUpdate) {

3
lib/api/webuntis/queries/getHolidays/getHolidaysResponse.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
part 'getHolidaysResponse.g.dart';

3
lib/api/webuntis/queries/getRooms/getRooms.dart
View File

@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:marianum_mobile/api/webuntis/webuntisApi.dart';
import '../../webuntisApi.dart';
import 'getRoomsResponse.dart';
class GetRooms extends WebuntisApi {

5
lib/api/webuntis/queries/getRooms/getRoomsCache.dart
View File

@ -1,9 +1,8 @@
import 'dart:convert';
import 'package:marianum_mobile/api/requestCache.dart';
import 'package:marianum_mobile/api/webuntis/queries/getRooms/getRoomsResponse.dart';
import '../../../requestCache.dart';
import 'getRooms.dart';
import 'getRoomsResponse.dart';
class GetRoomsCache extends RequestCache<GetRoomsResponse> {
GetRoomsCache({onUpdate}) : super(RequestCache.cacheHour, onUpdate) {

3
lib/api/webuntis/queries/getRooms/getRoomsResponse.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
part 'getRoomsResponse.g.dart';

3
lib/api/webuntis/queries/getSubjects/getSubjects.dart
View File

@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:marianum_mobile/api/webuntis/webuntisApi.dart';
import '../../webuntisApi.dart';
import 'getSubjectsResponse.dart';
class GetSubjects extends WebuntisApi {

5
lib/api/webuntis/queries/getSubjects/getSubjectsCache.dart
View File

@ -1,9 +1,8 @@
import 'dart:convert';
import 'package:marianum_mobile/api/requestCache.dart';
import 'package:marianum_mobile/api/webuntis/queries/getSubjects/getSubjectsResponse.dart';
import '../../../requestCache.dart';
import 'getSubjects.dart';
import 'getSubjectsResponse.dart';
class GetSubjectsCache extends RequestCache<GetSubjectsResponse> {
GetSubjectsCache({onUpdate}) : super(RequestCache.cacheHour, onUpdate) {

3
lib/api/webuntis/queries/getSubjects/getSubjectsResponse.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
part 'getSubjectsResponse.g.dart';

3
lib/api/webuntis/queries/getTimetable/getTimetable.dart
View File

@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:marianum_mobile/api/webuntis/webuntisApi.dart';
import '../../webuntisApi.dart';
import 'getTimetableParams.dart';
import 'getTimetableResponse.dart';

3
lib/api/webuntis/queries/getTimetable/getTimetableCache.dart
View File

@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:marianum_mobile/api/requestCache.dart';
import '../../../requestCache.dart';
import '../authenticate/authenticate.dart';
import 'getTimetable.dart';
import 'getTimetableParams.dart';

3
lib/api/webuntis/queries/getTimetable/getTimetableParams.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiParams.dart';
import '../../../apiParams.dart';
part 'getTimetableParams.g.dart';

3
lib/api/webuntis/queries/getTimetable/getTimetableResponse.dart
View File

@ -1,5 +1,6 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../../../apiResponse.dart';
part 'getTimetableResponse.g.dart';

6
lib/api/webuntis/webuntisApi.dart
View File

@ -1,11 +1,11 @@
import 'dart:convert';
import 'package:marianum_mobile/api/apiRequest.dart';
import 'package:http/http.dart' as http;
import 'package:marianum_mobile/api/webuntis/webuntisError.dart';
import 'package:marianum_mobile/api/apiResponse.dart';
import '../apiParams.dart';
import '../apiRequest.dart';
import '../apiResponse.dart';
import 'queries/authenticate/authenticate.dart';
import 'webuntisError.dart';
abstract class WebuntisApi extends ApiRequest {
Uri endpoint = Uri.parse("https://peleus.webuntis.com/WebUntis/jsonrpc.do?school=marianum-fulda");