Merge branch 'main' into fix/time-format

pull/2212/head
just.Tobi 1 month ago committed by GitHub
commit 8725e6a3ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -3374,5 +3374,6 @@
"moreEvents": "More events",
"@moreEvents": {},
"declineInvitation": "Decline invitation",
"@declineInvitation": {}
"@declineInvitation": {},
"noMessagesYet": "No messages yet"
}

@ -82,7 +82,7 @@
"type": "String",
"placeholders": {}
},
"areGuestsAllowedToJoin": "Visitantes podem entrar?",
"areGuestsAllowedToJoin": "Visitantes podem entrar",
"@areGuestsAllowedToJoin": {
"type": "String",
"placeholders": {}
@ -3296,7 +3296,7 @@
"@boldText": {},
"recordAVideo": "Gravar um vídeo",
"@recordAVideo": {},
"optionalMessage": "Mensagem... (opcional)",
"optionalMessage": "(Opcional) mensagem...",
"@optionalMessage": {},
"joinedChats": "Conversas que entrou",
"@joinedChats": {},

@ -202,13 +202,12 @@ class ChatListItem extends StatelessWidget {
color: theme.colorScheme.primary,
),
),
if (!room.isSpace &&
lastEvent != null &&
room.membership != Membership.invite)
if (!room.isSpace && room.membership != Membership.invite)
Padding(
padding: const EdgeInsets.only(left: 4.0),
child: Text(
lastEvent.originServerTs.localizedTimeShort(context),
room.latestEventReceivedTime
.localizedTimeShort(context),
style: TextStyle(
fontSize: 12,
color: theme.colorScheme.outline,
@ -303,7 +302,7 @@ class ChatListItem extends StatelessWidget {
: L10n.of(context)
.inviteGroupChat)
: snapshot.data ??
L10n.of(context).emptyChat,
L10n.of(context).noMessagesYet,
softWrap: false,
maxLines: room.notificationCount >= 1 ? 2 : 1,
overflow: TextOverflow.ellipsis,

@ -413,10 +413,10 @@ packages:
dependency: "direct main"
description:
name: file_selector
sha256: "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828"
sha256: "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0"
url: "https://pub.dev"
source: hosted
version: "1.0.3"
version: "1.0.4"
file_selector_android:
dependency: transitive
description:

@ -25,7 +25,7 @@ dependencies:
emoji_picker_flutter: ^4.3.0
emojis: ^0.9.9
file_picker: ^10.3.3
file_selector: ^1.0.3
file_selector: ^1.0.4
flutter:
sdk: flutter
flutter_foreground_task: ^9.1.0

Loading…
Cancel
Save