GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-02 17:29:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/hot-fixes' into 'main'

Browse Source 
Krille/hot fixes

See merge request famedly/fluffychat!856
This commit is contained in:
Krille Fear 2022-05-03 14:45:53 +00:00
commit b1417c07b3
2 changed files with 158 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -14,6 +14,9 @@
- feat: allow to create widgets (TheOneWithTheBraid) - feat: allow to create widgets (TheOneWithTheBraid)
- feat: remove diacritics (henri2h) - feat: remove diacritics (henri2h)
- feat: irish language support (Graeme Power) - feat: irish language support (Graeme Power)
- feat: Enable screensharing on Mobile
- feat: support AppImage builds
- feat: Improve spaces design
- fix: Android theme is not auto updating when system theme changes (Krille Fear) - fix: Android theme is not auto updating when system theme changes (Krille Fear)
- fix: Chat view becomes gray for a second on sending reaction (Krille Fear) - fix: Chat view becomes gray for a second on sending reaction (Krille Fear)
- fix: Don't request new thumbnail resolution on every window resize (Samuel Mezger) - fix: Don't request new thumbnail resolution on every window resize (Samuel Mezger)

306
lib/pages/chat_list/chat_list_item.dart
View File

@ -155,172 +155,176 @@ class ChatListItem extends StatelessWidget {
? 20.0 ? 20.0
: 14.0 : 14.0
: 0.0; : 0.0;
return ListTile( return Material(
selected: selected || activeChat, color: selected
selectedTileColor: selected
? Theme.of(context).primaryColor.withAlpha(100) ? Theme.of(context).primaryColor.withAlpha(100)
: Theme.of(context).secondaryHeaderColor, : activeChat
onLongPress: onLongPress as void Function()?, ? Theme.of(context).secondaryHeaderColor
leading: selected : Colors.transparent,
? SizedBox( child: ListTile(
width: Avatar.defaultSize, selected: selected || activeChat,
height: Avatar.defaultSize, onLongPress: onLongPress as void Function()?,
child: Material( leading: selected
color: Theme.of(context).primaryColor, ? SizedBox(
borderRadius: BorderRadius.circular(Avatar.defaultSize), width: Avatar.defaultSize,
child: const Icon(Icons.check, color: Colors.white), 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: room.displayname,
onTap: onLongPress as void Function()?,
), ),
) title: Row(
: Avatar( children: <Widget>[
mxContent: room.avatar, Expanded(
name: room.displayname, child: Text(
onTap: onLongPress as void Function()?, room.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)),
), maxLines: 1,
title: Row( overflow: TextOverflow.ellipsis,
children: <Widget>[ softWrap: false,
Expanded( style: TextStyle(
child: Text( fontWeight: FontWeight.bold,
room.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)), color: unread
maxLines: 1, ? Theme.of(context).colorScheme.secondary
overflow: TextOverflow.ellipsis, : Theme.of(context).textTheme.bodyText1!.color,
softWrap: false, ),
style: TextStyle(
fontWeight: FontWeight.bold,
color: unread
? Theme.of(context).colorScheme.secondary
: Theme.of(context).textTheme.bodyText1!.color,
), ),
), ),
), 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)
Padding(
padding: EdgeInsets.only(
right: room.notificationCount > 0 ? 4.0 : 0.0),
child: Icon(
Icons.push_pin_outlined,
size: 16,
color: Theme.of(context).colorScheme.secondary,
),
), ),
),
if (room.isFavourite)
Padding( Padding(
padding: EdgeInsets.only( padding: const EdgeInsets.only(left: 4.0),
right: room.notificationCount > 0 ? 4.0 : 0.0), child: Text(
child: Icon( room.timeCreated.localizedTimeShort(context),
Icons.push_pin_outlined, style: TextStyle(
size: 16, fontSize: 13,
color: Theme.of(context).colorScheme.secondary, color: unread
? Theme.of(context).colorScheme.secondary
: Theme.of(context).textTheme.bodyText2!.color,
),
), ),
), ),
Padding(
padding: const EdgeInsets.only(left: 4.0),
child: Text(
room.timeCreated.localizedTimeShort(context),
style: TextStyle(
fontSize: 13,
color: unread
? Theme.of(context).colorScheme.secondary
: Theme.of(context).textTheme.bodyText2!.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: const Duration(milliseconds: 300), if (typingText.isEmpty &&
curve: Curves.bounceInOut, 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),
],
AnimatedContainer(
width: typingText.isEmpty ? 0 : 18,
clipBehavior: Clip.hardEdge,
decoration: const BoxDecoration(),
duration: const Duration(milliseconds: 300),
curve: Curves.bounceInOut,
padding: const EdgeInsets.only(right: 4),
child: Icon(
Icons.edit_outlined,
color: Theme.of(context).colorScheme.secondary,
size: 14,
),
), ),
), Expanded(
Expanded( child: typingText.isNotEmpty
child: typingText.isNotEmpty
? Text(
typingText,
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
),
softWrap: false,
)
: Text(
room.membership == Membership.invite
? L10n.of(context)!.youAreInvitedToThisChat
: room.lastEvent?.getLocalizedBody(
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(
color: unread
? Theme.of(context).colorScheme.secondary
: Theme.of(context).textTheme.bodyText2!.color,
decoration: room.lastEvent?.redacted == true
? TextDecoration.lineThrough
: null,
),
),
),
const SizedBox(width: 8),
AnimatedContainer(
duration: const Duration(milliseconds: 300),
curve: Curves.bounceInOut,
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
? Colors.red
: room.notificationCount > 0
? Theme.of(context).primaryColor
: Theme.of(context).primaryColor.withAlpha(100),
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
),
child: Center(
child: room.notificationCount > 0
? Text( ? Text(
room.notificationCount.toString(), typingText,
style: const TextStyle( style: TextStyle(
color: Colors.white, color: Theme.of(context).colorScheme.secondary,
fontSize: 13,
), ),
softWrap: false,
) )
: Container(), : Text(
room.membership == Membership.invite
? L10n.of(context)!.youAreInvitedToThisChat
: room.lastEvent?.getLocalizedBody(
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(
color: unread
? Theme.of(context).colorScheme.secondary
: Theme.of(context).textTheme.bodyText2!.color,
decoration: room.lastEvent?.redacted == true
? TextDecoration.lineThrough
: null,
),
),
), ),
), const SizedBox(width: 8),
], AnimatedContainer(
duration: const Duration(milliseconds: 300),
curve: Curves.bounceInOut,
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
? Colors.red
: room.notificationCount > 0
? Theme.of(context).primaryColor
: Theme.of(context).primaryColor.withAlpha(100),
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
),
child: Center(
child: room.notificationCount > 0
? Text(
room.notificationCount.toString(),
style: const TextStyle(
color: Colors.white,
fontSize: 13,
),
)
: Container(),
),
),
],
),
onTap: () => clickAction(context),
), ),
onTap: () => clickAction(context),
); );
} }
} }