hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from NicKoehler/chat-fix

Browse Source 
Chat padding fix
This commit is contained in:
RustDesk 2023-05-25 19:41:15 +08:00 committed by GitHub
commit 865ac8240c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 38 deletions

76
flutter/lib/common/widgets/chat_page.dart

@ -47,7 +47,7 @@ class ChatPage extends StatelessWidget implements PageShape {
value: chatModel, value: chatModel,
child: Container( child: Container(
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
padding: EdgeInsets.only(top: 14.0, bottom: 14.0, left: 14.0), padding: EdgeInsets.all(14.0),
child: Consumer<ChatModel>( child: Consumer<ChatModel>(
builder: (context, chatModel, child) { builder: (context, chatModel, child) {
final currentUser = chatModel.currentUser; final currentUser = chatModel.currentUser;
@ -105,43 +105,43 @@ class ChatPage extends StatelessWidget implements PageShape {
), ),
), ),
messageOptions: MessageOptions( messageOptions: MessageOptions(
showOtherUsersAvatar: false, showOtherUsersAvatar: false,
showOtherUsersName: false, showOtherUsersName: false,
textColor: Colors.white, textColor: Colors.white,
maxWidth: constraints.maxWidth * 0.7, maxWidth: constraints.maxWidth * 0.7,
messageTextBuilder: (message, _, __) { messageTextBuilder: (message, _, __) {
final isOwnMessage = final isOwnMessage = message.user.id.isBlank!;
message.user.id == currentUser.id; return Column(
return Column( crossAxisAlignment: isOwnMessage
crossAxisAlignment: isOwnMessage ? CrossAxisAlignment.end
? CrossAxisAlignment.start : CrossAxisAlignment.start,
: CrossAxisAlignment.end, children: <Widget>[
children: <Widget>[ Text(message.text,
Text(message.text, style: TextStyle(color: Colors.white)),
style: TextStyle(color: Colors.white)), Text(
Text( "${message.createdAt.hour}:${message.createdAt.minute.toString().padLeft(2, '0')}",
"${message.createdAt.hour}:${message.createdAt.minute.toString().padLeft(2, '0')}", style: TextStyle(
style: TextStyle( color: Colors.white,
color: Colors.white, fontSize: 8,
fontSize: 8, ),
), ).marginOnly(top: 3),
).marginOnly(top: 3), ],
], );
); },
}, messageDecorationBuilder:
messageDecorationBuilder: (message, __, ___) { (message, previousMessage, nextMessage) {
final isOwnMessage = final isOwnMessage = message.user.id.isBlank!;
message.user.id == currentUser.id; print("message.user.id = ${message.user.id}\n");
return defaultMessageDecoration( return defaultMessageDecoration(
color: isOwnMessage color:
? Colors.blueGrey isOwnMessage ? MyTheme.accent : Colors.blueGrey,
: MyTheme.accent, borderTopLeft: 8,
borderTopLeft: 8, borderTopRight: 8,
borderTopRight: 8, borderBottomRight: isOwnMessage ? 2 : 8,
borderBottomRight: isOwnMessage ? 8 : 2, borderBottomLeft: isOwnMessage ? 8 : 2,
borderBottomLeft: isOwnMessage ? 2 : 8, );
); },
}), ),
); );
return SelectionArea(child: chat); return SelectionArea(child: chat);
}), }),