♻️ Refactored router

assets/translations/en-US.json

@@ -196,6 +196,10 @@
   "settingsFeatures": "Features",
   "settingsNotifyWithHaptic": "Haptic when Notified",
   "settingsNotifyWithHapticDescription": "Vibrate lightly when a new notification appears in the foreground.",
+  "settingsExpandPostLink": "Expand Post Link",
+  "settingsExpandPostLinkDescription": "Expand the post link in the post list.",
+  "settingsExpandChatLink": "Expand Chat Link",
+  "settingsExpandChatLinkDescription": "Expand the chat link in the chat list.",
   "settingsNetwork": "Network",
   "settingsNetworkServer": "HyperNet Server",
   "settingsNetworkServerDescription": "Set the HyperNet server address, choose ours or build your own.",

assets/translations/zh-CN.json

@@ -194,6 +194,10 @@
   "settingsFeatures": "功能",
   "settingsNotifyWithHaptic": "新通知时振动",
   "settingsNotifyWithHapticDescription": "在应用在前台时收到新通知出现时出发轻量的振动。",
+  "settingsExpandPostLink": "展开帖子链接",
+  "settingsExpandPostLinkDescription": "在帖子列表中展开显示帖子中的链接。",
+  "settingsExpandChatLink": "展开聊天链接",
+  "settingsExpandChatLinkDescription": "在聊天信息中展开显示内容中的链接。",
   "settingsNetwork": "网络",
   "settingsNetworkServer": "HyperNet 服务器",
   "settingsNetworkServerDescription": "设置 HyperNet 服务器地址，选择我们提供的，或者自己搭建。",

lib/main.dart

@@ -260,7 +260,7 @@ class _AppSplashScreenState extends State<_AppSplashScreen> {
     try {
       final cfg = context.read<ConfigProvider>();
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        cfg.calcDrawerSize(context);
+        cfg.calcDrawerSize(context, withMediaQuery: true);
       });
       final home = context.read<HomeWidgetProvider>();
       await home.initialize();

lib/providers/config.dart

@@ -15,6 +15,8 @@ const kAppBackgroundStoreKey = 'app_has_background';
 const kAppColorSchemeStoreKey = 'app_color_scheme';
 const kAppDrawerPreferCollapse = 'app_drawer_prefer_collapse';
 const kAppNotifyWithHaptic = 'app_notify_with_haptic';
