fix padding in messages

This commit is contained in:
Salvatore Giordano
2020-05-11 16:53:07 +02:00
parent 5b29057ccb
commit 18ded607a8
4 changed files with 46 additions and 42 deletions
+24 -27
View File
@@ -43,39 +43,36 @@ class DateDivider extends StatelessWidget {
dayInfo = createdAt.format('dd/MM/yyyy').toUpperCase();
}
return Padding(
padding: const EdgeInsets.symmetric(vertical: 12.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
divider,
Padding(
padding: const EdgeInsets.symmetric(horizontal: 32.0),
child: Text.rich(
TextSpan(
children: [
TextSpan(
text: dayInfo,
style: TextStyle(
fontWeight: FontWeight.bold,
),
return Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
divider,
Padding(
padding: const EdgeInsets.symmetric(horizontal: 32.0),
child: Text.rich(
TextSpan(
children: [
TextSpan(
text: dayInfo,
style: TextStyle(
fontWeight: FontWeight.bold,
),
TextSpan(text: ' AT'),
TextSpan(text: ' $hourInfo'),
],
style: TextStyle(
fontWeight: FontWeight.normal,
),
),
TextSpan(text: ' AT'),
TextSpan(text: ' $hourInfo'),
],
style: TextStyle(
fontSize: 10,
color: Theme.of(context).textTheme.title.color.withOpacity(.5),
fontWeight: FontWeight.normal,
),
),
style: TextStyle(
fontSize: 10,
color: Theme.of(context).textTheme.title.color.withOpacity(.5),
),
),
divider,
],
),
),
divider,
],
);
}
}
+10 -7
View File
@@ -11,13 +11,16 @@ class DeletedMessage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Text(
'This message was deleted...',
style: messageTheme.messageText.copyWith(
fontStyle: FontStyle.italic,
color: Theme.of(context).brightness == Brightness.dark
? Colors.white
: Colors.black,
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Text(
'This message was deleted...',
style: messageTheme.messageText.copyWith(
fontStyle: FontStyle.italic,
color: Theme.of(context).brightness == Brightness.dark
? Colors.white
: Colors.black,
),
),
);
}
+10 -7
View File
@@ -232,12 +232,15 @@ class _MessageListViewState extends State<MessageListView> {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
messageWidget,
widget.dateDividerBuilder != null
? widget
.dateDividerBuilder(nextMessage.createdAt.toLocal())
: DateDivider(
dateTime: nextMessage.createdAt.toLocal(),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 12.0),
child: widget.dateDividerBuilder != null
? widget
.dateDividerBuilder(nextMessage.createdAt.toLocal())
: DateDivider(
dateTime: nextMessage.createdAt.toLocal(),
),
),
],
);
}
@@ -413,7 +416,7 @@ class _MessageListViewState extends State<MessageListView> {
padding: EdgeInsets.only(
left: 8.0,
right: 8.0,
bottom: index == 0 ? 30 : (isLastUser ? 5 : 10),
bottom: index == 0 ? 30 : (isNextUser ? 5 : 10),
),
showUsername: !isMyMessage && !isNextUser,
showSendingIndicator: isMyMessage &&
+2 -1
View File
@@ -173,7 +173,8 @@ class MessageWidget extends StatelessWidget {
true &&
showReactions)
? EdgeInsets.only(
top: _getReactionsTopPadding())
top: _getReactionsTopPadding(),
)
: EdgeInsets.zero,
child: PortalEntry(
portalAnchor: Alignment(0, 1),