GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-10-03 09:58:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/fix-load-member-in-timeline' into 'main'

Browse Source 
fix: Properly re-render the timeline etc. when the full userinformation was fetched

See merge request famedly/fluffychat!500
This commit is contained in:
Krille Fear 2021-09-06 18:25:53 +00:00
commit 6d5e06a723
1 changed files with 117 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lib/pages/views/chat_view.dart
View File

@ -63,7 +63,10 @@ class ChatView extends StatelessWidget {
redirector.stopRedirection(); redirector.stopRedirection();
} }
}, },
child: Scaffold( child: StreamBuilder(
stream: controller.room.onUpdate.stream
.rateLimit(Duration(milliseconds: 250)),
builder: (context, snapshot) => Scaffold(
appBar: AppBar( appBar: AppBar(
actionsIconTheme: IconThemeData( actionsIconTheme: IconThemeData(
color: controller.selectedEvents.isEmpty color: controller.selectedEvents.isEmpty
@ -80,12 +83,9 @@ class ChatView extends StatelessWidget {
: UnreadBadgeBackButton(roomId: controller.roomId), : UnreadBadgeBackButton(roomId: controller.roomId),
titleSpacing: 0, titleSpacing: 0,
title: controller.selectedEvents.isEmpty title: controller.selectedEvents.isEmpty
? StreamBuilder( ? ListTile(
stream: controller.room.onUpdate.stream leading: Avatar(
.rateLimit(Duration(milliseconds: 250)), controller.room.avatar, controller.room.displayname),
builder: (context, snapshot) => ListTile(
leading: Avatar(controller.room.avatar,
controller.room.displayname),
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
onTap: controller.room.isDirectChat onTap: controller.room.isDirectChat
? () => showModalBottomSheet( ? () => showModalBottomSheet(
@ -118,17 +118,15 @@ class ChatView extends StatelessWidget {
controller.room.directChatMatrixID) controller.room.directChatMatrixID)
.rateLimit(Duration(seconds: 1)), .rateLimit(Duration(seconds: 1)),
builder: (context, snapshot) => Text( builder: (context, snapshot) => Text(
controller.room controller.room.getLocalizedStatus(context),
.getLocalizedStatus(context),
maxLines: 1, maxLines: 1,
//overflow: TextOverflow.ellipsis, //overflow: TextOverflow.ellipsis,
)) ))
: Row( : Row(
children: <Widget>[ children: <Widget>[
Icon(Icons.edit_outlined, Icon(Icons.edit_outlined,
color: Theme.of(context) color:
.colorScheme Theme.of(context).colorScheme.secondary,
.secondary,
size: 13), size: 13),
SizedBox(width: 4), SizedBox(width: 4),
Expanded( Expanded(
@ -137,16 +135,15 @@ class ChatView extends StatelessWidget {
.getLocalizedTypingText(context), .getLocalizedTypingText(context),
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color:
.colorScheme Theme.of(context).colorScheme.secondary,
.secondary,
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,
), ),
), ),
), ),
], ],
), ),
)) )
: Text(controller.selectedEvents.length.toString()), : Text(controller.selectedEvents.length.toString()),
actions: controller.selectMode actions: controller.selectMode
? <Widget>[ ? <Widget>[
@ -261,6 +258,13 @@ class ChatView extends StatelessWidget {
thisEventsKeyMap[ thisEventsKeyMap[
controller.filteredEvents[i].eventId] = i; controller.filteredEvents[i].eventId] = i;
} }
final seenByText =
controller.room.getLocalizedSeenByText(
context,
controller.timeline,
controller.filteredEvents,
controller.unfolded,
);
return ListView.custom( return ListView.custom(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -296,33 +300,15 @@ class ChatView extends StatelessWidget {
) )
: Container() : Container()
: i == 0 : i == 0
? StreamBuilder( ? AnimatedContainer(
stream: controller height: seenByText.isEmpty ? 0 : 24,
.room.onUpdate.stream
.rateLimit(Duration(
milliseconds: 250)),
builder: (_, __) {
final seenByText = controller.room
.getLocalizedSeenByText(
context,
controller.timeline,
controller.filteredEvents,
controller.unfolded,
);
return AnimatedContainer(
height:
seenByText.isEmpty ? 0 : 24,
duration: seenByText.isEmpty duration: seenByText.isEmpty
? Duration(milliseconds: 0) ? Duration(milliseconds: 0)
: Duration( : Duration(milliseconds: 300),
milliseconds: 300), alignment: controller.filteredEvents
alignment: controller
.filteredEvents
.isNotEmpty && .isNotEmpty &&
controller controller.filteredEvents
.filteredEvents .first.senderId ==
.first
.senderId ==
client.userID client.userID
? Alignment.topRight ? Alignment.topRight
: Alignment.topLeft, : Alignment.topLeft,
@ -339,14 +325,12 @@ class ChatView extends StatelessWidget {
.scaffoldBackgroundColor .scaffoldBackgroundColor
.withOpacity(0.8), .withOpacity(0.8),
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(4),
4),
), ),
child: Text( child: Text(
seenByText, seenByText,
maxLines: 1, maxLines: 1,
overflow: overflow: TextOverflow.ellipsis,
TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
@ -354,8 +338,6 @@ class ChatView extends StatelessWidget {
), ),
), ),
), ),
);
},
) )
: AutoScrollTag( : AutoScrollTag(
key: ValueKey(controller key: ValueKey(controller
@ -773,7 +755,9 @@ class ChatView extends StatelessWidget {
), ),
], ],
), ),
)); ),
),
);
} }
} }