💄 Improvements and optimize UX

assets/locales/en_us.json

@@ -22,9 +22,9 @@
   "explore": "Explore",
   "posts": "Posts",
   "unlink": "Unlink",
-  "feedSearch": "Search Feed",
+  "postSearch": "Search Post",
-  "feedSearchWithTag": "Searching with tag #@key",
+  "postSearchWithTag": "Searching with tag #@key",
-  "feedSearchWithCategory": "Searching in category @category",
+  "postSearchWithCategory": "Searching in category @category",
   "feedUnreadCount": "@count posts you may missed",
   "messages": "Messages",
   "messagesUnreadCount": "@count messages unread",

assets/locales/zh_cn.json

@@ -32,9 +32,9 @@
   "dashboard": "仪表盘",
   "today": "今日",
   "yesterday": "昨日",
-  "feedSearch": "搜索资讯",
+  "postSearch": "搜索帖子",
-  "feedSearchWithTag": "检索带有 #@key 标签的资讯",
+  "postSearchWithTag": "检索带有 #@key 标签的资讯",
-  "feedSearchWithCategory": "检索位于分类 @category 的资讯",
+  "postSearchWithCategory": "检索位于分类 @category 的资讯",
   "feedUnreadCount": "@count 条你可能错过的帖子",
   "messages": "消息",
   "messagesUnreadCount": "@count 条未读的消息",

lib/router.dart

@@ -23,7 +23,7 @@ import 'package:solian/screens/realms.dart';
 import 'package:solian/screens/realms/realm_detail.dart';
 import 'package:solian/screens/realms/realm_organize.dart';
 import 'package:solian/screens/realms/realm_view.dart';
-import 'package:solian/screens/feed.dart';
+import 'package:solian/screens/explore.dart';
 import 'package:solian/screens/posts/post_editor.dart';
 import 'package:solian/screens/settings.dart';
 import 'package:solian/shells/root_shell.dart';
