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

Added Nextcloud base

Browse Source
This commit is contained in:
Elias Müller
2023-02-20 10:56:51 +01:00
parent e54ae9c2ff
commit fea36b9a6d
63 changed files with 1863 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
lib/screen/pages/talk/chatList.dart Normal file
View File

@ -0,0 +1,101 @@
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';
import 'chatView.dart';
class ChatList extends StatefulWidget {
const ChatList({Key? key}) : super(key: key);
@override
State<ChatList> createState() => _ChatListState();
}
class _ChatListState extends State<ChatList> {
late String username;
@override
void initState() {
super.initState();
SharedPreferences.getInstance().then((value) => {
username = value.getString("username")!
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<ChatListProps>(context, listen: false).run();
});
}
@override
Widget build(BuildContext context) {
return Consumer<ChatListProps>(
builder: (context, data, child) {
if(data.primaryLoading()) {
return const Center(child: CircularProgressIndicator());
}
List<ListTile> chats = List<ListTile>.empty(growable: true);
for (var chatRoom in data.getRoomsResponse.sortByLastActivity()) {
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,
child: chatRoom.type == GetRoomResponseObjectConversationType.group ? const Icon(Icons.group) : const Icon(Icons.person),
);
chats.add(ListTile(
title: Text(chatRoom.displayName),
subtitle: Text("${Jiffy.unixFromSecondsSinceEpoch(chatRoom.lastMessage.timestamp).fromNow()}: ${chatRoom.lastMessage.message.replaceAll("\n", " ")}", overflow: TextOverflow.ellipsis),
trailing: Visibility(
visible: chatRoom.unreadMessages > 0,
child: Container(
padding: const EdgeInsets.all(1),
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.circular(30),
),
constraints: const BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: Text(
"${chatRoom.unreadMessages}",
style: const TextStyle(
color: Colors.white,
fontSize: 15,
),
textAlign: TextAlign.center,
),
),
),
leading: _circleAvatar,
onTap: () async {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return ChatView(
user: chatRoom,
selfId: username,
avatar: _circleAvatar,
);
}));
},
));
}
return ListView(children: chats);
},
);
}
}

164
lib/screen/pages/talk/chatOverview.dart
View File

