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

style: Give chat list list tiles rounded corners

Browse Source
krille/update-deps
Krille 2 years ago
parent 5d53a37e2e
commit 7c777c0b7b
1 changed files with 182 additions and 173 deletions
Show Stats Download Patch File Download Diff File

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

@ -127,194 +127,203 @@ class ChatListItem extends StatelessWidget {
final displayname = room.getLocalizedDisplayname( final displayname = room.getLocalizedDisplayname(
MatrixLocals(L10n.of(context)!), MatrixLocals(L10n.of(context)!),
); );
return Material( return Padding(
color: selected padding: const EdgeInsets.symmetric(horizontal: 8),
? Theme.of(context).colorScheme.primaryContainer child: Material(
: activeChat borderRadius: BorderRadius.circular(AppConfig.borderRadius),
? Theme.of(context).colorScheme.secondaryContainer clipBehavior: Clip.hardEdge,
: Colors.transparent, color: selected
child: ListTile( ? Theme.of(context).colorScheme.primaryContainer
onLongPress: onLongPress, : activeChat
leading: selected ? Theme.of(context).colorScheme.secondaryContainer
? SizedBox( : Colors.transparent,
width: Avatar.defaultSize, child: ListTile(
height: Avatar.defaultSize, contentPadding: const EdgeInsets.symmetric(horizontal: 8),
child: Material( onLongPress: onLongPress,
color: Theme.of(context).primaryColor, leading: selected
borderRadius: BorderRadius.circular(Avatar.defaultSize), ? SizedBox(
child: const Icon(Icons.check, color: Colors.white), width: Avatar.defaultSize,
height: Avatar.defaultSize,
child: Material(
color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.circular(Avatar.defaultSize),
child: const Icon(Icons.check, color: Colors.white),
),
)
: Avatar(
mxContent: room.avatar,
name: displayname,
onTap: onLongPress,
), ),
) title: Row(
: Avatar( children: <Widget>[
mxContent: room.avatar, Expanded(
name: displayname, child: Text(
onTap: onLongPress, displayname,
), maxLines: 1,
title: Row( overflow: TextOverflow.ellipsis,
children: <Widget>[ softWrap: false,
Expanded( style: TextStyle(
child: Text( fontWeight: unread ? FontWeight.bold : null,
displayname, ),
maxLines: 1,
overflow: TextOverflow.ellipsis,
softWrap: false,
style: TextStyle(
fontWeight: unread ? FontWeight.bold : null,
), ),
), ),
), if (isMuted)
if (isMuted) const Padding(
const Padding( padding: EdgeInsets.only(left: 4.0),
padding: EdgeInsets.only(left: 4.0), child: Icon(
child: Icon( Icons.notifications_off_outlined,
Icons.notifications_off_outlined, size: 16,
size: 16, ),
), ),
), if (room.isFavourite)
if (room.isFavourite) Padding(
Padding( padding: EdgeInsets.only(
padding: EdgeInsets.only( right: room.notificationCount > 0 ? 4.0 : 0.0),
right: room.notificationCount > 0 ? 4.0 : 0.0), child: Icon(
child: Icon( Icons.push_pin,
Icons.push_pin, size: 16,
size: 16, color: Theme.of(context).colorScheme.primary,
color: Theme.of(context).colorScheme.primary, ),
), ),
), Padding(
Padding( padding: const EdgeInsets.only(left: 4.0),
padding: const EdgeInsets.only(left: 4.0), child: Text(
child: Text( room.timeCreated.localizedTimeShort(context),
room.timeCreated.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
? L10n.of(context)!.youAreInvitedToThisChat
: 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:
room.notificationCount == 0 && !unread && !room.hasNewMessages
? 0
: (unreadBubbleSize - 9) *
room.notificationCount.toString().length +
9,
decoration: BoxDecoration(
color: room.highlightCount > 0 ||
room.membership == Membership.invite
? Colors.red
: room.notificationCount > 0 || room.markedUnread
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.primaryContainer,
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
), ),
child: Center( Expanded(
child: room.notificationCount > 0 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
: room.notificationCount > 0
? Theme.of(context).colorScheme.onPrimary
: Theme.of(context)
.colorScheme
.onPrimaryContainer,
fontSize: 13,
), ),
maxLines: 1,
softWrap: false,
) )
: Container(), : 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
? L10n.of(context)!.youAreInvitedToThisChat
: 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: room.notificationCount == 0 &&
!unread &&
!room.hasNewMessages
? 0
: (unreadBubbleSize - 9) *
room.notificationCount.toString().length +
9,
decoration: BoxDecoration(
color: room.highlightCount > 0 ||
room.membership == Membership.invite
? Colors.red
: room.notificationCount > 0 || room.markedUnread
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.primaryContainer,
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
),
child: Center(
child: room.notificationCount > 0
? Text(
room.notificationCount.toString(),
style: TextStyle(
color: room.highlightCount > 0
? Colors.white
: room.notificationCount > 0
? Theme.of(context).colorScheme.onPrimary
: Theme.of(context)
.colorScheme
.onPrimaryContainer,
fontSize: 13,
),
)
: Container(),
),
),
],
),
onTap: () => clickAction(context),
), ),
onTap: () => clickAction(context),
), ),
); );
} }

Write Preview
Loading…
Cancel
Save