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

Cleanup

Browse Source
This commit is contained in:
Elias Müller
2023-02-20 13:32:14 +01:00
parent fea36b9a6d
commit edd8c1600a
27 changed files with 17 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/screen/pages/talk/chatList.dart
View File

@ -1,12 +1,8 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoomResponse.dart';
import 'package:marianum_mobile/data/chatList/chatListProps.dart';
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
@ -49,7 +45,7 @@ class _ChatListState extends State<ChatList> {
for (var chatRoom in data.getRoomsResponse.sortByLastActivity()) {
CircleAvatar _circleAvatar = CircleAvatar(
CircleAvatar circleAvatar = CircleAvatar(
foregroundImage: chatRoom.type == GetRoomResponseObjectConversationType.oneToOne ? Image.network("https://cloud.marianum-fulda.de/avatar/${chatRoom.name}/128").image : null,
backgroundColor: Theme.of(context).primaryColor,
foregroundColor: Colors.white,
@ -81,13 +77,13 @@ class _ChatListState extends State<ChatList> {
),
),
),
leading: _circleAvatar,
leading: circleAvatar,
onTap: () async {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return ChatView(
user: chatRoom,
selfId: username,
avatar: _circleAvatar,
avatar: circleAvatar,
);
}));
},

6
lib/screen/pages/talk/chatView.dart
View File

@ -1,4 +1,3 @@
import 'dart:developer';
import 'package:bubble/bubble.dart';
import 'package:flutter/material.dart';
@ -63,7 +62,6 @@ class _ChatViewState extends State<ChatView> {
List<Bubble> messages = List<Bubble>.empty(growable: true);
if(!data.primaryLoading()) {
String lastActor = "";
bool showMetadata = true;
data.getChatResponse.sortByTimestamp().forEach((element) {
@ -93,7 +91,7 @@ class _ChatViewState extends State<ChatView> {
child: Positioned(
top: 0,
left: 0,
child: Text("${element.actorDisplayName}", style: TextStyle(fontWeight: FontWeight.bold, color: Theme.of(context).primaryColor)),
child: Text(element.actorDisplayName, style: TextStyle(fontWeight: FontWeight.bold, color: Theme.of(context).primaryColor)),
),
),
Padding(
@ -114,8 +112,6 @@ class _ChatViewState extends State<ChatView> {
],
),
));
lastActor = element.actorId;
});
}

9
lib/screen/pages/timetable/timetable.dart
View File

@ -1,18 +1,9 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getRooms/getRoomsResponse.dart';
import 'package:marianum_mobile/api/webuntis/queries/getSubjects/getSubjectsResponse.dart';
import 'package:marianum_mobile/data/timetable/timetableProps.dart';
import 'package:marianum_mobile/screen/pages/timetable/dayListView.dart';
import 'package:marianum_mobile/screen/pages/timetable/testTimetable.dart';
import 'package:marianum_mobile/widget/loadingSpinner.dart';
import 'package:provider/provider.dart';
import 'package:timetable_view/timetable_view.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
class Timetable extends StatefulWidget {
const Timetable({Key? key}) : super(key: key);

14
lib/screen/pages/timetable/timetableOld.dart
View File

@ -1,7 +1,5 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:provider/provider.dart';
@ -41,10 +39,10 @@ class _TimetableOldState extends State<TimetableOld> {
List<LaneEvents> _buildLaneEvents(context, TimetablePacket data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
data.timeTable.days.forEach((day) {
for (var day in data.timeTable.days) {
List<TableEvent> tableEvents = List<TableEvent>.empty(growable: true);
day.entries.forEach((element) {
for (var element in day.entries) {
tableEvents.add(
TableEvent(
backgroundColor: Theme.of(context).primaryColor,
@ -57,7 +55,7 @@ class _TimetableOldState extends State<TimetableOld> {
endTime: TableEventTime(hour: element.end.hour, minute: element.end.minute)
)
);
});
}
laneEvents.add(
LaneEvents(
@ -65,7 +63,7 @@ class _TimetableOldState extends State<TimetableOld> {
events: tableEvents
)
);
});
}
return laneEvents;
@ -97,9 +95,9 @@ class CustomTableStyle extends TimetableStyle {
@override
double get laneWidth => 200;
@override
Color get cornerColor => Theme.of(this.context).primaryColor;
Color get cornerColor => Theme.of(context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(this.context).primaryColor;
Color get timeItemTextColor => Theme.of(context).primaryColor;
@override
// TODO: implement timeItemHeight
double get timeItemHeight => 60;

3
lib/screen/settings/debug/debugOverview.dart
View File

@ -1,7 +1,4 @@
import 'dart:convert';
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
import 'package:localstore/localstore.dart';

2
lib/screen/settings/settings.dart
View File

@ -4,8 +4,6 @@ import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../../dataOld/accountModel.dart';
import '../../dataOld/incommingPackets/serverInfoPacket.dart';
import '../../widget/ListItem.dart';
import 'debug/debugOverview.dart';
class Settings extends StatefulWidget {