@ -1,164 +0,0 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:provider/provider.dart';
import '../../../dataOld/incommingPackets/talkContactsPacket.dart';
import '../../../widget/loadingSpinner.dart';
import 'chatView.dart';
class Talk extends StatefulWidget {
const Talk({Key? key}) : super(key: key);
@override
State<Talk> createState() => _TalkState();
}
class _TalkState extends State<Talk> {
// List<ChatData> chats = List<ChatData>.empty(growable: true);
//
// Future<List<ChatData>> getChats() async {
// var url = Uri.https("***REMOVED***:***REMOVED***@mhsl.eu", "marianum/app/middleware/chat.php");
// var response = await http.get(
// url,
// headers: (
// {
// "Accept": "application/json",
// "OCS-APIRequest": "true",
// }
// ),
// );
//
// return compute(parseChats, response.body);
// }
@override
void initState() {
Provider.of<TalkContactsPaket>(context, listen: false).invoke();
//TalkContactsAskPacket().send();
super.initState();
// Future.delayed(Duration.zero).then((context) => updateChats());
// Provider.of<AccountModel>(context, listen: false).channel.sink.add("chat");
}
void updateChats() {
// var chats = getChats();
//
// showDialog(
// context: context,
// barrierDismissible: false,
// builder: (BuildContext context) {
// return const LoadingSpinner();
// }
// );
//
// chats.then((value) =>
// setState(() {
// Navigator.pop(context);
// this.chats.clear();
// this.chats = value;
// })
// );
}
@override
Widget build(BuildContext context) {
// List<ListTile> chats = List<ListTile>.empty(growable: true);
//
// for (var element in this.chats) {
// chats.add(
// ListTile(
// leading: element.type == 1 ? CircleAvatar(
// backgroundColor: Colors.grey,
// foregroundImage: Image.network(element.avatar).image,
// ) : const Icon(Icons.group),
// title: Text(element.name),
// subtitle: Text(
// "${element.lastMessageAuthor}: ${element.lastMessage.replaceAll("\n", "")}",
// overflow: TextOverflow.ellipsis,
// ),
// onTap: () {
// Navigator.push(context, MaterialPageRoute(builder: (builder) => const ChatView()));
// },
// trailing: element.unreadMessages > 0 ? const Icon(Icons.mark_chat_unread) : Text(element.lastActivity),
// )
// );
// }
//
// return ListView(
// children: chats,
// );
return Consumer<TalkContactsPaket>(
builder: (context, data, child) {
List<ListTile> chats = List<ListTile>.empty(growable: true);
for (var element in data.contacts) {
chats.add(ListTile(
title: Text(element.name),
subtitle: Text("${element.lastTime}: ${element.lastMessage}".replaceAll("\n", " "), overflow: TextOverflow.ellipsis),
trailing: element.unreadMessages ? const Icon(Icons.new_releases_outlined) : null,
leading: CircleAvatar(
foregroundImage: element.isGroup ? null : Image.network(element.profilePicture).image,
backgroundColor: Theme.of(context).primaryColor,
foregroundColor: Colors.white,
child: element.isGroup ? const Icon(Icons.group) : const Icon(Icons.person),
),
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return ChatView(
userToken: element.userToken,
);
}));
},
));
}
return LoadingPacket(packet: data, child: ListView(children: chats));
},
);
}
}
//
// List<ChatData> parseChats(String json) {
// final parsed = jsonDecode(json).cast<Map<String, dynamic>>();
// return parsed.map<ChatData>((a) => ChatData.fromJson(a)).toList();
// }
//
// class ChatData {
// final String name;
// final String lastMessage;
// final String lastMessageAuthor;
// final String avatar;
// final int type;
// final String lastActivity;
// final int unreadMessages;
//
// const ChatData({
// required this.name,
// required this.lastMessage,
// required this.lastMessageAuthor,
// required this.avatar,
// required this.type,
// required this.lastActivity,
// required this.unreadMessages,
// });
//
// factory ChatData.fromJson(Map<String, dynamic> json) {
// return ChatData(
// name: json['name'] as String,
// lastMessage: json['last_message'] as String,
// lastMessageAuthor: json['last_message_author'] as String,
// avatar: json['avatar'] as String,
// type: json['type'] as int,
// lastActivity: json['lastActivity'] as String,
// unreadMessages: json['unreadMessages'] as int,
// );
// }
// }

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

