2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Design follow up

Browse source
This commit is contained in:
krille-chan 2025-02-04 21:56:21 +01:00
commit 1c1c24c98b
No known key found for this signature in database
5 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/l10n/intl_en.arb
View file

@ -2840,5 +2840,6 @@
"appWantsToUseForLoginDescription": "You hereby allow the app and website to share information about you.", "appWantsToUseForLoginDescription": "You hereby allow the app and website to share information about you.",
"open": "Open", "open": "Open",
"waitingForServer": "Waiting for server...", "waitingForServer": "Waiting for server...",
"appIntroduction": "FluffyChat lets you chat with your friends across different messengers. Learn more at https://matrix.org or just tap *Continue*." "appIntroduction": "FluffyChat lets you chat with your friends across different messengers. Learn more at https://matrix.org or just tap *Continue*.",
"newChatRequest": "📩 New chat request"
} }

1
lib/pages/chat_list/chat_list.dart
View file

@ -660,7 +660,6 @@ class ChatListController extends State<ChatList>
return; return;
case ChatContextAction.leave: case ChatContextAction.leave:
final confirmed = await showOkCancelAlertDialog( final confirmed = await showOkCancelAlertDialog(
useRootNavigator: false,
context: context, context: context,
title: L10n.of(context).areYouSure, title: L10n.of(context).areYouSure,
message: L10n.of(context).archiveRoomDescription, message: L10n.of(context).archiveRoomDescription,

19
lib/pages/chat_list/chat_list_item.dart
View file

@ -45,7 +45,6 @@ class ChatListItem extends StatelessWidget {
return forgetResult.isValue; return forgetResult.isValue;
} }
final confirmed = await showOkCancelAlertDialog( final confirmed = await showOkCancelAlertDialog(
useRootNavigator: false,
context: context, context: context,
title: L10n.of(context).areYouSure, title: L10n.of(context).areYouSure,
okLabel: L10n.of(context).leave, okLabel: L10n.of(context).leave,
@ -231,8 +230,7 @@ class ChatListItem extends StatelessWidget {
size: 16, size: 16,
), ),
), ),
if (room.isFavourite || if (room.isFavourite)
room.membership == Membership.invite)
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
right: hasNotifications ? 4.0 : 0.0, right: hasNotifications ? 4.0 : 0.0,
@ -336,9 +334,18 @@ class ChatListItem extends StatelessWidget {
), ),
builder: (context, snapshot) => Text( builder: (context, snapshot) => Text(
room.membership == Membership.invite room.membership == Membership.invite
? isDirectChat ? room
? L10n.of(context).invitePrivateChat .getState(
: L10n.of(context).inviteGroupChat EventTypes.RoomMember,
room.client.userID!,
)
?.content
.tryGet<String>('reason') ??
(isDirectChat
? L10n.of(context)
.newChatRequest
: L10n.of(context)
.inviteGroupChat)
: snapshot.data ?? : snapshot.data ??
L10n.of(context).emptyChat, L10n.of(context).emptyChat,
softWrap: false, softWrap: false,

5
lib/pages/chat_list/space_view.dart
View file

@ -132,12 +132,11 @@ class _SpaceViewState extends State<SpaceView> {
break; break;
case SpaceActions.leave: case SpaceActions.leave:
final confirmed = await showOkCancelAlertDialog( final confirmed = await showOkCancelAlertDialog(
useRootNavigator: false,
context: context, context: context,
title: L10n.of(context).areYouSure, title: L10n.of(context).areYouSure,
okLabel: L10n.of(context).ok,
cancelLabel: L10n.of(context).cancel,
message: L10n.of(context).archiveRoomDescription, message: L10n.of(context).archiveRoomDescription,
okLabel: L10n.of(context).leave,
cancelLabel: L10n.of(context).cancel,
isDestructive: true, isDestructive: true,
); );
if (!mounted) return; if (!mounted) return;

5
lib/widgets/chat_settings_popup_menu.dart
View file

@ -56,12 +56,11 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
switch (choice) { switch (choice) {
case ChatPopupMenuActions.leave: case ChatPopupMenuActions.leave:
final confirmed = await showOkCancelAlertDialog( final confirmed = await showOkCancelAlertDialog(
useRootNavigator: false,
context: context, context: context,
title: L10n.of(context).areYouSure, title: L10n.of(context).areYouSure,
okLabel: L10n.of(context).ok,
cancelLabel: L10n.of(context).cancel,
message: L10n.of(context).archiveRoomDescription, message: L10n.of(context).archiveRoomDescription,
okLabel: L10n.of(context).leave,
cancelLabel: L10n.of(context).cancel,
isDestructive: true, isDestructive: true,
); );
if (confirmed == OkCancelResult.ok) { if (confirmed == OkCancelResult.ok) {