Merge branch 'design'

This commit is contained in:
guozhigq
2024-10-10 09:43:31 +08:00
2 changed files with 39 additions and 18 deletions

View File

@ -153,7 +153,17 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
child: Container( child: Container(
height: 40, height: 40,
padding: const EdgeInsets.fromLTRB(12, 0, 6, 0), padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface, color: Theme.of(context).colorScheme.surface,
boxShadow: [
BoxShadow(
color: Theme.of(context).colorScheme.surface,
blurRadius: 0.0,
spreadRadius: 0.0,
offset: const Offset(2, 0),
),
],
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [

View File

@ -200,10 +200,11 @@ class ReplyItem extends StatelessWidget {
), ),
], ],
), ),
Row( RichText(
children: <Widget>[ text: TextSpan(
Text( children: [
Utils.dateFormat(replyItem!.ctime), TextSpan(
text: Utils.dateFormat(replyItem!.ctime),
style: TextStyle( style: TextStyle(
fontSize: textTheme.labelSmall!.fontSize, fontSize: textTheme.labelSmall!.fontSize,
color: colorScheme.outline, color: colorScheme.outline,
@ -211,14 +212,24 @@ class ReplyItem extends StatelessWidget {
), ),
if (replyItem!.replyControl != null && if (replyItem!.replyControl != null &&
replyItem!.replyControl!.location != '') replyItem!.replyControl!.location != '')
Text( TextSpan(
'${replyItem!.replyControl!.location!}', text: '${replyItem!.replyControl!.location!}',
style: TextStyle( style: TextStyle(
fontSize: textTheme.labelSmall!.fontSize, fontSize: textTheme.labelSmall!.fontSize,
color: colorScheme.outline), color: colorScheme.outline,
),
),
if (replyItem!.invisible!)
TextSpan(
text: ' • 隐藏的评论',
style: TextStyle(
color: colorScheme.outline,
fontSize: textTheme.labelSmall!.fontSize,
),
), ),
], ],
) ),
),
], ],
), ),
], ],