@ -1,14 +1,18 @@
import 'dart:developer';
import 'package:bubble/bubble.dart';
import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/loadingPacket.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoomResponse.dart';
import 'package:marianum_mobile/data/chatList/chatProps.dart';
import 'package:provider/provider.dart';
import '../../../dataOld/incommingPackets/talkChatPacket.dart';
class ChatView extends StatefulWidget {
final String userToken;
const ChatView({Key? key, required this.userToken}) : super(key: key);
final GetRoomResponseObject user;
final String selfId;
final CircleAvatar avatar;
const ChatView({Key? key, required this.user, required this.selfId, required this.avatar}) : super(key: key);
@override
State<ChatView> createState() => _ChatViewState();
@ -16,7 +20,7 @@ class ChatView extends StatefulWidget {
class _ChatViewState extends State<ChatView> {
static const styleSystem = BubbleStyle(
color: Color.fromRGBO(212, 234, 244, 1.0),
color: Color(0xffd4eaf4),
borderWidth: 1,
elevation: 2,
margin: BubbleEdges.only(top: 15),
@ -24,79 +28,151 @@ class _ChatViewState extends State<ChatView> {
);
static const styleOther = BubbleStyle(
nip: BubbleNip.leftBottom,
nip: BubbleNip.leftTop,
color: Colors.white,
borderWidth: 1,
elevation: 2,
margin: BubbleEdges.only(top: 15, left: 10),
elevation: 1,
margin: BubbleEdges.only(top: 15, left: 10, right: 50),
alignment: Alignment.topLeft,
);
static const styleSelf = BubbleStyle(
nip: BubbleNip.rightBottom,
color: Color.fromRGBO(225, 255, 199, 1.0),
color: Color(0xffd9fdd3),
borderWidth: 1,
elevation: 2,
margin: BubbleEdges.only(top: 15, right: 10),
elevation: 1,
margin: BubbleEdges.only(top: 15, right: 10, left: 50),
alignment: Alignment.topRight,
);
final ScrollController _listController = ScrollController();
@override
void initState() {
super.initState();
Provider.of<TalkChatPacket>(context, listen: false).invoke(
data: {
"token": widget.userToken
},
indicateLoading: true,
allowNotifyListeners: false,
);
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<ChatProps>(context, listen: false).setQueryToken(widget.user.token);
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.grey,
appBar: AppBar(
title: const Text("Chat mit jemandem"),
),
body: Consumer<TalkChatPacket>(
builder: (context, data, child) {
List<Bubble> messages = List<Bubble>.empty(growable: true);
return Consumer<ChatProps>(
builder: (context, data, child) {
List<Bubble> messages = List<Bubble>.empty(growable: true);
if(!data.primaryLoading()) {
String lastActor = "";
bool showMetadata = true;
data.getChatResponse.sortByTimestamp().forEach((element) {
showMetadata = element.messageType == GetRoomResponseObjectMessageType.comment;
BubbleStyle currentStyle;
if(element.messageType == GetRoomResponseObjectMessageType.comment) {
if(element.actorId == widget.selfId) {
currentStyle = styleSelf;
} else {
currentStyle = styleOther;
}
} else {
currentStyle = styleSystem;
}
data.messages.forEach((element) {
messages.add(Bubble(
style: styleSelf,
child: Text(element.content),
margin: BubbleEdges.only(bottom: element == data.getChatResponse.sortByTimestamp().last ? 20 : 0),
style: currentStyle,
child: Stack(
children: [
Visibility(
visible: showMetadata,
child: Positioned(
top: 0,
left: 0,
child: Text("${element.actorDisplayName}", style: TextStyle(fontWeight: FontWeight.bold, color: Theme.of(context).primaryColor)),
),
),
Padding(
padding: EdgeInsets.symmetric(vertical: showMetadata ? 18 : 0),
child: Text(element.message),
),
Visibility(
visible: showMetadata,
child: Positioned(
bottom: 0,
right: 0,
child: Text(
"${Jiffy.unixFromSecondsSinceEpoch(element.timestamp).yMMMMd} - ${Jiffy.unixFromSecondsSinceEpoch(element.timestamp).format("HH:mm")}",
style: TextStyle(color: Theme.of(context).disabledColor),
),
),
),
],
),
));
lastActor = element.actorId;
});
}
return LoadingPacket(packet: data, child: ListView(
children: [],
));
},
),
// ListView(
// children: [
// Bubble(
// style: styleSystem,
// child: const Text("Chat gestartet"),
// ),
// Bubble(
// style: styleOther,
// child: const Text("Hi, das ist ein Testtext"),
// ),
// Bubble(
// style: styleSelf,
// child: Text(widget.userToken),
// )
// ],
// ),
return Scaffold(
backgroundColor: const Color(0xffefeae2),
appBar: AppBar(
title: Row(
children: [
widget.avatar,
const SizedBox(width: 10),
Text(widget.user.displayName, overflow: TextOverflow.ellipsis, maxLines: 1),
],
),
),
body: Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/background/chat.png"),
scale: 1.5,
opacity: 0.5,
repeat: ImageRepeat.repeat,
colorFilter: ColorFilter.linearToSrgbGamma()
)
),
child: data.primaryLoading() ? const Center(child: CircularProgressIndicator()) : Column(
children: [
Expanded(
child: ListView(
reverse: true,
controller: _listController,
children: messages.reversed.toList(),
),
),
Container(
color: Theme.of(context).dividerColor,
padding: const EdgeInsets.all(10),
child: Row(
children: [
const Expanded(
child: TextField(
maxLines: null,
decoration: InputDecoration(
hintText: "Nachricht",
border: OutlineInputBorder(),
labelText: "",
),
),
),
IconButton(onPressed: () {}, icon: const Icon(Icons.send))
],
),
)
],
)
),
);
},
);
}
}

139
lib/screen/pages/timetable/dayListView.dart Normal file
View File

@ -0,0 +1,139 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getHolidays/getHolidaysResponse.dart';
import 'package:timetable_view/timetable_view.dart';
import '../../../api/webuntis/queries/getHolidays/getHolidays.dart';
import '../../../api/webuntis/queries/getRooms/getRoomsResponse.dart';
import '../../../api/webuntis/queries/getSubjects/getSubjectsResponse.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
import '../../../data/timetable/timetableProps.dart';
class DayListView extends StatefulWidget {
final TimetableProps value;
const DayListView(this.value, {Key? key}) : super(key: key);
@override
State<DayListView> createState() => _DayListViewState();
}
class _DayListViewState extends State<DayListView> {
@override
Widget build(BuildContext context) {
return TimetableView(
laneEventsList: _buildLaneEvents(widget.value),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
);
}
List<LaneEvents> _buildLaneEvents(TimetableProps data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
Jiffy.locale("de"); // todo move outwards
GetTimetableResponse timetable = data.getTimetableResponse;
GetRoomsResponse rooms = data.getRoomsResponse;
GetSubjectsResponse subjects = data.getSubjectsResponse;
GetHolidaysResponse holidays = data.getHolidaysResponse;
GetHolidaysResponseObject? holidayInfo = GetHolidays.find(holidays, time: data.queryDate);
if(holidayInfo != null) {
laneEvents.add(
LaneEvents(
lane: Lane(
laneIndex: data.queryDate.millisecondsSinceEpoch,
name: "${Jiffy(data.queryDate.toString()).format("dd.MM.yy")}\n${Jiffy(data.queryDate.toString()).format("EEEE")}",
textStyle: TextStyle(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14
)
),
events: List<TableEvent>.of([
TableEvent(
title: holidayInfo.name,
eventId: holidayInfo.id,
laneIndex: data.queryDate.millisecondsSinceEpoch,
startTime: parseTime(0800),
endTime: parseTime(1500),
padding: const EdgeInsets.all(5),
backgroundColor: Theme.of(context).disabledColor,
location: "\n${holidayInfo.longName}",
)
]),
)
);
}
List<int> dayList = timetable.result.map((e) => e.date).toSet().toList();
dayList.sort((a, b) => a-b);
dayList.forEach((day) {
//Every Day
laneEvents.add(
LaneEvents(
lane: Lane(
laneIndex: day,
name: "${Jiffy(day.toString()).format("dd.MM.yy")}\n${Jiffy(day.toString()).format("EEEE")}",
textStyle: TextStyle(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14
)
),
events: List<TableEvent>.generate(
timetable.result.where((element) => element.date == day).length,
(index) {
GetTimetableResponseObject tableEvent = timetable.result.where((element) => element.date == day).elementAt(index);
GetSubjectsResponseObject subject = subjects.result.firstWhere((subject) => subject.id == tableEvent.su[0]['id']);
return TableEvent(
title: "${subject.alternateName} (${subject.longName})",
eventId: tableEvent.id,
laneIndex: day,
startTime: parseTime(tableEvent.startTime),
endTime: parseTime(tableEvent.endTime),
padding: const EdgeInsets.all(5),
backgroundColor: Theme.of(context).primaryColor,
location: "\n${rooms.result.firstWhere((room) => room.id == tableEvent.ro[0]['id']).name} - ${tableEvent.te[0]['longname']} (${tableEvent.te[0]['name']})",
);
}
)
)
);
});
return laneEvents;
}
TableEventTime parseTime(int input) {
String time = input.toString().length < 4 ? "0$input" : input.toString();
return TableEventTime(hour: int.parse(time.substring(0, 2)), minute: int.parse(time.substring(2, 4)));
}
}
class CustomTableStyle extends TimetableStyle {
dynamic context;
CustomTableStyle(this.context);
@override
int get startHour => 07;
@override
int get endHour => 17;
@override
Color get cornerColor => Theme.of(context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(context).primaryColor;
@override
double get timeItemHeight => 70;
@override
double get timeItemWidth => 50;
@override
double get laneWidth => MediaQuery.of(context).size.width - timeItemWidth;
}

104
lib/screen/pages/timetable/storedTimetable.dart
View File

@ -1,104 +0,0 @@
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/timetable.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 StoredTimetable extends StatefulWidget {
const StoredTimetable({Key? key}) : super(key: key);
@override
State<StoredTimetable> createState() => _StoredTimetableState();
}
class _StoredTimetableState extends State<StoredTimetable> {
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<Timetable>(context, listen: false).run();
});
}
@override
Widget build(BuildContext context) {
return Consumer<Timetable>(
builder: (context, value, child) {
if(value.getTimetableResponse == null) {
return const LoadingSpinner();
}
return TimetableView(
laneEventsList: _buildLaneEvents(value),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
);
},
);
}
List<LaneEvents> _buildLaneEvents(Timetable data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
Jiffy.locale("de"); // todo move outwards
GetTimetableResponse timetable = data.getTimetableResponse!;
GetRoomsResponse rooms = data.getRoomsResponse!;
GetSubjectsResponse subjects = data.getSubjectsResponse!;
List<int> dayList = timetable.result.map((e) => e.date).toSet().toList();
dayList.sort((a, b) => a-b);
dayList.forEach((day) {
//Every Day
laneEvents.add(
LaneEvents(
lane: Lane(
laneIndex: day,
name: "${Jiffy(day.toString()).format("dd.MM.yy")}\n${Jiffy(day.toString()).format("EEEE")}",
textStyle: TextStyle(
color: Theme.of(context).primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14
)
),
events: List<TableEvent>.generate(
timetable.result.where((element) => element.date == day).length,
(index) {
GetTimetableResponseObject tableEvent = timetable.result.where((element) => element.date == day).elementAt(index);
return TableEvent(
title: subjects.result.firstWhere((subject) => subject.id == tableEvent.su[0]['id']).longName,
eventId: tableEvent.id,
laneIndex: day,
startTime: parseTime(tableEvent.startTime),
endTime: parseTime(tableEvent.endTime),
padding: const EdgeInsets.all(5),
backgroundColor: Theme.of(context).primaryColor,
location: "\n${rooms.result.firstWhere((room) => room.id == tableEvent.ro[0]['id']).name}",
);
}
)
)
);
});
return laneEvents;
}
TableEventTime parseTime(int input) {
String time = input.toString().length < 4 ? "0$input" : input.toString();
return TableEventTime(hour: int.parse(time.substring(0, 2)), minute: int.parse(time.substring(2, 4)));
}
}

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

