Compare commits

..

No commits in common. "7c0c1ec94fcb090de9ead856fffb731b658cd3e0" and "39c22b1cf6b1e0c83340c16287cd20c703b3d731" have entirely different histories.

4 changed files with 8 additions and 12 deletions

View File

@ -136,10 +136,8 @@ class _SignInPopupState extends State<SignInPopup> with ProtocolListener {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
ClipRRect( Image.asset('assets/logo.png', width: 64, height: 64)
borderRadius: const BorderRadius.all(Radius.circular(8)), .paddingOnly(bottom: 4),
child: Image.asset('assets/logo.png', width: 64, height: 64),
).paddingOnly(bottom: 4),
Text( Text(
'signinGreeting'.tr, 'signinGreeting'.tr,
style: const TextStyle( style: const TextStyle(

View File

@ -70,10 +70,8 @@ class _SignUpPopupState extends State<SignUpPopup> {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
ClipRRect( Image.asset('assets/logo.png', width: 64, height: 64)
borderRadius: const BorderRadius.all(Radius.circular(8)), .paddingOnly(bottom: 4),
child: Image.asset('assets/logo.png', width: 64, height: 64),
).paddingOnly(bottom: 4),
Text( Text(
'signupGreeting'.tr, 'signupGreeting'.tr,
style: const TextStyle( style: const TextStyle(

View File

@ -237,7 +237,7 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
var insertText = ''; var insertText = '';
if (suggestion.type == 'emotes') { if (suggestion.type == 'emotes') {
insertText = suggestion.content; insertText = '${suggestion.content} ';
startText = replaceText.replaceFirstMapped( startText = replaceText.replaceFirstMapped(
RegExp(r':(?:([a-z0-9_+-]+)~)?([a-z0-9_+-]+)$'), RegExp(r':(?:([a-z0-9_+-]+)~)?([a-z0-9_+-]+)$'),
(Match m) => insertText, (Match m) => insertText,
@ -245,7 +245,7 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
} }
if (suggestion.type == 'users') { if (suggestion.type == 'users') {
insertText = suggestion.content; insertText = '${suggestion.content} ';
startText = replaceText.replaceFirstMapped( startText = replaceText.replaceFirstMapped(
RegExp(r'(?:\s|^)@([a-z0-9_+-]+)$'), RegExp(r'(?:\s|^)@([a-z0-9_+-]+)$'),
(Match m) => insertText, (Match m) => insertText,

View File

@ -100,12 +100,12 @@ class MarkdownTextContent extends StatelessWidget {
width = 28; width = 28;
height = 28; height = 28;
} }
fit = BoxFit.contain; fit = BoxFit.fill;
break; break;
case 'attachments': case 'attachments':
const radius = BorderRadius.all(Radius.circular(8)); const radius = BorderRadius.all(Radius.circular(8));
return LimitedBox( return LimitedBox(
maxHeight: MediaQuery.of(context).size.width, maxHeight: 360,
child: ClipRRect( child: ClipRRect(
borderRadius: radius, borderRadius: radius,
child: AttachmentSelfContainedEntry( child: AttachmentSelfContainedEntry(