aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Follow up select chats

Browse Source
pull/759/head
krille-chan 2 years ago
parent 2872448584
commit 2a7744e4c7
No known key found for this signature in database
1 changed files with 196 additions and 184 deletions
Show Stats Download Patch File Download Diff File

380
lib/pages/chat_list/chat_list_item.dart
Unescape Escape View File

@ -9,6 +9,7 @@ import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/utils/room_status_extension.dart'; import 'package:fluffychat/utils/room_status_extension.dart';
import 'package:fluffychat/widgets/hover_builder.dart';
import '../../config/themes.dart'; import '../../config/themes.dart';
import '../../utils/date_time_extension.dart'; import '../../utils/date_time_extension.dart';
import '../../widgets/avatar.dart'; import '../../widgets/avatar.dart';
@ -191,204 +192,215 @@ class ChatListItem extends StatelessWidget {
color: backgroundColor, color: backgroundColor,
child: FutureBuilder( child: FutureBuilder(
future: room.loadHeroUsers(), future: room.loadHeroUsers(),
builder: (context, snapshot) => ListTile( builder: (context, snapshot) => HoverBuilder(
visualDensity: const VisualDensity(vertical: -0.5), builder: (context, hovered) => ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 8), visualDensity: const VisualDensity(vertical: -0.5),
onLongPress: onLongPress, contentPadding: const EdgeInsets.symmetric(horizontal: 8),
leading: selected onLongPress: onLongPress,
? SizedBox( leading: Avatar(
width: Avatar.defaultSize, mxContent: room.avatar,
height: Avatar.defaultSize, name: displayname,
child: Material( presenceUserId: room.directChatMatrixID,
color: Theme.of(context).colorScheme.primary, presenceBackgroundColor: backgroundColor,
borderRadius: BorderRadius.circular(Avatar.defaultSize), ),
child: const Icon(Icons.check, color: Colors.white), title: Row(
), children: <Widget>[
) Expanded(
: Avatar( child: Text(
mxContent: room.avatar, displayname,
name: displayname, maxLines: 1,
onTap: onLongPress, overflow: TextOverflow.ellipsis,
presenceUserId: room.directChatMatrixID, softWrap: false,
presenceBackgroundColor: backgroundColor, style: unread
), ? const TextStyle(fontWeight: FontWeight.bold)
title: Row( : null,
children: <Widget>[
Expanded(
child: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
softWrap: false,
style: unread
? const TextStyle(fontWeight: FontWeight.bold)
: null,
),
),
if (isMuted)
const Padding(
padding: EdgeInsets.only(left: 4.0),
child: Icon(
Icons.notifications_off_outlined,
size: 16,
), ),
), ),
if (room.isFavourite || room.membership == Membership.invite) if (isMuted)
Padding( const Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(left: 4.0),
right: hasNotifications ? 4.0 : 0.0, child: Icon(
Icons.notifications_off_outlined,
size: 16,
),
), ),
child: Icon( if (room.isFavourite || room.membership == Membership.invite)
Icons.push_pin, Padding(
size: 16, padding: EdgeInsets.only(
color: Theme.of(context).colorScheme.primary, right: hasNotifications ? 4.0 : 0.0,
),
child: Icon(
Icons.push_pin,
size: 16,
color: Theme.of(context).colorScheme.primary,
),
), ),
), if (lastEvent != null && room.membership != Membership.invite)
if (lastEvent != null && room.membership != Membership.invite) Padding(
Padding( padding: const EdgeInsets.only(left: 4.0),
padding: const EdgeInsets.only(left: 4.0), child: Text(
child: Text( lastEvent.originServerTs.localizedTimeShort(context),
lastEvent.originServerTs.localizedTimeShort(context), style: TextStyle(
style: TextStyle( fontSize: 13,
fontSize: 13, color: unread
color: unread ? Theme.of(context).colorScheme.secondary
? Theme.of(context).colorScheme.secondary : Theme.of(context).textTheme.bodyMedium!.color,
: Theme.of(context).textTheme.bodyMedium!.color, ),
), ),
), ),
),
],
),
subtitle: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
if (typingText.isEmpty &&
ownMessage &&
room.lastEvent!.status.isSending) ...[
const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
),
const SizedBox(width: 4),
], ],
AnimatedContainer( ),
width: typingText.isEmpty ? 0 : 18, subtitle: Row(
clipBehavior: Clip.hardEdge, mainAxisAlignment: MainAxisAlignment.center,
decoration: const BoxDecoration(), children: <Widget>[
duration: FluffyThemes.animationDuration, if (typingText.isEmpty &&
curve: FluffyThemes.animationCurve, ownMessage &&
padding: const EdgeInsets.only(right: 4), room.lastEvent!.status.isSending) ...[
child: Icon( const SizedBox(
Icons.edit_outlined, width: 16,
color: Theme.of(context).colorScheme.secondary, height: 16,
size: 14, child: CircularProgressIndicator.adaptive(strokeWidth: 2),
), ),
), const SizedBox(width: 4),
Expanded( ],
child: typingText.isNotEmpty AnimatedContainer(
? Text( width: typingText.isEmpty ? 0 : 18,
typingText, clipBehavior: Clip.hardEdge,
style: TextStyle( decoration: const BoxDecoration(),
color: Theme.of(context).colorScheme.primary, duration: FluffyThemes.animationDuration,
), curve: FluffyThemes.animationCurve,
maxLines: 1, padding: const EdgeInsets.only(right: 4),
softWrap: false, child: Icon(
) Icons.edit_outlined,
: FutureBuilder<String>( color: Theme.of(context).colorScheme.secondary,
future: room.lastEvent?.calcLocalizedBody( size: 14,
MatrixLocals(L10n.of(context)!), ),
hideReply: true,
hideEdit: true,
plaintextBody: true,
removeMarkdown: true,
withSenderNamePrefix: !room.isDirectChat ||
room.directChatMatrixID !=
room.lastEvent?.senderId,
) ??
Future.value(L10n.of(context)!.emptyChat),
builder: (context, snapshot) {
return Text(
room.membership == Membership.invite
? room.isDirectChat
? L10n.of(context)!.invitePrivateChat
: L10n.of(context)!.inviteGroupChat
: snapshot.data ??
room.lastEvent?.calcLocalizedBodyFallback(
MatrixLocals(L10n.of(context)!),
hideReply: true,
hideEdit: true,
plaintextBody: true,
removeMarkdown: true,
withSenderNamePrefix:
!room.isDirectChat ||
room.directChatMatrixID !=
room.lastEvent?.senderId,
) ??
L10n.of(context)!.emptyChat,
softWrap: false,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: unread ? FontWeight.w600 : null,
color: Theme.of(context)
.colorScheme
.onSurfaceVariant,
decoration: room.lastEvent?.redacted == true
? TextDecoration.lineThrough
: null,
),
);
},
),
),
const SizedBox(width: 8),
AnimatedContainer(
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
padding: const EdgeInsets.symmetric(horizontal: 7),
height: unreadBubbleSize,
width: !hasNotifications && !unread && !room.hasNewMessages
? 0
: (unreadBubbleSize - 9) *
room.notificationCount.toString().length +
9,
decoration: BoxDecoration(
color: room.highlightCount > 0 ||
room.membership == Membership.invite
? Colors.red
: hasNotifications || room.markedUnread
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.primaryContainer,
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
), ),
child: Center( Expanded(
child: hasNotifications child: typingText.isNotEmpty
? Text( ? Text(
room.notificationCount.toString(), typingText,
style: TextStyle( style: TextStyle(
color: room.highlightCount > 0 color: Theme.of(context).colorScheme.primary,
? Colors.white
: hasNotifications
? Theme.of(context).colorScheme.onPrimary
: Theme.of(context)
.colorScheme
.onPrimaryContainer,
fontSize: 13,
), ),
maxLines: 1,
softWrap: false,
) )
: const SizedBox.shrink(), : FutureBuilder<String>(
future: room.lastEvent?.calcLocalizedBody(
MatrixLocals(L10n.of(context)!),
hideReply: true,
hideEdit: true,
plaintextBody: true,
removeMarkdown: true,
withSenderNamePrefix: !room.isDirectChat ||
room.directChatMatrixID !=
room.lastEvent?.senderId,
) ??
Future.value(L10n.of(context)!.emptyChat),
builder: (context, snapshot) {
return Text(
room.membership == Membership.invite
? room.isDirectChat
? L10n.of(context)!.invitePrivateChat
: L10n.of(context)!.inviteGroupChat
: snapshot.data ??
room.lastEvent
?.calcLocalizedBodyFallback(
MatrixLocals(L10n.of(context)!),
hideReply: true,
hideEdit: true,
plaintextBody: true,
removeMarkdown: true,
withSenderNamePrefix:
!room.isDirectChat ||
room.directChatMatrixID !=
room.lastEvent?.senderId,
) ??
L10n.of(context)!.emptyChat,
softWrap: false,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: unread ? FontWeight.w600 : null,
color: Theme.of(context)
.colorScheme
.onSurfaceVariant,
decoration: room.lastEvent?.redacted == true
? TextDecoration.lineThrough
: null,
),
);
},
),
), ),
), const SizedBox(width: 8),
], AnimatedContainer(
), duration: FluffyThemes.animationDuration,
onTap: () => clickAction(context), curve: FluffyThemes.animationCurve,
trailing: onForget == null padding: const EdgeInsets.symmetric(horizontal: 7),
? null height: unreadBubbleSize,
: IconButton( width: !hasNotifications && !unread && !room.hasNewMessages
icon: const Icon(Icons.delete_outlined), ? 0
onPressed: onForget, : (unreadBubbleSize - 9) *
room.notificationCount.toString().length +
9,
decoration: BoxDecoration(
color: room.highlightCount > 0 ||
room.membership == Membership.invite
? Colors.red
: hasNotifications || room.markedUnread
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.primaryContainer,
borderRadius:
BorderRadius.circular(AppConfig.borderRadius),
),
child: Center(
child: hasNotifications
? Text(
room.notificationCount.toString(),
style: TextStyle(
color: room.highlightCount > 0
? Colors.white
: hasNotifications
? Theme.of(context)
.colorScheme
.onPrimary
: Theme.of(context)
.colorScheme
.onPrimaryContainer,
fontSize: 13,
),
)
: const SizedBox.shrink(),
),
), ),
],
),
onTap: () => clickAction(context),
trailing: onForget == null
? AnimatedSize(
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
child: hovered || selected
? IconButton(
color: selected
? Theme.of(context).colorScheme.primary
: null,
icon: Icon(
selected
? Icons.check_circle
: Icons.check_circle_outlined,
),
onPressed: onLongPress,
)
: const SizedBox.shrink(),
)
: IconButton(
icon: const Icon(Icons.delete_outlined),
onPressed: onForget,
),
),
), ),
), ),
), ),

Write Preview
Loading…
Cancel
Save