@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:jiffy/jiffy.dart';
import 'package:marianum_mobile/api/webuntis/queries/getRooms/getRooms.dart';
import 'package:marianum_mobile/data/timetable/timetableProps.dart';
import 'package:marianum_mobile/widget/loadingSpinner.dart';
import 'package:marianum_mobile/widget/offlineError.dart';
import 'package:timetable_view/timetable_view.dart';
@ -131,14 +132,14 @@ class CustomTableStyle extends TimetableStyle {
@override
int get endHour => 17;
@override
double get laneWidth => 300;
@override
Color get cornerColor => Theme.of(context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(context).primaryColor;
@override
double get timeItemHeight => 80;
double get timeItemHeight => 70;
@override
double get timeItemWidth => 70;
double get timeItemWidth => 50;
@override
double get laneWidth => MediaQuery.of(context).size.width - timeItemWidth;
}

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

@ -1,13 +1,18 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:marianum_mobile/widget/loadingPacket.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 '../../../dataOld/incommingPackets/timetablePacket.dart';
import '../../../api/webuntis/queries/getTimetable/getTimetableResponse.dart';
class Timetable extends StatefulWidget {
const Timetable({Key? key}) : super(key: key);
@ -17,90 +22,69 @@ class Timetable extends StatefulWidget {
}
class _TimetableState extends State<Timetable> {
@override
void initState() {
Provider.of<TimetablePacket>(context, listen: false).invoke();
super.initState();
}
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Provider.of<TimetableProps>(context, listen: false).run();
});
}
@override
Widget build(BuildContext context) {
return Consumer<TimetablePacket>(
builder: (context, data, child) {
return Consumer<TimetableProps>(
builder: (context, value, child) {
if(value.primaryLoading()) {
return const Center(child: CircularProgressIndicator());
}
return LoadingPacket(packet: data, child: TimetableView(
laneEventsList: _buildLaneEvents(context, data),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
));
TimetableProps timetable = Provider.of<TimetableProps>(context, listen: false);
return Column(
children: [
Flexible(
child: DayListView(value),
),
Container(
padding: const EdgeInsets.only(top: 5, bottom: 5),
decoration: BoxDecoration(
border: Border(
top: BorderSide(width: 2, color: Theme.of(context).disabledColor)
)
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
IconButton(
onPressed: () => timetable.next(previous: true),
icon: const Icon(Icons.navigate_before_sharp),
color: Theme.of(context).primaryColor,
iconSize: 30,
),
Row(
children: [
IconButton(
onPressed: () => timetable.nearest(),
icon: const Icon(Icons.home),
color: Theme.of(context).primaryColor,
iconSize: 30,
),
],
),
IconButton(
onPressed: () => timetable.next(),
icon: const Icon(Icons.navigate_next_sharp),
color: Theme.of(context).primaryColor,
iconSize: 30,
)
],
),
)
],
);
},
);
}
List<LaneEvents> _buildLaneEvents(context, TimetablePacket data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
data.timeTable.days.forEach((day) {
List<TableEvent> tableEvents = List<TableEvent>.empty(growable: true);
day.entries.forEach((element) {
tableEvents.add(
TableEvent(
backgroundColor: Theme.of(context).primaryColor,
padding: const EdgeInsets.all(5),
title: element.subject,
location: "\n${element.room}",
eventId: tableEvents.length,
laneIndex: tableEvents.length,
startTime: TableEventTime(hour: element.start.hour, minute: element.start.minute),
endTime: TableEventTime(hour: element.end.hour, minute: element.end.minute)
)
);
});
laneEvents.add(
LaneEvents(
lane: Lane(laneIndex: laneEvents.length, name: day.name, textStyle: TextStyle(color: Theme.of(context).primaryColor, fontWeight: FontWeight.bold)),
events: tableEvents
)
);
});
return laneEvents;
}
void onEventTapCallBack(TableEvent event) {
print(
"Event Clicked!! LaneIndex ${event.laneIndex} Title: ${event.title} StartHour: ${event.startTime.hour} EndHour: ${event.endTime.hour}");
}
void onTimeSlotTappedCallBack(
int laneIndex, TableEventTime start, TableEventTime end) {
print(
"Empty Slot Clicked !! LaneIndex: $laneIndex StartHour: ${start.hour} EndHour: ${end.hour}");
}
}
class CustomTableStyle extends TimetableStyle {
dynamic context;
CustomTableStyle(context) {
this.context = context;
}
@override
int get startHour => 07;
@override
int get endHour => 17;
@override
double get laneWidth => 200;
@override
Color get cornerColor => Theme.of(this.context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(this.context).primaryColor;
@override
// TODO: implement timeItemHeight
double get timeItemHeight => 60;
}

106
lib/screen/pages/timetable/timetableOld.dart Normal file
View File

@ -0,0 +1,106 @@
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';
import 'package:timetable_view/timetable_view.dart';
import '../../../dataOld/incommingPackets/timetablePacket.dart';
class TimetableOld extends StatefulWidget {
const TimetableOld({Key? key}) : super(key: key);
@override
State<TimetableOld> createState() => _TimetableOldState();
}
class _TimetableOldState extends State<TimetableOld> {
@override
void initState() {
Provider.of<TimetablePacket>(context, listen: false).invoke();
super.initState();
}
@override
Widget build(BuildContext context) {
return Consumer<TimetablePacket>(
builder: (context, data, child) {
return LoadingPacket(packet: data, child: TimetableView(
laneEventsList: _buildLaneEvents(context, data),
onEventTap: (TableEvent event) {},
timetableStyle: CustomTableStyle(context),
onEmptySlotTap: (int laneIndex, TableEventTime start, TableEventTime end) => {},
));
},
);
}
List<LaneEvents> _buildLaneEvents(context, TimetablePacket data) {
List<LaneEvents> laneEvents = List<LaneEvents>.empty(growable: true);
data.timeTable.days.forEach((day) {
List<TableEvent> tableEvents = List<TableEvent>.empty(growable: true);
day.entries.forEach((element) {
tableEvents.add(
TableEvent(
backgroundColor: Theme.of(context).primaryColor,
padding: const EdgeInsets.all(5),
title: element.subject,
location: "\n${element.room}",
eventId: tableEvents.length,
laneIndex: tableEvents.length,
startTime: TableEventTime(hour: element.start.hour, minute: element.start.minute),
endTime: TableEventTime(hour: element.end.hour, minute: element.end.minute)
)
);
});
laneEvents.add(
LaneEvents(
lane: Lane(laneIndex: laneEvents.length, name: day.name, textStyle: TextStyle(color: Theme.of(context).primaryColor, fontWeight: FontWeight.bold)),
events: tableEvents
)
);
});
return laneEvents;
}
void onEventTapCallBack(TableEvent event) {
print(
"Event Clicked!! LaneIndex ${event.laneIndex} Title: ${event.title} StartHour: ${event.startTime.hour} EndHour: ${event.endTime.hour}");
}
void onTimeSlotTappedCallBack(
int laneIndex, TableEventTime start, TableEventTime end) {
print(
"Empty Slot Clicked !! LaneIndex: $laneIndex StartHour: ${start.hour} EndHour: ${end.hour}");
}
}
class CustomTableStyle extends TimetableStyle {
dynamic context;
CustomTableStyle(context) {
this.context = context;
}
@override
int get startHour => 07;
@override
int get endHour => 17;
@override
double get laneWidth => 200;
@override
Color get cornerColor => Theme.of(this.context).primaryColor;
@override
Color get timeItemTextColor => Theme.of(this.context).primaryColor;
@override
// TODO: implement timeItemHeight
double get timeItemHeight => 60;
}

90
lib/screen/settings/debug/debugOverview.dart Normal file
View File

@ -0,0 +1,90 @@
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';
import 'package:marianum_mobile/screen/settings/debug/jsonViewer.dart';
class DebugOverview extends StatefulWidget {
const DebugOverview({Key? key}) : super(key: key);
@override
State<DebugOverview> createState() => _DebugOverviewState();
}
class _DebugOverviewState extends State<DebugOverview> {
final Localstore storage = Localstore.instance;
Future<Map<String, dynamic>?> files = Localstore.instance.collection("MarianumMobile").get();
dynamic data;
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text("Lokaler cache"),
),
body: Column(
children: [
Expanded(
flex: 1,
child: ListView(
children: [
ListTile(
leading: const Icon(Icons.delete_forever),
title: const Text("Cache löschen"),
onTap: () {
storage.collection("MarianumMobile").delete().then((value) => {
Navigator.pop(context)
});
},
)
],
),
),
const Divider(),
FutureBuilder(
future: files,
builder: (context, snapshot) {
if(snapshot.hasData) {
List<String> files = snapshot.data?.keys.map((e) => e.toString()).toList() ?? List<String>.empty();
Map<String, dynamic> getValue(int index) {
return snapshot.data?[files[index]];
}
return Expanded(
flex: 5,
child: ListView.builder(
itemCount: files.length,
itemBuilder: (context, index) {
String filename = files[index].split("/").last;
//String data = getValue(index).toString().replaceAll("{", "{\n ").replaceAll("[", "[\n ").replaceAll(",", ",\n ");
String data = getValue(index).toString();
return ListTile(
leading: const Icon(Icons.text_snippet_outlined),
title: Text("(${data.length} z) [$filename] ${Jiffy.unixFromMillisecondsSinceEpoch(getValue(index)['lastupdate']).fromNow()}"),
textColor: Colors.black,
onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return JsonViewer(title: filename, data: data);
},));
},
);
},
),
);
} else {
return snapshot.data == null ? const Text("No data") : const Center(child: CircularProgressIndicator());
}
},
),
],
),
);
}
}