+const kAppExpandPostLink = 'app_expand_post_link';
+const kAppExpandChatLink = 'app_expand_chat_link';
 
 const Map<String, FilterQuality> kImageQualityLevel = {
   'settingsImageQualityLowest': FilterQuality.none,
@@ -39,14 +41,22 @@ class ConfigProvider extends ChangeNotifier {
   bool drawerIsCollapsed = false;
   bool drawerIsExpanded = false;
 
-  void calcDrawerSize(BuildContext context) {
+  void calcDrawerSize(BuildContext context, {bool withMediaQuery = false}) {
+    bool newDrawerIsCollapsed = false;
+    bool newDrawerIsExpanded = false;
+    if (withMediaQuery) {
+      newDrawerIsCollapsed = MediaQuery.of(context).size.width < 450;
+      newDrawerIsExpanded = MediaQuery.of(context).size.width >= 451;
+    } else {
       final rpb = ResponsiveBreakpoints.of(context);
-    final newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
+      newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
-    final newDrawerIsExpanded = rpb.largerThan(TABLET)
+      newDrawerIsCollapsed = rpb.largerThan(TABLET)
           ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
               ? false
               : true
           : false;
+    }
+
     if (newDrawerIsExpanded != drawerIsExpanded || newDrawerIsCollapsed != drawerIsCollapsed) {
       drawerIsExpanded = newDrawerIsExpanded;
       drawerIsCollapsed = newDrawerIsCollapsed;

lib/router.dart

@@ -34,21 +34,30 @@ import 'package:surface/widgets/about.dart';
 import 'package:surface/widgets/navigation/app_background.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 
+Widget _fadeThroughTransition(
+    BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
+  return FadeThroughTransition(
+    animation: animation,
+    secondaryAnimation: secondaryAnimation,
+    fillColor: Colors.transparent,
+    child: child,
+  );
+}
+
 final _appRoutes = [
-  ShellRoute(
-    builder: (context, state, child) => child,
-    routes: [
   GoRoute(
     path: '/',
     name: 'home',
-        pageBuilder: (context, state) => NoTransitionPage(
+    pageBuilder: (context, state) => CustomTransitionPage(
+      transitionsBuilder: _fadeThroughTransition,
       child: const HomeScreen(),
     ),
   ),
   GoRoute(
     path: '/posts',
     name: 'explore',
-        pageBuilder: (context, state) => NoTransitionPage(
+    pageBuilder: (context, state) => CustomTransitionPage(
+      transitionsBuilder: _fadeThroughTransition,
       child: const ExploreScreen(),
     ),
     routes: [
@@ -96,30 +105,15 @@ final _appRoutes = [
     path: '/account',
     name: 'account',
     pageBuilder: (context, state) => CustomTransitionPage(
-          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+      transitionsBuilder: _fadeThroughTransition,
-            return FadeThroughTransition(
-              animation: animation,
-              secondaryAnimation: secondaryAnimation,
-              fillColor: Colors.transparent,
-              child: child,
-            );
-          },
       child: const AccountScreen(),
     ),
-        routes: [],
   ),
   GoRoute(
     path: '/chat',
     name: 'chat',
     pageBuilder: (context, state) => CustomTransitionPage(
-          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+      transitionsBuilder: _fadeThroughTransition,
-            return FadeThroughTransition(
-              animation: animation,
-              secondaryAnimation: secondaryAnimation,
-              fillColor: Colors.transparent,
-              child: child,
-            );
-          },
       child: const ChatScreen(),
     ),
     routes: [
@@ -165,46 +159,34 @@ final _appRoutes = [
               animation: animation,
               secondaryAnimation: secondaryAnimation,
               fillColor: Colors.transparent,
-                  child: AppBackground(
               child: child,
-                  ),
             );
           },
         ),
       ),
-          GoRoute(
-            path: '/:alias',
-            name: 'realmDetail',
-            builder: (context, state) => AppBackground(
-              child: RealmDetailScreen(alias: state.pathParameters['alias']!),
-            ),
-          ),
     ],
   ),
   GoRoute(
     path: '/realm',
     name: 'realm',
-        pageBuilder: (context, state) => NoTransitionPage(
+    pageBuilder: (context, state) => CustomTransitionPage(
+      transitionsBuilder: _fadeThroughTransition,
       child: const RealmScreen(),
     ),
     routes: [
+      GoRoute(
+        path: '/:alias',
+        name: 'realmDetail',
+        builder: (context, state) => RealmDetailScreen(alias: state.pathParameters['alias']!),
+      ),
       GoRoute(
         path: '/manage',
         name: 'realmManage',
         pageBuilder: (context, state) => CustomTransitionPage(
+          transitionsBuilder: _fadeThroughTransition,
           child: RealmManageScreen(
             editingRealmAlias: state.uri.queryParameters['editing'],
           ),
-              transitionsBuilder: (context, animation, secondaryAnimation, child) {
-                return FadeThroughTransition(
-                  animation: animation,
-                  secondaryAnimation: secondaryAnimation,
-                  fillColor: Colors.transparent,
-                  child: AppBackground(
-                    child: child,
-                  ),
-                );
-              },
         ),
       ),
     ],
@@ -212,7 +194,8 @@ final _appRoutes = [
   GoRoute(
     path: '/album',
     name: 'album',
-        pageBuilder: (context, state) => NoTransitionPage(
+    pageBuilder: (context, state) => CustomTransitionPage(
+      transitionsBuilder: _fadeThroughTransition,
       child: const AlbumScreen(),
     ),
   ),
@@ -230,11 +213,6 @@ final _appRoutes = [
       child: const NotificationScreen(),
     ),
   ),
-    ],
-  ),
-  ShellRoute(
-    builder: (context, state, child) => child,
-    routes: [
   GoRoute(
     path: '/auth/login',
     name: 'authLogin',
@@ -272,8 +250,6 @@ final _appRoutes = [
       name: state.pathParameters['name']!,
     ),
   ),
-    ],
-  ),
   GoRoute(
     path: '/account/:name',
     name: 'accountProfilePage',
@@ -281,26 +257,16 @@ final _appRoutes = [
       child: UserScreen(name: state.pathParameters['name']!),
     ),
   ),
-  ShellRoute(
-    builder: (context, state, child) => child,
-    routes: [
   GoRoute(
     path: '/settings',
     name: 'settings',
     builder: (context, state) => SettingsScreen(),
   ),
-    ],
-  ),
-  ShellRoute(
-    builder: (context, state, child) => child,
-    routes: [
   GoRoute(
     path: '/about',
     name: 'about',
     builder: (context, state) => AboutScreen(),
   ),
-    ],
-  ),
 ];
 
 final appRouter = GoRouter(

lib/screens/account/profile_page.dart

@@ -19,7 +19,6 @@ import 'package:surface/types/check_in.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/universal_image.dart';
 
 const Map<String, (String, IconData, Color)> kBadgesMeta = {
@@ -596,7 +595,7 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
                 subtitle: Text('@${ele.name}'),
                 trailing: const Icon(Symbols.chevron_right),
                 onTap: () {
-                  GoRouter.of(context).pushNamed(
+                  GoRouter.of(context).goNamed(
                     'postPublisher',
                     pathParameters: {'name': ele.name},
                   );

lib/screens/chat/call_room.dart

@@ -14,6 +14,7 @@ import 'package:surface/widgets/navigation/app_scaffold.dart';
 class CallRoomScreen extends StatefulWidget {
   final String scope;
   final String alias;
+
   const CallRoomScreen({super.key, required this.scope, required this.alias});
 
   @override
@@ -36,8 +37,7 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
     return Stack(
       children: [
         Container(
-          color:
+          color: Theme.of(context).colorScheme.surfaceContainer.withOpacity(0.75),
-              Theme.of(context).colorScheme.surfaceContainer.withOpacity(0.75),
           child: call.focusTrack != null
               ? InteractiveParticipantWidget(
                   isFixedAvatar: false,
@@ -72,8 +72,7 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
                       color: Theme.of(context).cardColor,
                       participant: track,
                       onTap: () {
-                        if (track.participant.sid !=
+                        if (track.participant.sid != call.focusTrack?.participant.sid) {
-                            call.focusTrack?.participant.sid) {
                           call.setFocusTrack(track);
                         }
                       },
@@ -115,14 +114,10 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
             child: ClipRRect(
               borderRadius: const BorderRadius.all(Radius.circular(8)),
               child: InteractiveParticipantWidget(
-                color: Theme.of(context)
+                color: Theme.of(context).colorScheme.surfaceContainerHigh.withOpacity(0.75),
-                    .colorScheme
-                    .surfaceContainerHigh
-                    .withOpacity(0.75),
                 participant: track,
                 onTap: () {
-                  if (track.participant.sid !=
+                  if (track.participant.sid != call.focusTrack?.participant.sid) {
-                      call.focusTrack?.participant.sid) {
                     call.setFocusTrack(track);
                   }
                 },
@@ -160,24 +155,17 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
                 text: TextSpan(children: [
                   TextSpan(
                     text: 'call'.tr(),
-                    style: Theme.of(context)
+                    style: Theme.of(context).textTheme.titleLarge!.copyWith(color: Colors.white),
-                        .textTheme
-                        .titleLarge!
-                        .copyWith(color: Colors.white),
                   ),
                   const TextSpan(text: '\n'),
                   TextSpan(
                     text: call.lastDuration.toString(),
-                    style: Theme.of(context)
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.white),
-                        .textTheme
-                        .bodySmall!
-                        .copyWith(color: Colors.white),
                   ),
                 ]),
               ),
             ),
-            body: SafeArea(
+            body: GestureDetector(
-              child: GestureDetector(
               behavior: HitTestBehavior.translucent,
               child: Column(
                 children: [
@@ -191,8 +179,7 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
                         Builder(builder: (context) {
                           final call = context.read<ChatCallProvider>();
                           final connectionQuality =
-                                call.room.localParticipant?.connectionQuality ??
+                              call.room.localParticipant?.connectionQuality ?? livekit.ConnectionQuality.unknown;
-                                    livekit.ConnectionQuality.unknown;
                           return Expanded(
                             child: Column(
                               mainAxisSize: MainAxisSize.min,
@@ -214,35 +201,24 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
                                   children: [
                                     Text(
                                       {
-                                          livekit.ConnectionState.disconnected:
+                                        livekit.ConnectionState.disconnected: 'callStatusDisconnected'.tr(),
-                                              'callStatusDisconnected'.tr(),
+                                        livekit.ConnectionState.connected: 'callStatusConnected'.tr(),
-                                          livekit.ConnectionState.connected:
+                                        livekit.ConnectionState.connecting: 'callStatusConnecting'.tr(),
-                                              'callStatusConnected'.tr(),
+                                        livekit.ConnectionState.reconnecting: 'callStatusReconnecting'.tr(),
-                                          livekit.ConnectionState.connecting:
-                                              'callStatusConnecting'.tr(),
-                                          livekit.ConnectionState.reconnecting:
-                                              'callStatusReconnecting'.tr(),
                                       }[call.room.connectionState]!,
                                     ),
                                     const Gap(6),
-                                      if (connectionQuality !=
+                                    if (connectionQuality != livekit.ConnectionQuality.unknown)
-                                          livekit.ConnectionQuality.unknown)
                                       Icon(
                                         {
-                                            livekit.ConnectionQuality.excellent:
+                                          livekit.ConnectionQuality.excellent: Icons.signal_cellular_alt,
-                                                Icons.signal_cellular_alt,
+                                          livekit.ConnectionQuality.good: Icons.signal_cellular_alt_2_bar,
-                                            livekit.ConnectionQuality.good:
+                                          livekit.ConnectionQuality.poor: Icons.signal_cellular_alt_1_bar,
-                                                Icons.signal_cellular_alt_2_bar,
-                                            livekit.ConnectionQuality.poor:
-                                                Icons.signal_cellular_alt_1_bar,
                                         }[connectionQuality],
                                         color: {
-                                            livekit.ConnectionQuality.excellent:
+                                          livekit.ConnectionQuality.excellent: Colors.green,
-                                                Colors.green,
+                                          livekit.ConnectionQuality.good: Colors.orange,
-                                            livekit.ConnectionQuality.good:
+                                          livekit.ConnectionQuality.poor: Colors.red,
-                                                Colors.orange,
-                                            livekit.ConnectionQuality.poor:
-                                                Colors.red,
                                         }[connectionQuality],
                                         size: 16,
                                       )
@@ -264,9 +240,7 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
                         Row(
                           children: [
                             IconButton(
-                                icon: _layoutMode == 0
+                              icon: _layoutMode == 0 ? const Icon(Icons.view_list) : const Icon(Icons.grid_view),
-                                    ? const Icon(Icons.view_list)
-                                    : const Icon(Icons.grid_view),
                               onPressed: () {
                                 _switchLayout();
                               },
@@ -278,8 +252,7 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
                   ),
                   Expanded(
                     child: Material(
-                        color:
+                      color: Theme.of(context).colorScheme.surfaceContainerLow,
-                            Theme.of(context).colorScheme.surfaceContainerLow,
                       child: Builder(
                         builder: (context) {
                           switch (_layoutMode) {
@@ -304,7 +277,6 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
               ),
               onTap: () {},
             ),
-            ),
           );
         });
   }

lib/screens/settings.dart

@@ -276,6 +276,30 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     });
                   },
                 ),
+                CheckboxListTile(
+                  secondary: const Icon(Symbols.link),
+                  title: Text('settingsExpandPostLink').tr(),
+                  subtitle: Text('settingsExpandPostLinkDescription').tr(),
+                  contentPadding: const EdgeInsets.only(left: 24, right: 17),
+                  value: _prefs.getBool(kAppExpandPostLink) ?? true,
+                  onChanged: (value) {
+                    setState(() {
+                      _prefs.setBool(kAppExpandPostLink, value ?? false);
+                    });
+                  },
+                ),
+                CheckboxListTile(
+                  secondary: const Icon(Symbols.chat),
+                  title: Text('settingsExpandChatLink').tr(),
+                  subtitle: Text('settingsExpandChatLinkDescription').tr(),
+                  contentPadding: const EdgeInsets.only(left: 24, right: 17),
+                  value: _prefs.getBool(kAppExpandChatLink) ?? true,
+                  onChanged: (value) {
+                    setState(() {
+                      _prefs.setBool(kAppExpandChatLink, value ?? false);
+                    });
+                  },
+                ),
               ],
             ),
             Column(

lib/widgets/chat/chat_message.dart

@@ -8,6 +8,7 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:popover/popover.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/config.dart';
 import 'package:surface/providers/user_directory.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/chat.dart';
@@ -53,6 +54,8 @@ class ChatMessage extends StatelessWidget {
 
     final dateFormatter = DateFormat('MM/dd HH:mm');
 
+    final cfg = context.read<ConfigProvider>();
+
     return SwipeTo(
       key: Key('chat-message-${data.id}'),
       iconOnLeftSwipe: Symbols.reply,
@@ -192,7 +195,10 @@ class ChatMessage extends StatelessWidget {
                 ],
               ).opacity(isPending ? 0.5 : 1),
             ),
-            if (data.body['text'] != null && data.type == 'messages.new' && (data.body['text']?.isNotEmpty ?? false))
+            if (data.body['text'] != null &&
+                data.type == 'messages.new' &&
+                (data.body['text']?.isNotEmpty ?? false) &&
+                (cfg.prefs.getBool(kAppExpandChatLink) ?? true))
               LinkPreviewWidget(text: data.body['text']!),
             if (data.preload?.attachments?.isNotEmpty ?? false)
               AttachmentList(

lib/widgets/link_preview.dart

@@ -7,12 +7,11 @@ import 'package:marquee/marquee.dart';
 import 'package:provider/provider.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/link_preview.dart';
 import 'package:surface/types/link.dart';
 import 'package:surface/widgets/universal_image.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
-import '../providers/link_preview.dart';
-
 class LinkPreviewWidget extends StatefulWidget {
   final String text;
 
@@ -81,8 +80,9 @@ class _LinkPreviewEntry extends StatelessWidget {
                   child: AspectRatio(
                     aspectRatio: 16 / 9,
                     child: ClipRRect(
+                      borderRadius: const BorderRadius.all(Radius.circular(8)),
                       child: AutoResizeUniversalImage(
-                        meta.image!,
+                        meta.image!.startsWith('//') ? 'https:${meta.image}' : meta.image!,
                         fit: BoxFit.contain,
                       ),
                     ),

lib/widgets/navigation/app_scaffold.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:bitsdojo_window/bitsdojo_window.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
@@ -12,7 +11,6 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/config.dart';
 import 'package:surface/providers/navigation.dart';
 import 'package:surface/widgets/connection_indicator.dart';
-import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_background.dart';
 import 'package:surface/widgets/navigation/app_bottom_navigation.dart';
 import 'package:surface/widgets/navigation/app_drawer_navigation.dart';

lib/widgets/post/post_item.dart

@@ -203,6 +203,8 @@ class PostItem extends StatelessWidget {
         ?.where((ele) => ele?.mediaType != SnMediaType.image || data.type != 'article')
         .toList();
 
+    final cfg = context.read<ConfigProvider>();
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.center,
       children: [
@@ -261,7 +263,7 @@ class PostItem extends StatelessWidget {
             fit: showFullPost ? BoxFit.cover : BoxFit.contain,
             padding: const EdgeInsets.symmetric(horizontal: 12),
           ),
-        if (data.body['content'] != null)
+        if (data.body['content'] != null && (cfg.prefs.getBool(kAppExpandPostLink) ?? true))
           LinkPreviewWidget(
             text: data.body['content'],
           ).padding(horizontal: 4),