mirror of
https://github.com/krille-chan/fluffychat
synced 2024-09-10 09:05:10 +00:00
chore: Follow up select chats
This commit is contained in:
parent
2872448584
commit
2a7744e4c7
1 changed files with 199 additions and 187 deletions
|
@ -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(
|
|
||||||
mxContent: room.avatar,
|
|
||||||
name: displayname,
|
|
||||||
onTap: onLongPress,
|
|
||||||
presenceUserId: room.directChatMatrixID,
|
|
||||||
presenceBackgroundColor: backgroundColor,
|
|
||||||
),
|
|
||||||
title: Row(
|
|
||||||
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)
|
|
||||||
Padding(
|
|
||||||
padding: EdgeInsets.only(
|
|
||||||
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)
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(left: 4.0),
|
|
||||||
child: Text(
|
child: Text(
|
||||||
lastEvent.originServerTs.localizedTimeShort(context),
|
displayname,
|
||||||
style: TextStyle(
|
maxLines: 1,
|
||||||
fontSize: 13,
|
overflow: TextOverflow.ellipsis,
|
||||||
color: unread
|
softWrap: false,
|
||||||
? Theme.of(context).colorScheme.secondary
|
style: unread
|
||||||
: Theme.of(context).textTheme.bodyMedium!.color,
|
? 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)
|
||||||
],
|
Padding(
|
||||||
),
|
padding: EdgeInsets.only(
|
||||||
subtitle: Row(
|
right: hasNotifications ? 4.0 : 0.0,
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
),
|
||||||
children: <Widget>[
|
child: Icon(
|
||||||
if (typingText.isEmpty &&
|
Icons.push_pin,
|
||||||
ownMessage &&
|
size: 16,
|
||||||
room.lastEvent!.status.isSending) ...[
|
color: Theme.of(context).colorScheme.primary,
|
||||||
const SizedBox(
|
),
|
||||||
width: 16,
|
),
|
||||||
height: 16,
|
if (lastEvent != null && room.membership != Membership.invite)
|
||||||
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
|
Padding(
|
||||||
),
|
padding: const EdgeInsets.only(left: 4.0),
|
||||||
const SizedBox(width: 4),
|
child: Text(
|
||||||
],
|
lastEvent.originServerTs.localizedTimeShort(context),
|
||||||
AnimatedContainer(
|
style: TextStyle(
|
||||||
width: typingText.isEmpty ? 0 : 18,
|
fontSize: 13,
|
||||||
clipBehavior: Clip.hardEdge,
|
color: unread
|
||||||
decoration: const BoxDecoration(),
|
? Theme.of(context).colorScheme.secondary
|
||||||
duration: FluffyThemes.animationDuration,
|
: Theme.of(context).textTheme.bodyMedium!.color,
|
||||||
curve: FluffyThemes.animationCurve,
|
|
||||||
padding: const EdgeInsets.only(right: 4),
|
|
||||||
child: Icon(
|
|
||||||
Icons.edit_outlined,
|
|
||||||
color: Theme.of(context).colorScheme.secondary,
|
|
||||||
size: 14,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Expanded(
|
|
||||||
child: typingText.isNotEmpty
|
|
||||||
? Text(
|
|
||||||
typingText,
|
|
||||||
style: TextStyle(
|
|
||||||
color: Theme.of(context).colorScheme.primary,
|
|
||||||
),
|
|
||||||
maxLines: 1,
|
|
||||||
softWrap: false,
|
|
||||||
)
|
|
||||||
: 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,
|
),
|
||||||
curve: FluffyThemes.animationCurve,
|
subtitle: Row(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 7),
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
height: unreadBubbleSize,
|
children: <Widget>[
|
||||||
width: !hasNotifications && !unread && !room.hasNewMessages
|
if (typingText.isEmpty &&
|
||||||
? 0
|
ownMessage &&
|
||||||
: (unreadBubbleSize - 9) *
|
room.lastEvent!.status.isSending) ...[
|
||||||
room.notificationCount.toString().length +
|
const SizedBox(
|
||||||
9,
|
width: 16,
|
||||||
decoration: BoxDecoration(
|
height: 16,
|
||||||
color: room.highlightCount > 0 ||
|
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
|
||||||
room.membership == Membership.invite
|
),
|
||||||
? Colors.red
|
const SizedBox(width: 4),
|
||||||
: hasNotifications || room.markedUnread
|
],
|
||||||
? Theme.of(context).colorScheme.primary
|
AnimatedContainer(
|
||||||
: Theme.of(context).colorScheme.primaryContainer,
|
width: typingText.isEmpty ? 0 : 18,
|
||||||
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
|
clipBehavior: Clip.hardEdge,
|
||||||
|
decoration: const BoxDecoration(),
|
||||||
|
duration: FluffyThemes.animationDuration,
|
||||||
|
curve: FluffyThemes.animationCurve,
|
||||||
|
padding: const EdgeInsets.only(right: 4),
|
||||||
|
child: Icon(
|
||||||
|
Icons.edit_outlined,
|
||||||
|
color: Theme.of(context).colorScheme.secondary,
|
||||||
|
size: 14,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
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,
|
||||||
|
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(
|
||||||
|
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,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
onTap: () => clickAction(context),
|
|
||||||
trailing: onForget == null
|
|
||||||
? null
|
|
||||||
: IconButton(
|
|
||||||
icon: const Icon(Icons.delete_outlined),
|
|
||||||
onPressed: onForget,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
Loading…
Reference in a new issue