21
lib/screen/settings/debug/jsonViewer.dart Normal file
View File

@ -0,0 +1,21 @@
import 'package:flutter/material.dart';
class JsonViewer extends StatelessWidget {
String title;
String data;
JsonViewer({Key? key, required this.title, required this.data}) : super(key: key);
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(title),
),
body: SingleChildScrollView(
scrollDirection: Axis.vertical,
child: Text(data.replaceAllMapped(RegExp(r'[{,}]'), (match) => "${match.group(0)}\n ")),
),
);
}
}

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

@ -6,6 +6,7 @@ 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 {
const Settings({Key? key}) : super(key: key);
@ -19,7 +20,6 @@ class _SettingsState extends State<Settings> {
@override
void initState() {
super.initState();
Provider.of<ServerInfoPacket>(context, listen: false).invoke();
}
@override
@ -31,56 +31,64 @@ class _SettingsState extends State<Settings> {
body: ListView(
children: [
const ListItemNavigator(icon: Icons.info, text: "Über diese App", target: AboutDialog(
applicationIcon: Icon(Icons.send_time_extension_outlined),
applicationLegalese: "Released under MIT-License",
applicationName: "Marianum Fulda",
applicationVersion: "ALPHA 0.1",
)),
ListTile(
leading: const Icon(Icons.logout),
title: const Text("Account abmelden"),
title: const Text("Konto abmelden"),
onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (builder) => AlertDialog(
title: const Text("Abmelden?"),
content: const Text("Möchtest du dich wirklich abmelden?"),
actions: [
TextButton(
child: const Text("Abmelden"),
onPressed: () {
SharedPreferences.getInstance().then((value) => {
value.clear(),
}).then((value) => {
Provider.of<AccountModel>(context, listen: false).logout(),
Navigator.popUntil(context, (route) => !Navigator.canPop(context)),
});
}
),
showDialog(
context: context,
builder: (context) {
return AlertDialog(
title: const Text("Abmelden?"),
content: const Text("Möchtest du dich wirklich abmelden?"),
actions: [
TextButton(
child: const Text("Abmelden"),
onPressed: () {
SharedPreferences.getInstance().then((value) => {
value.clear(),
}).then((value) => {
Provider.of<AccountModel>(context, listen: false).logout(),
Navigator.popUntil(context, (route) => !Navigator.canPop(context)),
});
}
),
TextButton(
child: const Text("Abbrechen"),
onPressed: () {
Navigator.pop(context);
},
),
],
)));
TextButton(
child: const Text("Abbrechen"),
onPressed: () {
Navigator.pop(context);
},
),
],
);
},
);
},
),
Consumer<ServerInfoPacket>(
builder: (context, serverInfo, child) {
return ListTile(
leading: const Icon(Icons.home_work_outlined),
title: Text("Server: ${serverInfo.serverName}"),
subtitle: Text(
"Betreiber: ${serverInfo.serverOwner}\n"
"Serverversion: ${serverInfo.serverVersion}\n"
"Rechtliche hinweise: ${serverInfo.legal}\n"
),
ListTile(
leading: const Icon(Icons.info),
title: const Text("Informationen und Lizenzen"),
onTap: () {
showAboutDialog(
context: context,
applicationIcon: const Icon(Icons.send_time_extension_outlined),
applicationName: "MarianumMobile",
applicationVersion: "Development Build",
applicationLegalese: "Marianum Fulda 2023 Elias Müller",
);
},
),
ListTile(
leading: const Icon(Icons.bug_report_outlined),
title: const Text("Speicheransicht"),
onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return const DebugOverview();
}));
},
)
],