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

Bump pub packages to newest version

Browse Source
This commit is contained in:
Elias Müller
2023-05-31 20:18:05 +02:00
parent d71f0d3339
commit b41fba0cda
10 changed files with 65 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/screen/pages/files/fileElement.dart
View File

@ -72,7 +72,7 @@ class _FileElementState extends State<FileElement> {
],
);
}
return widget.file.isDirectory ? Text("geändert ${Jiffy(widget.file.modifiedAt).fromNow()}") : Text("${filesize(widget.file.size)}, ${Jiffy(widget.file.modifiedAt).fromNow()}");
return widget.file.isDirectory ? Text("geändert ${Jiffy.parseFromDateTime(widget.file.modifiedAt ?? DateTime.now()).fromNow()}") : Text("${filesize(widget.file.size)}, ${Jiffy.parseFromDateTime(widget.file.modifiedAt ?? DateTime.now()).fromNow()}");
}
@override

18
lib/screen/pages/talk/chatBubble.dart
View File

@ -14,12 +14,12 @@ import '../files/fileElement.dart';
import 'chatMessage.dart';
class ChatBubble extends StatefulWidget {
BuildContext context;
bool isSender;
GetChatResponseObject bubbleData;
GetRoomResponseObject chatData;
final BuildContext context;
final bool isSender;
final GetChatResponseObject bubbleData;
final GetRoomResponseObject chatData;
ChatBubble({
const ChatBubble({
required this.context,
required this.isSender,
required this.bubbleData,
@ -38,7 +38,7 @@ class _ChatBubbleState extends State<ChatBubble> {
BubbleStyle getSystemStyle() {
return BubbleStyle(
color: AppTheme.isDarkMode(context) ? Color(0xff182229) : Colors.white,
color: AppTheme.isDarkMode(context) ? const Color(0xff182229) : Colors.white,
borderWidth: 1,
elevation: 2,
margin: const BubbleEdges.only(bottom: 20, top: 10),
@ -47,7 +47,7 @@ class _ChatBubbleState extends State<ChatBubble> {
}
BubbleStyle getRemoteStyle(bool seamless) {
var color = AppTheme.isDarkMode(context) ? Color(0xff202c33) : Colors.white;
var color = AppTheme.isDarkMode(context) ? const Color(0xff202c33) : Colors.white;
return BubbleStyle(
nip: BubbleNip.leftTop,
color: seamless ? Colors.transparent : color,
@ -61,7 +61,7 @@ class _ChatBubbleState extends State<ChatBubble> {
BubbleStyle getSelfStyle(bool seamless) {
return BubbleStyle(
nip: BubbleNip.rightBottom,
color: seamless ? Colors.transparent : Color(0xff005c4b),
color: seamless ? Colors.transparent : const Color(0xff005c4b),
borderWidth: seamless ? 0 : 1,
elevation: seamless ? 0 : 1,
margin: const BubbleEdges.only(bottom: 10, right: 10, left: 50),
@ -141,7 +141,7 @@ class _ChatBubbleState extends State<ChatBubble> {
bottom: 0,
right: 0,
child: Text(
Jiffy.unixFromSecondsSinceEpoch(widget.bubbleData.timestamp).format("HH:mm"),
Jiffy.parseFromMillisecondsSinceEpoch(widget.bubbleData.timestamp * 1000).format(pattern: "HH:mm"),
textAlign: TextAlign.end,
style: const TextStyle(color: Colors.grey, fontSize: 12),
),

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

@ -67,7 +67,7 @@ class _ChatListState extends State<ChatList> {
chats.add(ListTile(
title: Text(chatRoom.displayName),
subtitle: Text("${Jiffy.unixFromSecondsSinceEpoch(chatRoom.lastMessage.timestamp).fromNow()}: ${RichObjectStringProcessor.parseToString(chatRoom.lastMessage.message.replaceAll("\n", " "), chatRoom.lastMessage.messageParameters)}", overflow: TextOverflow.ellipsis),
subtitle: Text("${Jiffy.parseFromMillisecondsSinceEpoch(chatRoom.lastMessage.timestamp * 1000).fromNow()}: ${RichObjectStringProcessor.parseToString(chatRoom.lastMessage.message.replaceAll("\n", " "), chatRoom.lastMessage.messageParameters)}", overflow: TextOverflow.ellipsis),
trailing: Visibility(
visible: chatRoom.unreadMessages > 0,
child: Container(

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

@ -61,7 +61,7 @@ class _ChatViewState extends State<ChatView> {
GetRoomResponseObjectMessageType.system,
false,
"",
Jiffy(elementDate).format("dd.MM.yyyy"),
Jiffy.parseFromDateTime(elementDate).format(pattern: "dd.MM.yyyy"),
null
),
chatData: widget.room

2
lib/screen/pages/timetable/appointmentDetails.dart
View File

@ -35,7 +35,7 @@ class AppointmentDetails {
Icon(Icons.info, color: appointment.color),
const SizedBox(height: 10),
Text("${_getEventPrefix(timetableData.code)}${subject.alternateName} - (${subject.longName})", style: const TextStyle(fontSize: 30)),
Text("${Jiffy(appointment.startTime).format("HH:mm")} - ${Jiffy(appointment.endTime).format("HH:mm")}", style: const TextStyle(fontSize: 15)),
Text("${Jiffy.parseFromDateTime(appointment.startTime).format(pattern: "HH:mm")} - ${Jiffy.parseFromDateTime(appointment.endTime).format(pattern: "HH:mm")}", style: const TextStyle(fontSize: 15)),
],
),
),