@@ -78,13 +78,18 @@ abstract class AppRouter {
     builder: (context, state, child) => child,
     routes: [
       GoRoute(
-        path: '/feed',
+        path: '/explore',
-        name: 'feed',
+        name: 'explore',
-        builder: (context, state) => const FeedScreen(),
+        builder: (context, state) => const ExploreScreen(),
       ),
       GoRoute(
-        path: '/feed/search',
+        path: '/drafts',
-        name: 'feedSearch',
+        name: 'draftBox',
+        builder: (context, state) => const DraftBoxScreen(),
+      ),
+      GoRoute(
+        path: '/posts/search',
+        name: 'postSearch',
         builder: (context, state) => TitleShell(
           state: state,
           child: FeedSearchScreen(
@@ -93,11 +98,6 @@ abstract class AppRouter {
           ),
         ),
       ),
-      GoRoute(
-        path: '/drafts',
-        name: 'draftBox',
-        builder: (context, state) => const DraftBoxScreen(),
-      ),
       GoRoute(
         path: '/posts/view/:id',
         name: 'postDetail',

lib/screens/about.dart

@@ -54,6 +54,7 @@ class AboutScreen extends StatelessWidget {
               child: Wrap(
                 spacing: 8,
                 runSpacing: 8,
+                alignment: WrapAlignment.center,
                 children: [
                   TextButton(
                     style: denseButtonStyle,

lib/screens/explore.dart

@@ -16,14 +16,14 @@ import 'package:solian/widgets/app_bar_leading.dart';
 import 'package:solian/widgets/posts/post_shuffle_swiper.dart';
 import 'package:solian/widgets/posts/post_warped_list.dart';
 
-class FeedScreen extends StatefulWidget {
+class ExploreScreen extends StatefulWidget {
-  const FeedScreen({super.key});
+  const ExploreScreen({super.key});
 
   @override
-  State<FeedScreen> createState() => _FeedScreenState();
+  State<ExploreScreen> createState() => _ExploreScreenState();
 }
 
-class _FeedScreenState extends State<FeedScreen>
+class _ExploreScreenState extends State<ExploreScreen>
     with SingleTickerProviderStateMixin {
   late final PostListController _postController;
   late final TabController _tabController;
@@ -82,7 +82,7 @@ class _FeedScreenState extends State<FeedScreen>
           headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
             return [
               SliverAppBar(
-                title: AppBarTitle('feed'.tr),
+                title: AppBarTitle('explore'.tr),
                 centerTitle: false,
                 floating: true,
                 toolbarHeight: AppTheme.toolbarHeight(context),

lib/screens/feed/search.dart

@@ -63,13 +63,13 @@ class _FeedSearchScreenState extends State<FeedSearchScreen> {
               ListTile(
                 leading: const Icon(Icons.label),
                 tileColor: Theme.of(context).colorScheme.surfaceContainer,
-                title: Text('feedSearchWithTag'.trParams({'key': widget.tag!})),
+                title: Text('postSearchWithTag'.trParams({'key': widget.tag!})),
               ),
             if (widget.category != null)
               ListTile(
                 leading: const Icon(Icons.category),
                 tileColor: Theme.of(context).colorScheme.surfaceContainer,
-                title: Text('feedSearchWithCategory'
+                title: Text('postSearchWithCategory'
                     .trParams({'key': widget.category!})),
               ),
             Expanded(

lib/widgets/chat/chat_event_message.dart

@@ -49,6 +49,7 @@ class ChatEventMessage extends StatelessWidget {
     return MarkdownTextContent(
       parentId: 'm${item.id}',
       isSelectable: true,
+      isAutoWarp: true,
       content: body.text,
     );
   }

lib/widgets/markdown_text_content.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown_selectionarea/flutter_markdown.dart';
+import 'package:gap/gap.dart';
 import 'package:get/get.dart';
 import 'package:markdown/markdown.dart' as markdown;
 import 'package:markdown/markdown.dart';
@@ -15,6 +16,7 @@ class MarkdownTextContent extends StatelessWidget {
   final String parentId;
   final bool isSelectable;
   final bool isLargeText;
+  final bool isAutoWarp;
 
   const MarkdownTextContent({
     super.key,
@@ -22,17 +24,36 @@ class MarkdownTextContent extends StatelessWidget {
     required this.parentId,
     this.isSelectable = false,
     this.isLargeText = false,
+    this.isAutoWarp = false,
   });
 
   Widget _buildContent(BuildContext context) {
-    final emojiRegex = RegExp(r':([-\w]+):');
+    final stickerRegex = RegExp(r':([-\w]+):');
-    final emojiMatch = emojiRegex.allMatches(content);
-    final isOnlyEmoji = content.replaceAll(emojiRegex, '').trim().isEmpty;
 
-    return Markdown(
+    // Split the content into paragraphs
+    final paragraphs = content.split(RegExp(r'\n\s*\n'));
+
+    // Iterate over each paragraph to process stickers individually
+    List<Widget> contentWidgets = [];
+    for (var idx = 0; idx < paragraphs.length; idx++) {
+      // Getting paragraph
+      var paragraph = paragraphs[idx];
+
+      // Auto adding new-lines
+      if (isAutoWarp) {
+        paragraph = paragraph.replaceAll('\n', '\\\n');
+      }
+
+      // Matching stickers
+      final stickerMatch = stickerRegex.allMatches(paragraph);
+      final isOnlySticker =
+          paragraph.replaceAll(stickerRegex, '').trim().isEmpty;
+
+      contentWidgets.add(
+        Markdown(
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
-      data: content,
+          data: paragraph,
           padding: EdgeInsets.zero,
           styleSheet: MarkdownStyleSheet.fromTheme(
             Theme.of(context),
@@ -99,10 +120,12 @@ class MarkdownTextContent extends StatelessWidget {
                 case 'stickers':
                   double radius = 8;
                   final StickerProvider sticker = Get.find();
-              if (emojiMatch.length <= 1 && isOnlyEmoji) {
+
+                  // Adjust sticker size based on the sticker count in this paragraph
+                  if (stickerMatch.length <= 1 && isOnlySticker) {
                     width = 128;
                     height = 128;
-              } else if (emojiMatch.length <= 3 && isOnlyEmoji) {
+                  } else if (stickerMatch.length <= 3 && isOnlySticker) {
                     width = 32;
                     height = 32;
                   } else {
@@ -114,12 +137,15 @@ class MarkdownTextContent extends StatelessWidget {
                   return ClipRRect(
                     borderRadius: BorderRadius.all(Radius.circular(radius)),
                     child: Container(
+                      width: width,
+                      height: height,
                       color: Theme.of(context).colorScheme.surfaceContainer,
                       child: FutureBuilder(
                         future: sticker.getStickerByAlias(segments[1]),
                         builder: (context, snapshot) {
                           if (!snapshot.hasData) {
-                        return const Center(child: CircularProgressIndicator());
+                            return const Center(
+                                child: CircularProgressIndicator());
                           }
                           return AutoCacheImage(
                             snapshot.data!.imageUrl,
@@ -147,7 +173,6 @@ class MarkdownTextContent extends StatelessWidget {
                   ).paddingSymmetric(vertical: 4);
               }
             }
-
             return AutoCacheImage(
               url,
               width: width,
@@ -155,6 +180,19 @@ class MarkdownTextContent extends StatelessWidget {
               fit: fit,
             );
           },
+        ),
+      );
+
+      if (idx < paragraphs.length - 1) {
+        contentWidgets.add(const Gap(4));
+      }
+    }
+
+    // Return the list of widgets for the paragraphs
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: contentWidgets,
     );
   }
 

lib/widgets/navigation/app_navigation.dart

@@ -9,9 +9,9 @@ abstract class AppNavigation {
       page: 'dashboard',
     ),
     AppNavigationDestination(
-      icon: Icons.newspaper,
+      icon: Icons.explore,
-      label: 'feed'.tr,
+      label: 'explore'.tr,
-      page: 'feed',
+      page: 'explore',
     ),
     AppNavigationDestination(
       icon: Icons.workspaces,

lib/widgets/posts/post_tags.dart

@@ -27,7 +27,7 @@ class PostTagsList extends StatelessWidget {
                 ),
               ),
               onTap: () {
-                AppRouter.instance.pushNamed('feedSearch', queryParameters: {
+                AppRouter.instance.pushNamed('postSearch', queryParameters: {
                   'tag': x.alias,
                 });
               },