lib/providers/sticker.dart

@@ -1,3 +0,0 @@
-class StickerProvider {
-
-}

lib/screens/chat/room.dart

@@ -281,7 +281,11 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
                 Expanded(
                   child: InfiniteList(
                     reverse: true,
-                    padding: const EdgeInsets.only(top: 12),
+                    padding: const EdgeInsets.only(
+                      left: 12,
+                      right: 12,
+                      top: 12,
+                    ),
                     hasReachedMax: _messageController.isAllLoaded,
                     itemCount: _messageController.messages.length,
                     isLoading: _messageController.isLoading,
@@ -307,6 +311,8 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
 
                       return Align(
                         alignment: Alignment.centerLeft,
+                        child: Container(
+                          constraints: BoxConstraints(maxWidth: 480),
                           child: ChatMessage(
                             data: message,
                             isMerged: canMerge,
@@ -322,6 +328,7 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
                               _inputGlobalKey.currentState?.deleteMessage(value);
                             },
                           ),
+                        ),
                       );
                     },
                   ),

lib/screens/home.dart

@@ -153,14 +153,9 @@ class _HomeDashUpdateWidget extends StatelessWidget {
   }
 }
 
-class _HomeDashSpecialDayWidget extends StatefulWidget {
+class _HomeDashSpecialDayWidget extends StatelessWidget {
   const _HomeDashSpecialDayWidget();
 
-  @override
-  State<_HomeDashSpecialDayWidget> createState() => _HomeDashSpecialDayWidgetState();
-}
-
-class _HomeDashSpecialDayWidgetState extends State<_HomeDashSpecialDayWidget> {
   @override
   Widget build(BuildContext context) {
     final ua = context.watch<UserProvider>();
@@ -170,6 +165,7 @@ class _HomeDashSpecialDayWidgetState extends State<_HomeDashSpecialDayWidget> {
 
     if (days.isNotEmpty) {
       return Column(
+          spacing: 8,
           children: days.map((ele) {
             return Card(
               child: ListTile(
@@ -208,9 +204,6 @@ class _HomeDashSpecialDayWidgetState extends State<_HomeDashSpecialDayWidget> {
                 separatorType: SeparatorType.symbol,
                 decoration: BoxDecoration(),
                 padding: EdgeInsets.zero,
-                onDone: () {
-                  setState(() {});
-                },
               ),
               const Gap(12),
               Expanded(

lib/widgets/attachment/attachment_list.dart

@@ -106,8 +106,9 @@ class _AttachmentListState extends State<AttachmentList> {
         }
 
         if (widget.gridded) {
-          return Container(
+          return Padding(
-            margin: widget.padding ?? EdgeInsets.zero,
+            padding: widget.padding ?? EdgeInsets.zero,
+            child: Container(
               decoration: BoxDecoration(
                 color: backgroundColor,
                 border: Border(
@@ -150,20 +151,22 @@ class _AttachmentListState extends State<AttachmentList> {
                       .toList(),
                 ),
               ),
+            ),
           );
         }
 
-        return Container(
+        return AspectRatio(
+          aspectRatio: (widget.data.firstOrNull?.data['ratio'] ?? 1).toDouble(),
+          child: Container(
             constraints: BoxConstraints(maxHeight: constraints.maxHeight),
             child: ScrollConfiguration(
               behavior: _AttachmentListScrollBehavior(),
               child: ListView.separated(
-              padding: widget.padding,
                 shrinkWrap: true,
                 itemCount: widget.data.length,
                 itemBuilder: (context, idx) {
                   return Container(
-                  constraints: constraints.copyWith(maxWidth: widget.maxWidth),
+                    constraints: constraints,
                     child: AspectRatio(
                       aspectRatio: (widget.data[idx]?.data['ratio'] ?? 1).toDouble(),
                       child: GestureDetector(
@@ -171,7 +174,8 @@ class _AttachmentListState extends State<AttachmentList> {
                           if (widget.data[idx]?.mediaType != SnMediaType.image) return;
                           context.pushTransparentRoute(
                             AttachmentZoomView(
-                            data: widget.data.where((ele) => ele != null && ele.mediaType == SnMediaType.image).cast(),
+                              data:
+                                  widget.data.where((ele) => ele != null && ele.mediaType == SnMediaType.image).cast(),
                               initialIndex: idx,
                               heroTags: heroTags,
                             ),
@@ -213,10 +217,12 @@ class _AttachmentListState extends State<AttachmentList> {
                   );
                 },
                 separatorBuilder: (context, index) => const Gap(8),
+                padding: widget.padding,
                 physics: const BouncingScrollPhysics(),
                 scrollDirection: Axis.horizontal,
               ),
             ),
+          ),
         );
       },
     );

lib/widgets/attachment/attachment_zoom.dart

@@ -231,7 +231,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                           children: [
                             IgnorePointer(
                               child: AccountImage(
-                                content: account?.avatar,
+                                content: account!.avatar,
                                 radius: 19,
                               ),
                             ),
@@ -246,7 +246,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                                       style: Theme.of(context).textTheme.bodySmall,
                                     ),
                                     Text(
-                                      account?.nick ?? 'unknown'.tr(),
+                                      account.nick,
                                       style: Theme.of(context).textTheme.bodyMedium,
                                     ),
                                   ],

lib/widgets/chat/chat_message.dart

@@ -24,7 +24,6 @@ class ChatMessage extends StatelessWidget {
   final Function(SnChatMessage)? onReply;
   final Function(SnChatMessage)? onEdit;
   final Function(SnChatMessage)? onDelete;
-  final EdgeInsets padding;
 
   const ChatMessage({
     super.key,
@@ -36,7 +35,6 @@ class ChatMessage extends StatelessWidget {
     this.onReply,
     this.onEdit,
     this.onDelete,
-    this.padding = const EdgeInsets.only(left: 12, right: 12),
   });
 
   @override
@@ -89,9 +87,7 @@ class ChatMessage extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Padding(
+            Row(
-              padding: isCompact ? EdgeInsets.zero : padding,
-              child: Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 if (!isMerged && !isCompact)
@@ -102,8 +98,6 @@ class ChatMessage extends StatelessWidget {
                   const Gap(40),
                 const Gap(8),
                 Expanded(
-                    child: Container(
-                      constraints: BoxConstraints(maxWidth: 480),
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
@@ -125,7 +119,7 @@ class ChatMessage extends StatelessWidget {
                             ).fontSize(13),
                           ],
                         ),
-                          if (isCompact) const Gap(8),
+                      if (isCompact) const Gap(4),
                       if (data.preload?.quoteEvent != null)
                         StyledWidget(Container(
                           decoration: BoxDecoration(
@@ -155,23 +149,21 @@ class ChatMessage extends StatelessWidget {
                       },
                     ],
                   ),
-                    ),
                 )
               ],
             ).opacity(isPending ? 0.5 : 1),
-            ),
             if (data.body['text'] != null && data.type == 'messages.new' && (data.body['text']?.isNotEmpty ?? false))
               LinkPreviewWidget(text: data.body['text']!),
             if (data.preload?.attachments?.isNotEmpty ?? false)
               AttachmentList(
                 data: data.preload!.attachments!,
                 bordered: true,
+                // gridded: true,
                 maxHeight: 560,
-                maxWidth: 480,
                 minWidth: 480,
-                padding: padding.copyWith(top: 8),
+                padding: const EdgeInsets.only(top: 8),
               ),
-            if (!hasMerged && !isCompact) const Gap(12) else if (!isCompact) const Gap(8),
+            if (!hasMerged && !isCompact) const Gap(12) else if (!isCompact) const Gap(6),
           ],
         ),
       ),

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.2.1+44
+version: 2.2.1+43
 
 environment:
   sdk: ^3.5.4