🚀 Launch 2.2.2+58

android/app/src/main/AndroidManifest.xml

@@ -19,6 +19,10 @@
         android:icon="@mipmap/ic_launcher"
         android:enableOnBackInvokedCallback="true"
         android:requestLegacyExternalStorage="true">
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

api/Reader/List News Sources.bru

@@ -0,0 +1,11 @@
+meta {
+  name: List News Sources
+  type: http
+  seq: 3
+}
+
+get {
+  url: {{endpoint}}/cgi/re/well-known/sources
+  body: none
+  auth: none
+}

api/Reader/List News.bru

@@ -0,0 +1,17 @@
+meta {
+  name: List News
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{endpoint}}/cgi/re/news?take=10&offset=0&source=shadiao
+  body: none
+  auth: none
+}
+
+params:query {
+  take: 10
+  offset: 0
+  source: shadiao
+}

api/Reader/Trigger Scan News.bru

@@ -0,0 +1,18 @@
+meta {
+  name: Trigger Scan News
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{endpoint}}/cgi/re/admin/scan
+  body: json
+  auth: inherit
+}
+
+body:json {
+  {
+    "sources": ["taiwan-ltn"],
+    "eager": true
+  }
+}

assets/translations/en-US.json

@@ -17,6 +17,8 @@
   "screenAccountProfileEdit": "Edit Profile",
   "screenAbuseReport": "Abuse Reports",
   "screenSettings": "Settings",
+  "screenAccountSettings": "Account Settings",
+  "screenNews": "News",
   "screenAlbum": "Album",
   "screenChat": "Chat",
   "screenChatManage": "Edit Channel",
@@ -27,6 +29,7 @@
   "screenNotification": "Notification",
   "screenPostSearch": "Search Posts",
   "screenFriend": "Friends",
+  "screenFactorSettings": "Auth Factors",
   "dialogOkay": "Okay",
   "dialogCancel": "Cancel",
   "dialogConfirm": "Confirm",
@@ -103,8 +106,18 @@
   },
   "loginEnterPassword": "Enter the code",
   "loginSuccess": "Logged in as {}",
+  "authFactorDelete": "Delete Auth Factor",
+  "authFactorDeleteDescription": "Are you sure you want delete auth factor {}?",
   "authFactorPassword": "Password",
+  "authFactorPasswordDescription": "The password you set when you registered.",
   "authFactorEmail": "Email verification code",
+  "authFactorEmailDescription": "An one-time code sent to the email address you set when you registered.",
+  "authFactorTOTP": "Time-based OTP",
+  "authFactorTOTPDescription": "A one-time code generated by a TOTP authenticator such as Google Authenticator or Authy.",
+  "authFactorInAppNotify": "In-app notification",
+  "authFactorInAppNotifyDescription": "A one-time code sent via in-app notification.",
+  "authFactorAdd": "Add a factor",
+  "authFactorAddSubtitle": "Provide another way to login your account.",
   "accountIntroTitle": "Hello there!",
   "accountIntroSubtitle": "Pick an option below to get started.",
   "accountLogout": "Logout",
@@ -113,8 +126,12 @@
   "accountLogoutConfirm": "You will need to re-enter your account password, even if you have already done so. This is required to login again.",
   "accountPublishers": "Your publishers",
   "accountPublishersSubtitle": "Manage your publish identities.",
+  "accountSettings": "Account Settings",
+  "accountSettingsSubtitle": "Manage your account and make it yours.",
   "accountProfileEdit": "Edit your profile",
   "accountProfileEditSubtitle": "Make your Solarpass account more looks like you.",
+  "factorSettings": "Auth Factors",
+  "factorSettingsSubtitle": "Manage your authentication factors.",
   "accountProfileEditApplied": "Profile modification applied.",
   "publishersNew": "New Publisher",
   "publisherNewSubtitle": "Create a new publisher identity.",
@@ -196,6 +213,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.",
@@ -554,5 +575,14 @@
   "postCategoryKnowledge": "Knowledge",
   "postCategoryLiterature": "Literature",
   "postCategoryFunny": "Funny",
-  "postCategoryUncategorized": "Uncategorized"
+  "postCategoryUncategorized": "Uncategorized",
+  "newsAllSources": "All News",
+  "newsReadingProviderSwap": "Swap",
+  "newsReadingFromReader": "You're reading from HyperNet.Reader",
+  "newsReadingFromOriginal": "You're reading the original article",
+  "newsDisclaimer": "This article is fetched from the Internet, we do not guarantee its authenticity, please judge for yourself. All content in this article belongs to the original author.",
+  "newsToday": "Today's News",
+  "totpPostSetup": "One More Thing",
+  "totpPostSetupDescription": "Scan the QR Code below with Google Authenticator, Microsoft Authenticator, 1Password, Authy, Bitwarden or any of kind of authenticator app which supports TOTP.",
+  "totpNeverShare": "Never share this QR Code"
 }

assets/translations/zh-CN.json

@@ -15,6 +15,8 @@
   "screenAccountProfileEdit": "编辑资料",
   "screenAbuseReport": "滥用检举",
   "screenSettings": "设置",
+  "screenAccountSettings": "账号设置",
+  "screenNews": "新闻",
   "screenAlbum": "相册",
   "screenChat": "聊天",
   "screenChatManage": "编辑聊天频道",
@@ -87,8 +89,18 @@
   },
   "loginEnterPassword": "验证代码",
   "loginSuccess": "登录为 {}",
+  "authFactorDelete": "删除验证因子",
+  "authFactorDeleteDescription": "你确定要删除 {} 验证因子吗？",
   "authFactorPassword": "密码",
+  "authFactorPasswordDescription": "注册时选择设置的密码。",
   "authFactorEmail": "电邮一次性验证码",
+  "authFactorEmailDescription": "由我们生成并发送到绑定的的电子邮箱的一次性验证码。",
+  "authFactorTOTP": "时序验证码",
+  "authFactorTOTPDescription": "使用 Google Authenticator 或 Authy 等验证器生成的一次性验证码。",
+  "authFactorInAppNotify": "应用内通知验证码",
+  "authFactorInAppNotifyDescription": "通过站内通知推送的一次性验证码。",
+  "authFactorAdd": "添加新验证因子",
+  "authFactorAddSubtitle": "给你的帐户登陆时提供另一个方案。",
   "accountIntroTitle": "喜欢您来！",
   "accountIntroSubtitle": "登陆以探索更广大的世界。",
   "accountLogout": "退出登录",
@@ -97,8 +109,12 @@
   "accountLogoutConfirm": "您需要重新输入账号密码，甚至可能需要多步验证来再次登陆。",
   "accountPublishers": "你的发布者",
   "accountPublishersSubtitle": "管理你的公共形象。",
+  "accountSettings": "帐号设置",
+  "accountSettingsSubtitle": "管理你的帐号并让它更好的服务你。",
   "accountProfileEdit": "编辑资料",
   "accountProfileEditSubtitle": "使你的 Solarpass 账户更像你。",
+  "factorSettings": "验证因子",
+  "factorSettingsSubtitle": "管理你的登陆验证方式。",
   "accountProfileEditApplied": "个人资料修改已被应用。",
   "publishersNew": "新发布者",
   "publisherNewSubtitle": "创建一个新的公共身份。",
@@ -194,6 +210,10 @@
   "settingsFeatures": "功能",
   "settingsNotifyWithHaptic": "新通知时振动",
   "settingsNotifyWithHapticDescription": "在应用在前台时收到新通知出现时出发轻量的振动。",
+  "settingsExpandPostLink": "展开帖子链接",
+  "settingsExpandPostLinkDescription": "在帖子列表中展开显示帖子中的链接。",
+  "settingsExpandChatLink": "展开聊天链接",
+  "settingsExpandChatLinkDescription": "在聊天信息中展开显示内容中的链接。",
   "settingsNetwork": "网络",
   "settingsNetworkServer": "HyperNet 服务器",
   "settingsNetworkServerDescription": "设置 HyperNet 服务器地址，选择我们提供的，或者自己搭建。",
@@ -552,5 +572,14 @@
   "postCategoryKnowledge": "知识",
   "postCategoryLiterature": "文学",
   "postCategoryFunny": "搞笑",
-  "postCategoryUncategorized": "未分类"
+  "postCategoryUncategorized": "未分类",
+  "newsAllSources": "所有新闻",
+  "newsReadingProviderSwap": "切换",
+  "newsReadingFromReader": "你正在从 HyperNet.Reader 阅读文章",
+  "newsReadingFromOriginal": "你正在阅读原始文章",
+  "newsDisclaimer": "本文由 HyperNet.Reader 从互联网上获取，我们不担保其内容的真实性，请自行判断。本文章的所有内容版权归原作者所有。",
+  "newsToday": "快讯",
+  "totpPostSetup": "还有一件事",
+  "totpPostSetupDescription": "使用 Google Authenticator, Microsoft Authenticator, 1Password, Authy, Bitwarden 或其他支持 TOTP 的验证器扫描本 QR Code 来添加。",
+  "totpNeverShare": "永远不要分享这个 QR Code"
 }

assets/translations/zh-HK.json

@@ -15,6 +15,7 @@
   "screenAccountProfileEdit": "編輯資料",
   "screenAbuseReport": "濫用檢舉",
   "screenSettings": "設置",
+  "screenNews": "新聞",
   "screenAlbum": "相冊",
   "screenChat": "聊天",
   "screenChatManage": "編輯聊天頻道",
@@ -194,6 +195,10 @@
   "settingsFeatures": "功能",
   "settingsNotifyWithHaptic": "新通知時振動",
   "settingsNotifyWithHapticDescription": "在應用在前台時收到新通知出現時出發輕量的振動。",
+  "settingsExpandPostLink": "展開帖子鏈接",
+  "settingsExpandPostLinkDescription": "在帖子列表中展開顯示帖子中的鏈接。",
+  "settingsExpandChatLink": "展開聊天鏈接",
+  "settingsExpandChatLinkDescription": "在聊天信息中展開顯示內容中的鏈接。",
   "settingsNetwork": "網絡",
   "settingsNetworkServer": "HyperNet 服務器",
   "settingsNetworkServerDescription": "設置 HyperNet 服務器地址，選擇我們提供的，或者自己搭建。",
@@ -552,5 +557,11 @@
   "postCategoryKnowledge": "知識",
   "postCategoryLiterature": "文學",
   "postCategoryFunny": "搞笑",
-  "postCategoryUncategorized": "未分類"
+  "postCategoryUncategorized": "未分類",
+  "newsAllSources": "所有新聞",
+  "newsReadingProviderSwap": "切換",
+  "newsReadingFromReader": "你正在從 HyperNet.Reader 閲讀文章",
+  "newsReadingFromOriginal": "你正在閲讀原始文章",
+  "newsDisclaimer": "本文由 HyperNet.Reader 從互聯網上獲取，我們不擔保其內容的真實性，請自行判斷。本文章的所有內容版權歸原作者所有。",
+  "newsToday": "快訊"
 }

assets/translations/zh-TW.json

@@ -15,6 +15,7 @@
   "screenAccountProfileEdit": "編輯資料",
   "screenAbuseReport": "濫用檢舉",
   "screenSettings": "設置",
+  "screenNews": "新聞",
   "screenAlbum": "相冊",
   "screenChat": "聊天",
   "screenChatManage": "編輯聊天頻道",
@@ -194,6 +195,10 @@
   "settingsFeatures": "功能",
   "settingsNotifyWithHaptic": "新通知時振動",
   "settingsNotifyWithHapticDescription": "在應用在前臺時收到新通知出現時出發輕量的振動。",
+  "settingsExpandPostLink": "展開帖子鏈接",
+  "settingsExpandPostLinkDescription": "在帖子列表中展開顯示帖子中的鏈接。",
+  "settingsExpandChatLink": "展開聊天鏈接",
+  "settingsExpandChatLinkDescription": "在聊天信息中展開顯示內容中的鏈接。",
   "settingsNetwork": "網絡",
   "settingsNetworkServer": "HyperNet 服務器",
   "settingsNetworkServerDescription": "設置 HyperNet 服務器地址，選擇我們提供的，或者自己搭建。",
@@ -552,5 +557,11 @@
   "postCategoryKnowledge": "知識",
   "postCategoryLiterature": "文學",
   "postCategoryFunny": "搞笑",
-  "postCategoryUncategorized": "未分類"
+  "postCategoryUncategorized": "未分類",
+  "newsAllSources": "所有新聞",
+  "newsReadingProviderSwap": "切換",
+  "newsReadingFromReader": "你正在從 HyperNet.Reader 閱讀文章",
+  "newsReadingFromOriginal": "你正在閱讀原始文章",
+  "newsDisclaimer": "本文由 HyperNet.Reader 從互聯網上獲取，我們不擔保其內容的真實性，請自行判斷。本文章的所有內容版權歸原作者所有。",
+  "newsToday": "快訊"
 }

ios/Podfile.lock

@@ -53,14 +53,14 @@ PODS:
   - Firebase/Messaging (11.6.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 11.6.0)
-  - firebase_analytics (11.4.0):
+  - firebase_analytics (11.4.1):
     - Firebase/Analytics (= 11.6.0)
     - firebase_core
     - Flutter
-  - firebase_core (3.10.0):
+  - firebase_core (3.10.1):
     - Firebase/CoreOnly (= 11.6.0)
     - Flutter
-  - firebase_messaging (15.2.0):
+  - firebase_messaging (15.2.1):
     - Firebase/Messaging (= 11.6.0)
     - firebase_core
     - Flutter
@@ -105,6 +105,13 @@ PODS:
   - Flutter (1.0.0)
   - flutter_app_update (0.0.1):
     - Flutter
+  - flutter_inappwebview_ios (0.0.1):
+    - Flutter
+    - flutter_inappwebview_ios/Core (= 0.0.1)
+    - OrderedSet (~> 6.0.3)
+  - flutter_inappwebview_ios/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 6.0.3)
   - flutter_native_splash (2.4.3):
     - Flutter
   - flutter_udid (0.0.1):
@@ -188,6 +195,7 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
+  - OrderedSet (6.0.3)
   - package_info_plus (0.4.5):
     - Flutter
   - pasteboard (0.0.1):
@@ -239,6 +247,7 @@ DEPENDENCIES:
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
   - flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
+  - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`)
   - flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
@@ -282,6 +291,7 @@ SPEC REPOS:
     - GoogleUtilities
     - Kingfisher
     - nanopb
+    - OrderedSet
     - PromisesObjC
     - SAMKeychain
     - SDWebImage
@@ -309,6 +319,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_app_update:
     :path: ".symlinks/plugins/flutter_app_update/ios"
+  flutter_inappwebview_ios:
+    :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_udid:
@@ -370,9 +382,9 @@ SPEC CHECKSUMS:
   file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
   file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
-  firebase_analytics: 07bd7cfbac54bfcdccf2bb2530f9a65486f7ef3f
-  firebase_core: feb37e79f775c2bd08dd35e02d83678291317e10
-  firebase_messaging: e2f0ba891b1509668c07f5099761518a5af8fe3c
+  firebase_analytics: 13ea4ad8a42c5060bad7e6694304dabb8b02fe7e
+  firebase_core: e2aa06dbd854d961f8ce46c2e20933bee1bf2d2b
+  firebase_messaging: 96cf6d67121b3f39746b2a4f29a26c0eee4af70e
   FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7
   FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
@@ -380,6 +392,7 @@ SPEC CHECKSUMS:
   FirebaseMessaging: e1aca1fcc23e8b9eddb0e33f375ff90944623021
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_app_update: 65f61da626cb111d1b24674abc4b01728d7723bc
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
   flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
   flutter_udid: b2417673f287ee62817a1de3d1643f47b9f508ab
   flutter_webrtc: 90260f83024b1b96d239a575ea4e3708e79344d1
@@ -396,6 +409,7 @@ SPEC CHECKSUMS:
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46

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) {
-    final rpb = ResponsiveBreakpoints.of(context);
-    final newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
-    final newDrawerIsExpanded = rpb.largerThan(TABLET)
-        ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
-            ? false
-            : true
-        : false;
+  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);
+      newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
+      newDrawerIsExpanded = rpb.largerThan(TABLET)
+          ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
+              ? false
+              : true
+          : false;
+    }
+
     if (newDrawerIsExpanded != drawerIsExpanded || newDrawerIsCollapsed != drawerIsCollapsed) {
       drawerIsExpanded = newDrawerIsExpanded;
       drawerIsCollapsed = newDrawerIsCollapsed;

lib/providers/navigation.dart

@@ -58,6 +58,11 @@ class NavigationProvider extends ChangeNotifier {
       screen: 'realm',
       label: 'screenRealm',
     ),
+    AppNavDestination(
+      icon: Icon(Symbols.newspaper, weight: 400, opticalSize: 20),
+      screen: 'news',
+      label: 'screenNews',
+    ),
     AppNavDestination(
       icon: Icon(Symbols.photo_library, weight: 400, opticalSize: 20),
       screen: 'album',
@@ -83,8 +88,7 @@ class NavigationProvider extends ChangeNotifier {
 
   List<AppNavDestination> destinations = [];
 
-  int get pinnedDestinationCount =>
-      destinations.where((ele) => ele.isPinned).length;
+  int get pinnedDestinationCount => destinations.where((ele) => ele.isPinned).length;
 
   NavigationProvider() {
     buildDestinations(kDefaultPinnedDestination);
@@ -113,17 +117,13 @@ class NavigationProvider extends ChangeNotifier {
   }
 
   bool isIndexInRange(int min, int max) {
-    return _currentIndex != null &&
-        _currentIndex! >= min &&
-        _currentIndex! < max;
+    return _currentIndex != null && _currentIndex! >= min && _currentIndex! < max;
   }
 
   void autoDetectIndex(GoRouter? state) {
     if (state == null) return;
     final idx = destinations.indexWhere(
-      (ele) =>
-          ele.screen ==
-          state.routerDelegate.currentConfiguration.last.route.name,
+      (ele) => ele.screen == state.routerDelegate.currentConfiguration.last.route.name,
     );
     _currentIndex = idx == -1 ? null : idx;
     notifyListeners();

lib/router.dart

@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:surface/screens/abuse_report.dart';
 import 'package:surface/screens/account.dart';
+import 'package:surface/screens/account/account_settings.dart';
+import 'package:surface/screens/account/factor_settings.dart';
 import 'package:surface/screens/account/profile_page.dart';
 import 'package:surface/screens/account/profile_edit.dart';
 import 'package:surface/screens/account/publishers/publisher_edit.dart';
@@ -19,6 +21,8 @@ import 'package:surface/screens/chat/room.dart';
 import 'package:surface/screens/explore.dart';
 import 'package:surface/screens/friend.dart';
 import 'package:surface/screens/home.dart';
+import 'package:surface/screens/news/news_detail.dart';
+import 'package:surface/screens/news/news_list.dart';
 import 'package:surface/screens/notification.dart';
 import 'package:surface/screens/post/post_detail.dart';
 import 'package:surface/screens/post/post_editor.dart';
@@ -31,275 +35,218 @@ import 'package:surface/screens/settings.dart';
 import 'package:surface/screens/sharing.dart';
 import 'package:surface/types/post.dart';
 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,
+  GoRoute(
+    path: '/',
+    name: 'home',
+    builder: (context, state) => const HomeScreen(),
+  ),
+  GoRoute(
+    path: '/posts',
+    name: 'explore',
+    builder: (context, state) => const ExploreScreen(),
     routes: [
       GoRoute(
-        path: '/',
-        name: 'home',
-        pageBuilder: (context, state) => NoTransitionPage(
-          child: const HomeScreen(),
+        path: '/write/:mode',
+        name: 'postEditor',
+        builder: (context, state) => PostEditorScreen(
+          mode: state.pathParameters['mode']!,
+          postEditId: int.tryParse(
+            state.uri.queryParameters['editing'] ?? '',
+          ),
+          postReplyId: int.tryParse(
+            state.uri.queryParameters['replying'] ?? '',
+          ),
+          postRepostId: int.tryParse(
+            state.uri.queryParameters['reposting'] ?? '',
+          ),
+          extraProps: state.extra as PostEditorExtraProps?,
         ),
       ),
       GoRoute(
-        path: '/posts',
-        name: 'explore',
-        pageBuilder: (context, state) => NoTransitionPage(
-          child: const ExploreScreen(),
-        ),
-        routes: [
-          GoRoute(
-            path: '/write/:mode',
-            name: 'postEditor',
-            builder: (context, state) => PostEditorScreen(
-              mode: state.pathParameters['mode']!,
-              postEditId: int.tryParse(
-                state.uri.queryParameters['editing'] ?? '',
-              ),
-              postReplyId: int.tryParse(
-                state.uri.queryParameters['replying'] ?? '',
-              ),
-              postRepostId: int.tryParse(
-                state.uri.queryParameters['reposting'] ?? '',
-              ),
-              extraProps: state.extra as PostEditorExtraProps?,
-            ),
-          ),
-          GoRoute(
-            path: '/search',
-            name: 'postSearch',
-            builder: (context, state) => PostSearchScreen(
-              initialTags: state.uri.queryParameters['tags']?.split(','),
-              initialCategories: state.uri.queryParameters['categories']?.split(','),
-            ),
-          ),
-          GoRoute(
-            path: '/publishers/:name',
-            name: 'postPublisher',
-            builder: (context, state) => PostPublisherScreen(name: state.pathParameters['name']!),
-          ),
-          GoRoute(
-            path: '/:slug',
-            name: 'postDetail',
-            builder: (context, state) => PostDetailScreen(
-              slug: state.pathParameters['slug']!,
-              preload: state.extra as SnPost?,
-            ),
-          ),
-        ],
-      ),
-      GoRoute(
-        path: '/account',
-        name: 'account',
-        pageBuilder: (context, state) => CustomTransitionPage(
-          transitionsBuilder: (context, animation, secondaryAnimation, child) {
-            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) {
-            return FadeThroughTransition(
-              animation: animation,
-              secondaryAnimation: secondaryAnimation,
-              fillColor: Colors.transparent,
-              child: child,
-            );
-          },
-          child: const ChatScreen(),
-        ),
-        routes: [
-          GoRoute(
-            path: '/:scope/:alias',
-            name: 'chatRoom',
-            builder: (context, state) => AppBackground(
-              child: ChatRoomScreen(
-                scope: state.pathParameters['scope']!,
-                alias: state.pathParameters['alias']!,
-              ),
-            ),
-          ),
-          GoRoute(
-            path: '/:scope/:alias/call',
-            name: 'chatCallRoom',
-            builder: (context, state) => AppBackground(
-              child: CallRoomScreen(
-                scope: state.pathParameters['scope']!,
-                alias: state.pathParameters['alias']!,
-              ),
-            ),
-          ),
-          GoRoute(
-            path: '/:scope/:alias/detail',
-            name: 'channelDetail',
-            builder: (context, state) => AppBackground(
-              child: ChannelDetailScreen(
-                scope: state.pathParameters['scope']!,
-                alias: state.pathParameters['alias']!,
-              ),
-            ),
-          ),
-          GoRoute(
-            path: '/manage',
-            name: 'chatManage',
-            pageBuilder: (context, state) => CustomTransitionPage(
-              child: ChatManageScreen(
-                editingChannelAlias: state.uri.queryParameters['editing'],
-              ),
-              transitionsBuilder: (context, animation, secondaryAnimation, child) {
-                return FadeThroughTransition(
-                  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(
-          child: const RealmScreen(),
-        ),
-        routes: [
-          GoRoute(
-            path: '/manage',
-            name: 'realmManage',
-            pageBuilder: (context, state) => CustomTransitionPage(
-              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,
-                  ),
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-      GoRoute(
-        path: '/album',
-        name: 'album',
-        pageBuilder: (context, state) => NoTransitionPage(
-          child: const AlbumScreen(),
+        path: '/search',
+        name: 'postSearch',
+        builder: (context, state) => PostSearchScreen(
+          initialTags: state.uri.queryParameters['tags']?.split(','),
+          initialCategories: state.uri.queryParameters['categories']?.split(','),
         ),
       ),
       GoRoute(
-        path: '/friend',
-        name: 'friend',
-        pageBuilder: (context, state) => NoTransitionPage(
-          child: const FriendScreen(),
-        ),
+        path: '/publishers/:name',
+        name: 'postPublisher',
+        builder: (context, state) => PostPublisherScreen(name: state.pathParameters['name']!),
       ),
       GoRoute(
-        path: '/notification',
-        name: 'notification',
-        pageBuilder: (context, state) => NoTransitionPage(
-          child: const NotificationScreen(),
+        path: '/:slug',
+        name: 'postDetail',
+        builder: (context, state) => PostDetailScreen(
+          slug: state.pathParameters['slug']!,
+          preload: state.extra as SnPost?,
         ),
       ),
     ],
   ),
-  ShellRoute(
-    builder: (context, state, child) => child,
+  GoRoute(path: '/account', name: 'account', builder: (context, state) => const AccountScreen(), routes: [
+    GoRoute(
+      path: '/settings',
+      name: 'accountSettings',
+      builder: (context, state) => AccountSettingsScreen(),
+    ),
+    GoRoute(
+      path: '/settings/factors',
+      name: 'factorSettings',
+      builder: (context, state) => FactorSettingsScreen(),
+    ),
+    GoRoute(
+      path: '/profile/edit',
+      name: 'accountProfileEdit',
+      builder: (context, state) => ProfileEditScreen(),
+    ),
+    GoRoute(
+      path: '/publishers',
+      name: 'accountPublishers',
+      builder: (context, state) => PublisherScreen(),
+    ),
+    GoRoute(
+      path: '/publishers/new',
+      name: 'accountPublisherNew',
+      builder: (context, state) => AccountPublisherNewScreen(),
+    ),
+    GoRoute(
+      path: '/publishers/edit/:name',
+      name: 'accountPublisherEdit',
+      builder: (context, state) => AccountPublisherEditScreen(
+        name: state.pathParameters['name']!,
+      ),
+    ),
+    GoRoute(
+      path: '/:name',
+      name: 'accountProfilePage',
+      pageBuilder: (context, state) => NoTransitionPage(
+        child: UserScreen(name: state.pathParameters['name']!),
+      ),
+    ),
+  ]),
+  GoRoute(
+    path: '/chat',
+    name: 'chat',
+    builder: (context, state) => const ChatScreen(),
     routes: [
       GoRoute(
-        path: '/auth/login',
-        name: 'authLogin',
-        builder: (context, state) => LoginScreen(),
+        path: '/:scope/:alias',
+        name: 'chatRoom',
+        builder: (context, state) => ChatRoomScreen(
+          scope: state.pathParameters['scope']!,
+          alias: state.pathParameters['alias']!,
+        ),
       ),
       GoRoute(
-        path: '/auth/register',
-        name: 'authRegister',
-        builder: (context, state) => RegisterScreen(),
+        path: '/:scope/:alias/call',
+        name: 'chatCallRoom',
+        builder: (context, state) => CallRoomScreen(
+          scope: state.pathParameters['scope']!,
+          alias: state.pathParameters['alias']!,
+        ),
       ),
       GoRoute(
-        path: '/reports',
-        name: 'abuseReport',
-        builder: (context, state) => AbuseReportScreen(),
+        path: '/:scope/:alias/detail',
+        name: 'channelDetail',
+        builder: (context, state) => ChannelDetailScreen(
+          scope: state.pathParameters['scope']!,
+          alias: state.pathParameters['alias']!,
+        ),
       ),
       GoRoute(
-        path: '/account/profile/edit',
-        name: 'accountProfileEdit',
-        builder: (context, state) => ProfileEditScreen(),
-      ),
-      GoRoute(
-        path: '/account/publishers',
-        name: 'accountPublishers',
-        builder: (context, state) => PublisherScreen(),
-      ),
-      GoRoute(
-        path: '/account/publishers/new',
-        name: 'accountPublisherNew',
-        builder: (context, state) => AccountPublisherNewScreen(),
-      ),
-      GoRoute(
-        path: '/account/publishers/edit/:name',
-        name: 'accountPublisherEdit',
-        builder: (context, state) => AccountPublisherEditScreen(
-          name: state.pathParameters['name']!,
+        path: '/manage',
+        name: 'chatManage',
+        builder: (context, state) => ChatManageScreen(
+          editingChannelAlias: state.uri.queryParameters['editing'],
         ),
       ),
     ],
   ),
   GoRoute(
-    path: '/account/:name',
-    name: 'accountProfilePage',
-    pageBuilder: (context, state) => NoTransitionPage(
-      child: UserScreen(name: state.pathParameters['name']!),
+    path: '/realm',
+    name: 'realm',
+    pageBuilder: (context, state) => CustomTransitionPage(
+      transitionsBuilder: _fadeThroughTransition,
+      child: const RealmScreen(),
     ),
-  ),
-  ShellRoute(
-    builder: (context, state, child) => child,
     routes: [
       GoRoute(
-        path: '/settings',
-        name: 'settings',
-        builder: (context, state) => SettingsScreen(),
+        path: '/:alias',
+        name: 'realmDetail',
+        builder: (context, state) => RealmDetailScreen(alias: state.pathParameters['alias']!),
+      ),
+      GoRoute(
+        path: '/manage',
+        name: 'realmManage',
+        builder: (context, state) => RealmManageScreen(
+          editingRealmAlias: state.uri.queryParameters['editing'],
+        ),
       ),
     ],
   ),
-  ShellRoute(
-    builder: (context, state, child) => child,
-    routes: [
-      GoRoute(
-        path: '/about',
-        name: 'about',
-        builder: (context, state) => AboutScreen(),
+  GoRoute(path: '/news', name: 'news', builder: (context, state) => const NewsScreen(), routes: [
+    GoRoute(
+      path: '/:hash',
+      name: 'newsDetail',
+      builder: (context, state) => NewsDetailScreen(
+        hash: state.pathParameters['hash']!,
       ),
-    ],
+    ),
+  ]),
+  GoRoute(
+    path: '/album',
+    name: 'album',
+    builder: (context, state) => const AlbumScreen(),
+  ),
+  GoRoute(
+    path: '/friend',
+    name: 'friend',
+    builder: (context, state) => const FriendScreen(),
+  ),
+  GoRoute(
+    path: '/notification',
+    name: 'notification',
+    builder: (context, state) => const NotificationScreen(),
+  ),
+  GoRoute(
+    path: '/auth/login',
+    name: 'authLogin',
+    builder: (context, state) => LoginScreen(),
+  ),
+  GoRoute(
+    path: '/auth/register',
+    name: 'authRegister',
+    builder: (context, state) => RegisterScreen(),
+  ),
+  GoRoute(
+    path: '/reports',
+    name: 'abuseReport',
+    builder: (context, state) => AbuseReportScreen(),
+  ),
+  GoRoute(
+    path: '/settings',
+    name: 'settings',
+    builder: (context, state) => SettingsScreen(),
+  ),
+  GoRoute(
+    path: '/about',
+    name: 'about',
+    builder: (context, state) => AboutScreen(),
   ),
 ];
 

lib/screens/account.dart

@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
@@ -13,6 +15,7 @@ import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
+import 'package:surface/widgets/universal_image.dart';
 
 class AccountScreen extends StatelessWidget {
   const AccountScreen({super.key});
@@ -20,11 +23,39 @@ class AccountScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ua = context.watch<UserProvider>();
+    final sn = context.read<SnNetworkProvider>();
 
     return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text("screenAccount").tr(),
+        flexibleSpace: ua.user != null && ua.user!.banner.isNotEmpty
+            ? Stack(
+                fit: StackFit.expand,
+                children: [
+                  AutoResizeUniversalImage(sn.getAttachmentUrl(ua.user!.banner), fit: BoxFit.cover),
+                  Positioned(
+                    top: 0,
+                    left: 0,
+                    right: 0,
+                    height: 56 + MediaQuery.of(context).padding.top,
+                    child: ClipRect(
+                      child: BackdropFilter(
+                        filter: ImageFilter.blur(
+                          sigmaX: 10,
+                          sigmaY: 10,
+                        ),
+                        child: Container(
+                          color: Colors.black.withOpacity(
+                            clampDouble(10 * 0.1, 0, 0.5),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              )
+            : null,
         actions: [
           IconButton(
             icon: const Icon(Symbols.settings, fill: 1),
@@ -83,16 +114,6 @@ class _AuthorizedAccountScreen extends StatelessWidget {
             );
           }).padding(all: 20),
         ).padding(horizontal: 8, top: 16, bottom: 4),
-        ListTile(
-          title: Text('accountProfileEdit').tr(),
-          subtitle: Text('accountProfileEditSubtitle').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.contact_page),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountProfileEdit');
-          },
-        ),
         ListTile(
           title: Text('accountPublishers').tr(),
           subtitle: Text('accountPublishersSubtitle').tr(),
@@ -113,6 +134,26 @@ class _AuthorizedAccountScreen extends StatelessWidget {
             GoRouter.of(context).pushNamed('abuseReport');
           },
         ),
+        ListTile(
+          title: Text('factorSettings').tr(),
+          subtitle: Text('factorSettingsSubtitle').tr(),
+          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+          leading: const Icon(Symbols.lock),
+          trailing: const Icon(Symbols.chevron_right),
+          onTap: () {
+            GoRouter.of(context).pushNamed('factorSettings');
+          },
+        ),
+        ListTile(
+          title: Text('accountSettings').tr(),
+          subtitle: Text('accountSettingsSubtitle').tr(),
+          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+          leading: const Icon(Symbols.manage_accounts),
+          trailing: const Icon(Symbols.chevron_right),
+          onTap: () {
+            GoRouter.of(context).pushNamed('accountSettings');
+          },
+        ),
         ListTile(
           title: Text('accountLogout').tr(),
           subtitle: Text('accountLogoutSubtitle').tr(),
@@ -134,33 +175,6 @@ class _AuthorizedAccountScreen extends StatelessWidget {
             await Hive.initFlutter();
           },
         ),
-        ListTile(
-          title: Text('accountDeletion'.tr()),
-          subtitle: Text('accountDeletionActionDescription'.tr()),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.person_cancel),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            context
-                .showConfirmDialog(
-              'accountDeletion'.tr(),
-              'accountDeletionDescription'.tr(),
-            )
-                .then((value) {
-              if (!value || !context.mounted) return;
-              final sn = context.read<SnNetworkProvider>();
-              sn.client.post('/cgi/id/users/me/deletion').then((value) {
-                if (context.mounted) {
-                  context.showSnackbar('accountDeletionSubmitted'.tr());
-                }
-              }).catchError((err) {
-                if (context.mounted) {
-                  context.showErrorDialog(err);
-                }
-              });
-            });
-          },
-        ),
       ],
     );
   }

lib/screens/account/account_settings.dart

@@ -0,0 +1,66 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import 'package:surface/providers/sn_network.dart';
+import 'package:surface/widgets/dialog.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+
+class AccountSettingsScreen extends StatelessWidget {
+  const AccountSettingsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      appBar: AppBar(
+        leading: PageBackButton(),
+        title: Text('screenAccountSettings').tr(),
+      ),
+      body: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            ListTile(
+              title: Text('accountProfileEdit').tr(),
+              subtitle: Text('accountProfileEditSubtitle').tr(),
+              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+              leading: const Icon(Symbols.contact_page),
+              trailing: const Icon(Symbols.chevron_right),
+              onTap: () {
+                GoRouter.of(context).pushNamed('accountProfileEdit');
+              },
+            ),
+            ListTile(
+              title: Text('accountDeletion'.tr()),
+              subtitle: Text('accountDeletionActionDescription'.tr()),
+              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+              leading: const Icon(Symbols.person_cancel),
+              trailing: const Icon(Symbols.chevron_right),
+              onTap: () {
+                context
+                    .showConfirmDialog(
+                  'accountDeletion'.tr(),
+                  'accountDeletionDescription'.tr(),
+                )
+                    .then((value) {
+                  if (!value || !context.mounted) return;
+                  final sn = context.read<SnNetworkProvider>();
+                  sn.client.post('/cgi/id/users/me/deletion').then((value) {
+                    if (context.mounted) {
+                      context.showSnackbar('accountDeletionSubmitted'.tr());
+                    }
+                  }).catchError((err) {
+                    if (context.mounted) {
+                      context.showErrorDialog(err);
+                    }
+                  });
+                });
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/account/factor_settings.dart

@@ -0,0 +1,294 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/sn_network.dart';
+import 'package:surface/types/auth.dart';
+import 'package:surface/widgets/dialog.dart';
+import 'package:surface/widgets/loading_indicator.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+
+final Map<int, (String, String, IconData)> kFactorTypes = {
+  0: ('authFactorPassword', 'authFactorPasswordDescription', Symbols.password),
+  1: ('authFactorEmail', 'authFactorEmailDescription', Symbols.email),
+  2: ('authFactorTOTP', 'authFactorTOTPDescription', Symbols.timer),
+  3: ('authFactorInAppNotify', 'authFactorInAppNotifyDescription', Symbols.notifications_active),
+};
+
+class FactorSettingsScreen extends StatefulWidget {
+  const FactorSettingsScreen({super.key});
+
+  @override
+  State<FactorSettingsScreen> createState() => _FactorSettingsScreenState();
+}
+
+class _FactorSettingsScreenState extends State<FactorSettingsScreen> {
+  bool _isBusy = false;
+  List<SnAuthFactor>? _factors;
+
+  Future<void> _fetchFactors() async {
+    try {
+      setState(() => _isBusy = true);
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/id/users/me/factors');
+      _factors = List<SnAuthFactor>.from(
+        resp.data?.map((e) => SnAuthFactor.fromJson(e as Map<String, dynamic>)).toList() ?? [],
+      );
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchFactors();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      appBar: AppBar(
+        leading: PageBackButton(),
+        title: Text('screenFactorSettings').tr(),
+      ),
+      body: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          LoadingIndicator(
+            isActive: _isBusy,
+          ),
+          ListTile(
+            title: Text('authFactorAdd').tr(),
+            subtitle: Text('authFactorAddSubtitle').tr(),
+            contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+            leading: const Icon(Symbols.add),
+            trailing: const Icon(Symbols.chevron_right),
+            onTap: () {
+              showDialog(
+                context: context,
+                builder: (context) => _FactorNewDialog(
+                  currentlyHave: _factors!,
+                ),
+              ).then((val) {
+                if (val == true) _fetchFactors();
+              });
+            },
+          ),
+          const Divider(height: 1),
+          Expanded(
+            child: MediaQuery.removePadding(
+              context: context,
+              removeTop: true,
+              child: RefreshIndicator(
+                onRefresh: _fetchFactors,
+                child: ListView.builder(
+                  itemCount: _factors?.length ?? 0,
+                  itemBuilder: (context, idx) {
+                    final ele = _factors![idx];
+                    return ListTile(
+                      title: Text(kFactorTypes[ele.type]!.$1).tr(),
+                      subtitle: Text(kFactorTypes[ele.type]!.$2).tr(),
+                      contentPadding: const EdgeInsets.only(left: 24, right: 12),
+                      leading: Icon(kFactorTypes[ele.type]!.$3),
+                      trailing: IconButton(
+                        icon: const Icon(Symbols.close),
+                        onPressed: ele.type > 0
+                            ? () {
+                                context
+                                    .showConfirmDialog(
+                                  'authFactorDelete'.tr(),
+                                  'authFactorDeleteDescription'.tr(args: [kFactorTypes[ele.type]!.$1.tr()]),
+                                )
+                                    .then((val) async {
+                                  if (!val) return;
+                                  try {
+                                    if (!context.mounted) return;
+                                    final sn = context.read<SnNetworkProvider>();
+                                    await sn.client.delete('/cgi/id/users/me/factors/${ele.id}');
+                                    _fetchFactors();
+                                  } catch (err) {
+                                    if (!context.mounted) return;
+                                    context.showErrorDialog(err);
+                                  }
+                                });
+                              }
+                            : null,
+                      ),
+                    );
+                  },
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _FactorNewDialog extends StatefulWidget {
+  final List<SnAuthFactor> currentlyHave;
+
+  const _FactorNewDialog({required this.currentlyHave});
+
+  @override
+  State<_FactorNewDialog> createState() => _FactorNewDialogState();
+}
+
+class _FactorNewDialogState extends State<_FactorNewDialog> {
+  int? _factorType;
+  bool _isBusy = false;
+
+  Future<void> _submit() async {
+    try {
+      setState(() => _isBusy = true);
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.post('/cgi/id/users/me/factors', data: {
+        'type': _factorType,
+      });
+      final factor = SnAuthFactor.fromJson(resp.data);
+      if (!mounted) return;
+      if (factor.type == 2) {
+        await showModalBottomSheet(
+          context: context,
+          builder: (context) => _FactorTotpFactorDialog(factor: factor),
+        );
+      }
+      if (!mounted) return;
+      Navigator.of(context).pop(true);
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text('authFactorAdd').tr(),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          DropdownButtonHideUnderline(
+            child: DropdownButton2<int>(
+              hint: Text(
+                'Select Item',
+                style: TextStyle(
+                  fontSize: 14,
+                ),
+                overflow: TextOverflow.ellipsis,
+              ),
+              value: _factorType,
+              items: kFactorTypes.entries.map(
+                (ele) {
+                  final contains = widget.currentlyHave.map((ele) => ele.type).contains(ele.key);
+                  return DropdownMenuItem<int>(
+                    enabled: !contains,
+                    value: ele.key,
+                    child: Text(
+                      ele.value.$1.tr(),
+                      style: const TextStyle(
+                        fontSize: 14,
+                      ),
+                    ).opacity(contains ? 0.75 : 1),
+                  );
+                },
+              ).toList(),
+              onChanged: (val) => setState(() {
+                _factorType = val;
+              }),
+              buttonStyleData: ButtonStyleData(
+                height: 50,
+                padding: const EdgeInsets.only(left: 14, right: 14),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(14),
+                  border: Border.all(
+                    color: Theme.of(context).dividerColor,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: _isBusy ? null : () => Navigator.of(context).pop(),
+          child: Text('dialogCancel').tr(),
+        ),
+        TextButton(
+          onPressed: _isBusy ? null : () => _submit(),
+          child: Text('dialogConfirm').tr(),
+        ),
+      ],
+    );
+  }
+}
+
+class _FactorTotpFactorDialog extends StatelessWidget {
+  final SnAuthFactor factor;
+
+  const _FactorTotpFactorDialog({super.key, required this.factor});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Center(
+            child: Text(
+              'totpPostSetup',
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.titleLarge,
+            ).tr().width(280),
+          ),
+          const Gap(4),
+          Center(
+            child: Text(
+              'totpPostSetupDescription',
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.bodySmall,
+            ).tr().width(280),
+          ),
+          const Gap(16),
+          QrImageView(
+            padding: EdgeInsets.zero,
+            data: factor.config!['url'],
+            errorCorrectionLevel: QrErrorCorrectLevel.H,
+            version: QrVersions.auto,
+            size: 160,
+            gapless: true,
+            eyeStyle: QrEyeStyle(
+              eyeShape: QrEyeShape.circle,
+              color: Theme.of(context).colorScheme.onSurface,
+            ),
+            dataModuleStyle: QrDataModuleStyle(
+              dataModuleShape: QrDataModuleShape.square,
+              color: Theme.of(context).colorScheme.onSurface,
+            ),
+          ),
+          const Gap(16),
+          Center(
+            child: Text(
+              'totpNeverShare',
+              textAlign: TextAlign.center,
+              style: Theme.of(context).textTheme.bodyMedium,
+            ).tr().bold().width(280),
+          ),
+        ],
+      ),
+    );
+  }
+}

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/auth/login.dart

@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/userinfo.dart';
+import 'package:surface/screens/account/factor_settings.dart';
 import 'package:surface/types/auth.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
@@ -14,11 +15,6 @@ import 'package:url_launcher/url_launcher_string.dart';
 
 import '../../providers/websocket.dart';
 
-final Map<int, (String label, IconData icon, bool isOtp)> _factorLabelMap = {
-  0: ('authFactorPassword'.tr(), Symbols.password, false),
-  1: ('authFactorEmail'.tr(), Symbols.email, true),
-};
-
 class LoginScreen extends StatefulWidget {
   const LoginScreen({super.key});
 
@@ -212,7 +208,9 @@ class _LoginCheckScreenState extends State<_LoginCheckScreen> {
           controller: _passwordController,
           obscureText: true,
           autofillHints: [
-            (_factorLabelMap[widget.factor!.type]?.$3 ?? true) ? AutofillHints.password : AutofillHints.oneTimeCode
+            widget.factor!.type == 0
+                ? AutofillHints.password
+                : AutofillHints.oneTimeCode
           ],
           decoration: InputDecoration(
             isDense: true,
@@ -267,7 +265,8 @@ class _LoginPickerScreenState extends State<_LoginPickerScreen> {
   bool _isBusy = false;
   int? _factorPicked;
 
-  Color get _unFocusColor => Theme.of(context).colorScheme.onSurface.withAlpha((255 * 0.75).round());
+  Color get _unFocusColor =>
+      Theme.of(context).colorScheme.onSurface.withAlpha((255 * 0.75).round());
 
   void _performGetFactorCode() async {
     if (_factorPicked == null) return;
@@ -328,11 +327,11 @@ class _LoginPickerScreenState extends State<_LoginPickerScreen> {
                           ),
                         ),
                         secondary: Icon(
-                          _factorLabelMap[x.type]?.$2 ?? Symbols.question_mark,
+                          kFactorTypes[x.type]?.$3 ?? Symbols.question_mark,
                         ),
                         title: Text(
-                          _factorLabelMap[x.type]?.$1 ?? 'unknown'.tr(),
-                        ),
+                          kFactorTypes[x.type]?.$1 ?? 'unknown',
+                        ).tr(),
                         enabled: !widget.ticket!.factorTrail.contains(x.id),
                         value: _factorPicked == x.id,
                         onChanged: (value) {
@@ -408,11 +407,13 @@ class _LoginLookupScreenState extends State<_LoginLookupScreen> {
 
     try {
       final sn = context.read<SnNetworkProvider>();
-      final lookupResp = await sn.client.get('/cgi/id/users/lookup?probe=$username');
+      final lookupResp =
+          await sn.client.get('/cgi/id/users/lookup?probe=$username');
       await sn.client.post('/cgi/id/users/me/password-reset', data: {
         'user_id': lookupResp.data['id'],
       });
-      if (mounted) context.showModalDialog('done'.tr(), 'signinResetPasswordSent'.tr());
+      if (mounted)
+        context.showModalDialog('done'.tr(), 'signinResetPasswordSent'.tr());
     } catch (err) {
       if (mounted) context.showErrorDialog(err);
     } finally {
@@ -437,7 +438,8 @@ class _LoginLookupScreenState extends State<_LoginLookupScreen> {
       widget.onTicket(result.ticket);
 
       // Pull factors
-      final factorResp = await sn.client.get('/cgi/id/auth/factors', queryParameters: {
+      final factorResp =
+          await sn.client.get('/cgi/id/auth/factors', queryParameters: {
         'ticketId': result.ticket!.id.toString(),
       });
       widget.onFactor(
@@ -531,7 +533,10 @@ class _LoginLookupScreenState extends State<_LoginLookupScreen> {
                     'termAcceptNextWithAgree'.tr(),
                     textAlign: TextAlign.end,
                     style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface.withAlpha((255 * 0.75).round()),
+                          color: Theme.of(context)
+                              .colorScheme
+                              .onSurface
+                              .withAlpha((255 * 0.75).round()),
                         ),
                   ),
                   Material(

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:
-              Theme.of(context).colorScheme.surfaceContainer.withOpacity(0.75),
+          color: 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 !=
-                            call.focusTrack?.participant.sid) {
+                        if (track.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)
-                    .colorScheme
-                    .surfaceContainerHigh
-                    .withOpacity(0.75),
+                color: Theme.of(context).colorScheme.surfaceContainerHigh.withOpacity(0.75),
                 participant: track,
                 onTap: () {
-                  if (track.participant.sid !=
-                      call.focusTrack?.participant.sid) {
+                  if (track.participant.sid != call.focusTrack?.participant.sid) {
                     call.setFocusTrack(track);
                   }
                 },
@@ -160,150 +155,127 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
                 text: TextSpan(children: [
                   TextSpan(
                     text: 'call'.tr(),
-                    style: Theme.of(context)
-                        .textTheme
-                        .titleLarge!
-                        .copyWith(color: Colors.white),
+                    style: Theme.of(context).textTheme.titleLarge!.copyWith(color: Colors.white),
                   ),
                   const TextSpan(text: '\n'),
                   TextSpan(
                     text: call.lastDuration.toString(),
-                    style: Theme.of(context)
-                        .textTheme
-                        .bodySmall!
-                        .copyWith(color: Colors.white),
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.white),
                   ),
                 ]),
               ),
             ),
-            body: SafeArea(
-              child: GestureDetector(
-                behavior: HitTestBehavior.translucent,
-                child: Column(
-                  children: [
+            body: GestureDetector(
+              behavior: HitTestBehavior.translucent,
+              child: Column(
+                children: [
+                  SizedBox(
+                    width: MediaQuery.of(context).size.width,
+                    height: 64,
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Builder(builder: (context) {
+                          final call = context.read<ChatCallProvider>();
+                          final connectionQuality =
+                              call.room.localParticipant?.connectionQuality ?? livekit.ConnectionQuality.unknown;
+                          return Expanded(
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Row(
+                                  children: [
+                                    Text(
+                                      call.channel?.name ?? 'unknown'.tr(),
+                                      style: const TextStyle(
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                    const Gap(6),
+                                    Text(call.lastDuration.toString())
+                                  ],
+                                ),
+                                Row(
+                                  children: [
+                                    Text(
+                                      {
+                                        livekit.ConnectionState.disconnected: 'callStatusDisconnected'.tr(),
+                                        livekit.ConnectionState.connected: 'callStatusConnected'.tr(),
+                                        livekit.ConnectionState.connecting: 'callStatusConnecting'.tr(),
+                                        livekit.ConnectionState.reconnecting: 'callStatusReconnecting'.tr(),
+                                      }[call.room.connectionState]!,
+                                    ),
+                                    const Gap(6),
+                                    if (connectionQuality != livekit.ConnectionQuality.unknown)
+                                      Icon(
+                                        {
+                                          livekit.ConnectionQuality.excellent: Icons.signal_cellular_alt,
+                                          livekit.ConnectionQuality.good: Icons.signal_cellular_alt_2_bar,
+                                          livekit.ConnectionQuality.poor: Icons.signal_cellular_alt_1_bar,
+                                        }[connectionQuality],
+                                        color: {
+                                          livekit.ConnectionQuality.excellent: Colors.green,
+                                          livekit.ConnectionQuality.good: Colors.orange,
+                                          livekit.ConnectionQuality.poor: Colors.red,
+                                        }[connectionQuality],
+                                        size: 16,
+                                      )
+                                    else
+                                      const SizedBox(
+                                        width: 12,
+                                        height: 12,
+                                        child: CircularProgressIndicator(
+                                          color: Colors.white,
+                                          strokeWidth: 2,
+                                        ),
+                                      ).padding(all: 3),
+                                  ],
+                                ),
+                              ],
+                            ),
+                          );
+                        }),
+                        Row(
+                          children: [
+                            IconButton(
+                              icon: _layoutMode == 0 ? const Icon(Icons.view_list) : const Icon(Icons.grid_view),
+                              onPressed: () {
+                                _switchLayout();
+                              },
+                            ),
+                          ],
+                        ),
+                      ],
+                    ).padding(left: 20, right: 16),
+                  ),
+                  Expanded(
+                    child: Material(
+                      color: Theme.of(context).colorScheme.surfaceContainerLow,
+                      child: Builder(
+                        builder: (context) {
+                          switch (_layoutMode) {
+                            case 1:
+                              return _buildGridLayout();
+                            default:
+                              return _buildListLayout();
+                          }
+                        },
+                      ),
+                    ),
+                  ),
+                  if (call.room.localParticipant != null)
                     SizedBox(
                       width: MediaQuery.of(context).size.width,
-                      height: 64,
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          Builder(builder: (context) {
-                            final call = context.read<ChatCallProvider>();
-                            final connectionQuality =
-                                call.room.localParticipant?.connectionQuality ??
-                                    livekit.ConnectionQuality.unknown;
-                            return Expanded(
-                              child: Column(
-                                mainAxisSize: MainAxisSize.min,
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Row(
-                                    children: [
-                                      Text(
-                                        call.channel?.name ?? 'unknown'.tr(),
-                                        style: const TextStyle(
-                                          fontWeight: FontWeight.bold,
-                                        ),
-                                      ),
-                                      const Gap(6),
-                                      Text(call.lastDuration.toString())
-                                    ],
-                                  ),
-                                  Row(
-                                    children: [
-                                      Text(
-                                        {
-                                          livekit.ConnectionState.disconnected:
-                                              'callStatusDisconnected'.tr(),
-                                          livekit.ConnectionState.connected:
-                                              'callStatusConnected'.tr(),
-                                          livekit.ConnectionState.connecting:
-                                              'callStatusConnecting'.tr(),
-                                          livekit.ConnectionState.reconnecting:
-                                              'callStatusReconnecting'.tr(),
-                                        }[call.room.connectionState]!,
-                                      ),
-                                      const Gap(6),
-                                      if (connectionQuality !=
-                                          livekit.ConnectionQuality.unknown)
-                                        Icon(
-                                          {
-                                            livekit.ConnectionQuality.excellent:
-                                                Icons.signal_cellular_alt,
-                                            livekit.ConnectionQuality.good:
-                                                Icons.signal_cellular_alt_2_bar,
-                                            livekit.ConnectionQuality.poor:
-                                                Icons.signal_cellular_alt_1_bar,
-                                          }[connectionQuality],
-                                          color: {
-                                            livekit.ConnectionQuality.excellent:
-                                                Colors.green,
-                                            livekit.ConnectionQuality.good:
-                                                Colors.orange,
-                                            livekit.ConnectionQuality.poor:
-                                                Colors.red,
-                                          }[connectionQuality],
-                                          size: 16,
-                                        )
-                                      else
-                                        const SizedBox(
-                                          width: 12,
-                                          height: 12,
-                                          child: CircularProgressIndicator(
-                                            color: Colors.white,
-                                            strokeWidth: 2,
-                                          ),
-                                        ).padding(all: 3),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            );
-                          }),
-                          Row(
-                            children: [
-                              IconButton(
-                                icon: _layoutMode == 0
-                                    ? const Icon(Icons.view_list)
-                                    : const Icon(Icons.grid_view),
-                                onPressed: () {
-                                  _switchLayout();
-                                },
-                              ),
-                            ],
-                          ),
-                        ],
-                      ).padding(left: 20, right: 16),
-                    ),
-                    Expanded(
-                      child: Material(
-                        color:
-                            Theme.of(context).colorScheme.surfaceContainerLow,
-                        child: Builder(
-                          builder: (context) {
-                            switch (_layoutMode) {
-                              case 1:
-                                return _buildGridLayout();
-                              default:
-                                return _buildListLayout();
-                            }
-                          },
-                        ),
+                      child: ControlsWidget(
+                        call.room,
+                        call.room.localParticipant!,
                       ),
                     ),
-                    if (call.room.localParticipant != null)
-                      SizedBox(
-                        width: MediaQuery.of(context).size.width,
-                        child: ControlsWidget(
-                          call.room,
-                          call.room.localParticipant!,
-                        ),
-                      ),
-                  ],
-                ),
-                onTap: () {},
+                ],
               ),
+              onTap: () {},
             ),
           );
         });

lib/screens/explore.dart

@@ -7,6 +7,7 @@ import 'package:go_router/go_router.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/config.dart';
 import 'package:surface/providers/post.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/screens/post/post_detail.dart';
@@ -96,6 +97,8 @@ class _ExploreScreenState extends State<ExploreScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final cfg = context.read<ConfigProvider>();
+
     return AppScaffold(
       floatingActionButtonLocation: ExpandableFab.location,
       floatingActionButton: ExpandableFab(
@@ -243,8 +246,10 @@ class _ExploreScreenState extends State<ExploreScreen> {
                     ),
                     openColor: Colors.transparent,
                     openElevation: 0,
-                    closedColor: Theme.of(context).colorScheme.surfaceContainerLow.withOpacity(0.75),
                     transitionType: ContainerTransitionType.fade,
+                    closedColor: Theme.of(context).colorScheme.surfaceContainerLow.withOpacity(
+                          cfg.prefs.getBool(kAppBackgroundStoreKey) == true ? 0.75 : 1,
+                        ),
                     closedShape: const RoundedRectangleBorder(
                       borderRadius: BorderRadius.all(Radius.circular(16)),
                     ),

lib/screens/home.dart

@@ -9,6 +9,7 @@ import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:html/parser.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:relative_time/relative_time.dart';
@@ -22,6 +23,7 @@ import 'package:surface/providers/special_day.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/widget.dart';
 import 'package:surface/types/check_in.dart';
+import 'package:surface/types/news.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
@@ -49,12 +51,12 @@ class HomeScreen extends StatefulWidget {
 }
 
 class _HomeScreenState extends State<HomeScreen> {
-  static const List<HomeScreenDashEntry> kCards = [
+  late final List<HomeScreenDashEntry> kCards = [
     HomeScreenDashEntry(
       name: 'dashEntryRecommendation',
-      cols: 2,
-      rows: 2,
       child: _HomeDashRecommendationPostWidget(),
+      rows: 2,
+      cols: 2,
     ),
     HomeScreenDashEntry(
       name: 'dashEntryCheckIn',
@@ -64,6 +66,11 @@ class _HomeScreenState extends State<HomeScreen> {
       name: 'dashEntryNotification',
       child: _HomeDashNotificationWidget(),
     ),
+    HomeScreenDashEntry(
+      name: 'dashEntryTodayNews',
+      child: _HomeDashTodayNews(),
+      cols: MediaQuery.of(context).size.width >= 640 ? 3 : 2,
+    ),
   ];
 
   @override
@@ -230,6 +237,107 @@ class _HomeDashSpecialDayWidgetState extends State<_HomeDashSpecialDayWidget> {
   }
 }
 
+class _HomeDashTodayNews extends StatefulWidget {
+  const _HomeDashTodayNews();
+
+  @override
+  State<_HomeDashTodayNews> createState() => _HomeDashTodayNewsState();
+}
+
+class _HomeDashTodayNewsState extends State<_HomeDashTodayNews> {
+  SnNewsArticle? _article;
+
+  Future<void> _fetchArticle() async {
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/re/news/today');
+      _article = SnNewsArticle.fromJson(resp.data['data']);
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+      rethrow;
+    } finally {
+      setState(() {});
+    }
+  }
+
+  @override
+  initState() {
+    super.initState();
+    _fetchArticle();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              const Icon(Symbols.newspaper),
+              const Gap(8),
+              Text(
+                'newsToday',
+                style: Theme.of(context).textTheme.titleLarge,
+              ).tr()
+            ],
+          ).padding(horizontal: 18, top: 12, bottom: 8),
+          if (_article != null)
+            Expanded(
+              child: InkWell(
+                borderRadius: BorderRadius.all(Radius.circular(8)),
+                child: Column(
+                  spacing: 4,
+                  children: [
+                    Text(
+                      _article!.title,
+                      style: Theme.of(context).textTheme.titleMedium!.copyWith(fontSize: 18),
+                      maxLines: MediaQuery.of(context).size.width >= 640 ? 2 : 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    Text(
+                      parse(_article!.description).children.map((e) => e.text.trim()).join(),
+                      maxLines: 3,
+                      overflow: TextOverflow.ellipsis,
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+                    Builder(
+                      builder: (context) {
+                        final date = _article!.publishedAt ?? _article!.createdAt;
+                        return Row(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          spacing: 2,
+                          children: [
+                            Text(DateFormat().format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
+                            Text(' · ').textStyle(Theme.of(context).textTheme.bodySmall!).bold(),
+                            Text(RelativeTime(context).format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
+                          ],
+                        ).opacity(0.75);
+                      }
+                    ),
+                  ],
+                ).padding(horizontal: 16),
+                onTap: () {
+                  GoRouter.of(context).pushNamed(
+                    'newsDetail',
+                    pathParameters: {'hash': _article!.hash},
+                  );
+                },
+              ),
+            )
+          else
+            Expanded(
+              child: Center(
+                child: CircularProgressIndicator(),
+              ),
+            )
+        ],
+      ),
+    );
+  }
+}
+
 class _HomeDashCheckInWidget extends StatefulWidget {
   const _HomeDashCheckInWidget();
 

lib/screens/news/news_detail.dart

@@ -0,0 +1,241 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:html/dom.dart' as dom;
+import 'package:html/parser.dart';
+import 'package:provider/provider.dart';
+import 'package:relative_time/relative_time.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/sn_network.dart';
+import 'package:surface/types/news.dart';
+import 'package:surface/widgets/dialog.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:surface/widgets/universal_image.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class NewsDetailScreen extends StatefulWidget {
+  final String hash;
+
+  const NewsDetailScreen({super.key, required this.hash});
+
+  @override
+  State<NewsDetailScreen> createState() => _NewsDetailScreenState();
+}
+
+class _NewsDetailScreenState extends State<NewsDetailScreen> {
+  SnNewsArticle? _article;
+  dom.Document? _articleFragment;
+
+  Future<void> _fetchArticle() async {
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/re/news/${widget.hash}');
+      _article = SnNewsArticle.fromJson(resp.data);
+      _articleFragment = parse(_article!.content);
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err).then((_) {
+        if (!mounted) return;
+        Navigator.pop(context);
+      });
+    } finally {
+      setState(() {});
+    }
+  }
+
+  List<Widget> _parseHtmlToWidgets(Iterable<dom.Element>? elements) {
+    if (elements == null) return [];
+
+    final List<Widget> widgets = [];
+
+    for (final node in elements) {
+      switch (node.localName) {
+        case 'h1':
+        case 'h2':
+        case 'h3':
+        case 'h4':
+        case 'h5':
+        case 'h6':
+          widgets.add(Text(node.text.trim(), style: Theme.of(context).textTheme.titleMedium));
+          break;
+        case 'p':
+          if (node.text.trim().isEmpty) continue;
+          widgets.add(
+            Text.rich(
+              TextSpan(
+                text: node.text.trim(),
+                children: [
+                  for (final child in node.children)
+                    switch (child.localName) {
+                      'a' => TextSpan(
+                          text: child.text.trim(),
+                          style: const TextStyle(decoration: TextDecoration.underline),
+                          recognizer: TapGestureRecognizer()
+                            ..onTap = () {
+                              launchUrlString(child.attributes['href']!);
+                            },
+                        ),
+                      _ => TextSpan(text: child.text.trim()),
+                    },
+                ],
+              ),
+              style: Theme.of(context).textTheme.bodyLarge,
+            ),
+          );
+          break;
+        case 'a':
+          // drop single link
+          break;
+        case 'div':
+          // ignore div text, normally it is not meaningful
+          widgets.addAll(_parseHtmlToWidgets(node.children));
+          break;
+        case 'hr':
+          widgets.add(const Divider());
+          break;
+        case 'img':
+          var src = node.attributes['src'];
+          if (src == null) break;
+          final width = double.tryParse(node.attributes['width'] ?? 'null');
+          final height = double.tryParse(node.attributes['height'] ?? 'null');
+          final ratio = width != null && height != null ? width / height : 1.0;
+          if (src.startsWith('//')) {
+            src = 'https:$src';
+          } else if (!src.startsWith('http')) {
+            final baseUri = Uri.parse(_article!.url);
+            final baseUrl = '${baseUri.scheme}://${baseUri.host}';
+            src = '$baseUrl/$src';
+          }
+          widgets.add(
+            AspectRatio(
+              aspectRatio: ratio,
+              child: Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.all(Radius.circular(8)),
+                  border: Border.all(
+                    color: Theme.of(context).dividerColor,
+                    width: 1,
+                  ),
+                ),
+                height: height ?? double.infinity,
+                child: ClipRRect(
+                  borderRadius: BorderRadius.all(Radius.circular(8)),
+                  child: Container(
+                    color: Theme.of(context).colorScheme.surfaceContainer,
+                    child: AutoResizeUniversalImage(
+                      src,
+                      fit: width != null && height != null ? BoxFit.cover : BoxFit.contain,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          );
+          break;
+        default:
+          widgets.addAll(_parseHtmlToWidgets(node.children));
+          break;
+      }
+    }
+
+    return widgets;
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchArticle();
+  }
+
+  bool _isReadingFromReader = true;
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      appBar: AppBar(
+        leading: const PageBackButton(),
+        title: Text(_article?.title ?? 'loading'.tr()),
+      ),
+      body: Column(
+        children: [
+          MaterialBanner(
+            dividerColor: Colors.transparent,
+            leading: const Icon(Icons.info),
+            content: Text(_isReadingFromReader ? 'newsReadingFromReader'.tr() : 'newsReadingFromOriginal'.tr()),
+            actions: [
+              TextButton(
+                child: Text('newsReadingProviderSwap').tr(),
+                onPressed: () {
+                  setState(() => _isReadingFromReader = !_isReadingFromReader);
+                },
+              ),
+            ],
+          ),
+          if (_articleFragment != null && _isReadingFromReader)
+            Expanded(
+              child: Container(
+                constraints: BoxConstraints(maxWidth: 640),
+                child: SingleChildScrollView(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    spacing: 8,
+                    children: [
+                      Text(_article!.title, style: Theme.of(context).textTheme.titleLarge),
+                      Builder(builder: (context) {
+                        final htmlDescription = parse(_article!.description);
+                        return Text(
+                          htmlDescription.children.map((ele) => ele.text.trim()).join(),
+                          style: Theme.of(context).textTheme.bodyMedium,
+                        );
+                      }),
+                      Builder(builder: (context) {
+                        final date = _article!.publishedAt ?? _article!.createdAt;
+                        return Row(
+                          spacing: 2,
+                          children: [
+                            Text(DateFormat().format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
+                            Text(' · ').textStyle(Theme.of(context).textTheme.bodySmall!).bold(),
+                            Text(RelativeTime(context).format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
+                          ],
+                        ).opacity(0.75);
+                      }),
+                      Text('newsDisclaimer').tr().textStyle(Theme.of(context).textTheme.bodySmall!).opacity(0.75),
+                      const Divider(),
+                      ..._parseHtmlToWidgets(_articleFragment!.children),
+                      const Divider(),
+                      InkWell(
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Text(
+                              'Reference from original website',
+                              style: TextStyle(decoration: TextDecoration.underline),
+                            ),
+                            const Gap(4),
+                            Icon(Icons.launch, size: 16),
+                          ],
+                        ).opacity(0.85),
+                        onTap: () {
+                          launchUrlString(_article!.url);
+                        },
+                      ),
+                      Gap(MediaQuery.of(context).padding.bottom),
+                    ],
+                  ).padding(horizontal: 12, vertical: 16),
+                ),
+              ).center(),
+            )
+          else if (_article != null)
+            Expanded(
+              child: InAppWebView(
+                key: GlobalKey(),
+                initialUrlRequest: URLRequest(url: WebUri(_article!.url)),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/news/news_list.dart

@@ -0,0 +1,239 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
+import 'package:html/parser.dart';
+import 'package:provider/provider.dart';
+import 'package:relative_time/relative_time.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/sn_network.dart';
+import 'package:surface/types/news.dart';
+import 'package:surface/widgets/app_bar_leading.dart';
+import 'package:surface/widgets/dialog.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+import 'package:surface/widgets/universal_image.dart';
+import 'package:very_good_infinite_list/very_good_infinite_list.dart';
+
+class NewsScreen extends StatefulWidget {
+  const NewsScreen({super.key});
+
+  @override
+  State<NewsScreen> createState() => _NewsScreenState();
+}
+
+class _NewsScreenState extends State<NewsScreen> {
+  List<SnNewsSource>? _sources;
+
+  @override
+  initState() {
+    super.initState();
+    _fetchSources();
+  }
+
+  Future<void> _fetchSources() async {
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/re/well-known/sources');
+      _sources = List<SnNewsSource>.from(
+        resp.data?.map((e) => SnNewsSource.fromJson(e)) ?? [],
+      );
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() {});
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_sources == null) {
+      return AppScaffold(
+        appBar: AppBar(
+          leading: AutoAppBarLeading(),
+          title: Text('screenNews').tr(),
+        ),
+        body: Center(
+          child: CircularProgressIndicator(),
+        ),
+      );
+    }
+
+    return DefaultTabController(
+      length: _sources!.length + 1,
+      child: AppScaffold(
+        body: NestedScrollView(
+          headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+            return <Widget>[
+              SliverOverlapAbsorber(
+                handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
+                sliver: SliverAppBar(
+                  leading: AutoAppBarLeading(),
+                  title: Text('screenNews').tr(),
+                  floating: true,
+                  snap: true,
+                  bottom: TabBar(
+                    isScrollable: true,
+                    tabs: [
+                      Tab(child: Text('newsAllSources'.tr()).textColor(Theme.of(context).appBarTheme.foregroundColor)),
+                      for (final source in _sources!)
+                        Tab(
+                          child: Text(source.label).textColor(Theme.of(context).appBarTheme.foregroundColor),
+                        ),
+                    ],
+                  ),
+                ),
+              ),
+            ];
+          },
+          body: TabBarView(
+            children: [
+              _NewsArticleListWidget(allSources: _sources!),
+              for (final source in _sources!)
+                _NewsArticleListWidget(
+                  source: source.id,
+                  allSources: _sources!,
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _NewsArticleListWidget extends StatefulWidget {
+  final String? source;
+  final List<SnNewsSource> allSources;
+
+  const _NewsArticleListWidget({this.source, required this.allSources});
+
+  @override
+  State<_NewsArticleListWidget> createState() => _NewsArticleListWidgetState();
+}
+
+class _NewsArticleListWidgetState extends State<_NewsArticleListWidget> {
+  bool _isBusy = false;
+
+  int? _totalCount;
+  final List<SnNewsArticle> _articles = List.empty(growable: true);
+
+  Future<void> _fetchArticles() async {
+    setState(() => _isBusy = true);
+
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/re/news', queryParameters: {
+        'take': 10,
+        'offset': _articles.length,
+        if (widget.source != null) 'source': widget.source,
+      });
+      _totalCount = resp.data['count'];
+      _articles.addAll(List<SnNewsArticle>.from(
+        resp.data['data']?.map((e) => SnNewsArticle.fromJson(e)) ?? [],
+      ));
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchArticles();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MediaQuery.removePadding(
+      context: context,
+      removeTop: true,
+      child: Center(
+        child: Container(
+          constraints: BoxConstraints(maxWidth: 640),
+          child: RefreshIndicator(
+            onRefresh: _fetchArticles,
+            child: InfiniteList(
+              isLoading: _isBusy,
+              itemCount: _articles.length,
+              hasReachedMax: _totalCount != null && _articles.length >= _totalCount!,
+              onFetchData: () {
+                _fetchArticles();
+              },
+              itemBuilder: (context, index) {
+                final article = _articles[index];
+
+                final baseUri = Uri.parse(article.url);
+                final baseUrl = '${baseUri.scheme}://${baseUri.host}';
+
+                final htmlDescription = parse(article.description);
+                final date = article.publishedAt ?? article.createdAt;
+
+                return Card(
+                  child: InkWell(
+                    radius: 8,
+                    onTap: () {
+                      GoRouter.of(context).pushNamed(
+                        'newsDetail',
+                        pathParameters: {'hash': article.hash},
+                      );
+                    },
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        if (article.thumbnail.isNotEmpty && !article.thumbnail.endsWith('.svg'))
+                          ClipRRect(
+                            borderRadius: BorderRadius.only(
+                              topRight: Radius.circular(8),
+                              topLeft: Radius.circular(8),
+                            ),
+                            child: AspectRatio(
+                              aspectRatio: 16 / 9,
+                              child: Container(
+                                color: Theme.of(context).colorScheme.surfaceContainer,
+                                child: AutoResizeUniversalImage(
+                                  article.thumbnail.startsWith('http')
+                                      ? article.thumbnail
+                                      : '$baseUrl/${article.thumbnail}',
+                                ),
+                              ),
+                            ),
+                          ),
+                        const Gap(16),
+                        Text(article.title).textStyle(Theme.of(context).textTheme.titleLarge!).padding(horizontal: 16),
+                        const Gap(8),
+                        Text(htmlDescription.children.map((ele) => ele.text.trim()).join())
+                            .textStyle(Theme.of(context).textTheme.bodyMedium!)
+                            .padding(horizontal: 16),
+                        const Gap(8),
+                        Row(
+                          spacing: 2,
+                          children: [
+                            Text(widget.allSources.where((x) => x.id == article.source).first.label)
+                                .textStyle(Theme.of(context).textTheme.bodySmall!),
+                          ],
+                        ).opacity(0.75).padding(horizontal: 16),
+                        Row(
+                          spacing: 2,
+                          children: [
+                            Text(DateFormat().format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
+                            Text(' · ').textStyle(Theme.of(context).textTheme.bodySmall!).bold(),
+                            Text(RelativeTime(context).format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
+                          ],
+                        ).opacity(0.75).padding(horizontal: 16),
+                        const Gap(16),
+                      ],
+                    ),
+                  ),
+                );
+              },
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

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/types/account.dart

@@ -15,8 +15,8 @@ class SnAccount with _$SnAccount {
     required DateTime? deletedAt,
     required DateTime? confirmedAt,
     required List<SnAccountContact>? contacts,
-    required String avatar,
-    required String banner,
+    @Default("") String avatar,
+    @Default("") String banner,
     required String description,
     required String name,
     required String nick,

lib/types/account.freezed.dart

@@ -367,8 +367,8 @@ class _$SnAccountImpl extends _SnAccount {
       required this.deletedAt,
       required this.confirmedAt,
       required final List<SnAccountContact>? contacts,
-      required this.avatar,
-      required this.banner,
+      this.avatar = "",
+      this.banner = "",
       required this.description,
       required this.name,
       required this.nick,
@@ -410,8 +410,10 @@ class _$SnAccountImpl extends _SnAccount {
   }
 
   @override
+  @JsonKey()
   final String avatar;
   @override
+  @JsonKey()
   final String banner;
   @override
   final String description;
@@ -540,8 +542,8 @@ abstract class _SnAccount extends SnAccount {
       required final DateTime? deletedAt,
       required final DateTime? confirmedAt,
       required final List<SnAccountContact>? contacts,
-      required final String avatar,
-      required final String banner,
+      final String avatar,
+      final String banner,
       required final String description,
       required final String name,
       required final String nick,

lib/types/account.g.dart

@@ -20,8 +20,8 @@ _$SnAccountImpl _$$SnAccountImplFromJson(Map<String, dynamic> json) =>
       contacts: (json['contacts'] as List<dynamic>?)
           ?.map((e) => SnAccountContact.fromJson(e as Map<String, dynamic>))
           .toList(),
-      avatar: json['avatar'] as String,
-      banner: json['banner'] as String,
+      avatar: json['avatar'] as String? ?? "",
+      banner: json['banner'] as String? ?? "",
       description: json['description'] as String,
       name: json['name'] as String,
       nick: json['nick'] as String,

lib/types/news.dart

@@ -0,0 +1,38 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'news.freezed.dart';
+part 'news.g.dart';
+
+@freezed
+class SnNewsSource with _$SnNewsSource {
+  const factory SnNewsSource({
+    required String id,
+    required String label,
+    required String type,
+    required String source,
+    required int depth,
+    required bool enabled,
+  }) = _SnNewsSource;
+
+  factory SnNewsSource.fromJson(Map<String, dynamic> json) => _$SnNewsSourceFromJson(json);
+}
+
+@freezed
+class SnNewsArticle with _$SnNewsArticle {
+  const factory SnNewsArticle({
+    required int id,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required dynamic deletedAt,
+    required String thumbnail,
+    required String title,
+    required String description,
+    required String content,
+    required String url,
+    required String hash,
+    required String source,
+    required DateTime? publishedAt,
+  }) = _SnNewsArticle;
+
+  factory SnNewsArticle.fromJson(Map<String, dynamic> json) => _$SnNewsArticleFromJson(json);
+}

lib/types/news.freezed.dart

@@ -0,0 +1,660 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'news.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+SnNewsSource _$SnNewsSourceFromJson(Map<String, dynamic> json) {
+  return _SnNewsSource.fromJson(json);
+}
+
+/// @nodoc
+mixin _$SnNewsSource {
+  String get id => throw _privateConstructorUsedError;
+  String get label => throw _privateConstructorUsedError;
+  String get type => throw _privateConstructorUsedError;
+  String get source => throw _privateConstructorUsedError;
+  int get depth => throw _privateConstructorUsedError;
+  bool get enabled => throw _privateConstructorUsedError;
+
+  /// Serializes this SnNewsSource to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of SnNewsSource
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $SnNewsSourceCopyWith<SnNewsSource> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $SnNewsSourceCopyWith<$Res> {
+  factory $SnNewsSourceCopyWith(
+          SnNewsSource value, $Res Function(SnNewsSource) then) =
+      _$SnNewsSourceCopyWithImpl<$Res, SnNewsSource>;
+  @useResult
+  $Res call(
+      {String id,
+      String label,
+      String type,
+      String source,
+      int depth,
+      bool enabled});
+}
+
+/// @nodoc
+class _$SnNewsSourceCopyWithImpl<$Res, $Val extends SnNewsSource>
+    implements $SnNewsSourceCopyWith<$Res> {
+  _$SnNewsSourceCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of SnNewsSource
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? id = null,
+    Object? label = null,
+    Object? type = null,
+    Object? source = null,
+    Object? depth = null,
+    Object? enabled = null,
+  }) {
+    return _then(_value.copyWith(
+      id: null == id
+          ? _value.id
+          : id // ignore: cast_nullable_to_non_nullable
+              as String,
+      label: null == label
+          ? _value.label
+          : label // ignore: cast_nullable_to_non_nullable
+              as String,
+      type: null == type
+          ? _value.type
+          : type // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      depth: null == depth
+          ? _value.depth
+          : depth // ignore: cast_nullable_to_non_nullable
+              as int,
+      enabled: null == enabled
+          ? _value.enabled
+          : enabled // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$SnNewsSourceImplCopyWith<$Res>
+    implements $SnNewsSourceCopyWith<$Res> {
+  factory _$$SnNewsSourceImplCopyWith(
+          _$SnNewsSourceImpl value, $Res Function(_$SnNewsSourceImpl) then) =
+      __$$SnNewsSourceImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {String id,
+      String label,
+      String type,
+      String source,
+      int depth,
+      bool enabled});
+}
+
+/// @nodoc
+class __$$SnNewsSourceImplCopyWithImpl<$Res>
+    extends _$SnNewsSourceCopyWithImpl<$Res, _$SnNewsSourceImpl>
+    implements _$$SnNewsSourceImplCopyWith<$Res> {
+  __$$SnNewsSourceImplCopyWithImpl(
+      _$SnNewsSourceImpl _value, $Res Function(_$SnNewsSourceImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of SnNewsSource
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? id = null,
+    Object? label = null,
+    Object? type = null,
+    Object? source = null,
+    Object? depth = null,
+    Object? enabled = null,
+  }) {
+    return _then(_$SnNewsSourceImpl(
+      id: null == id
+          ? _value.id
+          : id // ignore: cast_nullable_to_non_nullable
+              as String,
+      label: null == label
+          ? _value.label
+          : label // ignore: cast_nullable_to_non_nullable
+              as String,
+      type: null == type
+          ? _value.type
+          : type // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      depth: null == depth
+          ? _value.depth
+          : depth // ignore: cast_nullable_to_non_nullable
+              as int,
+      enabled: null == enabled
+          ? _value.enabled
+          : enabled // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$SnNewsSourceImpl implements _SnNewsSource {
+  const _$SnNewsSourceImpl(
+      {required this.id,
+      required this.label,
+      required this.type,
+      required this.source,
+      required this.depth,
+      required this.enabled});
+
+  factory _$SnNewsSourceImpl.fromJson(Map<String, dynamic> json) =>
+      _$$SnNewsSourceImplFromJson(json);
+
+  @override
+  final String id;
+  @override
+  final String label;
+  @override
+  final String type;
+  @override
+  final String source;
+  @override
+  final int depth;
+  @override
+  final bool enabled;
+
+  @override
+  String toString() {
+    return 'SnNewsSource(id: $id, label: $label, type: $type, source: $source, depth: $depth, enabled: $enabled)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$SnNewsSourceImpl &&
+            (identical(other.id, id) || other.id == id) &&
+            (identical(other.label, label) || other.label == label) &&
+            (identical(other.type, type) || other.type == type) &&
+            (identical(other.source, source) || other.source == source) &&
+            (identical(other.depth, depth) || other.depth == depth) &&
+            (identical(other.enabled, enabled) || other.enabled == enabled));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(runtimeType, id, label, type, source, depth, enabled);
+
+  /// Create a copy of SnNewsSource
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$SnNewsSourceImplCopyWith<_$SnNewsSourceImpl> get copyWith =>
+      __$$SnNewsSourceImplCopyWithImpl<_$SnNewsSourceImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$SnNewsSourceImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _SnNewsSource implements SnNewsSource {
+  const factory _SnNewsSource(
+      {required final String id,
+      required final String label,
+      required final String type,
+      required final String source,
+      required final int depth,
+      required final bool enabled}) = _$SnNewsSourceImpl;
+
+  factory _SnNewsSource.fromJson(Map<String, dynamic> json) =
+      _$SnNewsSourceImpl.fromJson;
+
+  @override
+  String get id;
+  @override
+  String get label;
+  @override
+  String get type;
+  @override
+  String get source;
+  @override
+  int get depth;
+  @override
+  bool get enabled;
+
+  /// Create a copy of SnNewsSource
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$SnNewsSourceImplCopyWith<_$SnNewsSourceImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+SnNewsArticle _$SnNewsArticleFromJson(Map<String, dynamic> json) {
+  return _SnNewsArticle.fromJson(json);
+}
+
+/// @nodoc
+mixin _$SnNewsArticle {
+  int get id => throw _privateConstructorUsedError;
+  DateTime get createdAt => throw _privateConstructorUsedError;
+  DateTime get updatedAt => throw _privateConstructorUsedError;
+  dynamic get deletedAt => throw _privateConstructorUsedError;
+  String get thumbnail => throw _privateConstructorUsedError;
+  String get title => throw _privateConstructorUsedError;
+  String get description => throw _privateConstructorUsedError;
+  String get content => throw _privateConstructorUsedError;
+  String get url => throw _privateConstructorUsedError;
+  String get hash => throw _privateConstructorUsedError;
+  String get source => throw _privateConstructorUsedError;
+  DateTime? get publishedAt => throw _privateConstructorUsedError;
+
+  /// Serializes this SnNewsArticle to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of SnNewsArticle
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $SnNewsArticleCopyWith<SnNewsArticle> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $SnNewsArticleCopyWith<$Res> {
+  factory $SnNewsArticleCopyWith(
+          SnNewsArticle value, $Res Function(SnNewsArticle) then) =
+      _$SnNewsArticleCopyWithImpl<$Res, SnNewsArticle>;
+  @useResult
+  $Res call(
+      {int id,
+      DateTime createdAt,
+      DateTime updatedAt,
+      dynamic deletedAt,
+      String thumbnail,
+      String title,
+      String description,
+      String content,
+      String url,
+      String hash,
+      String source,
+      DateTime? publishedAt});
+}
+
+/// @nodoc
+class _$SnNewsArticleCopyWithImpl<$Res, $Val extends SnNewsArticle>
+    implements $SnNewsArticleCopyWith<$Res> {
+  _$SnNewsArticleCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of SnNewsArticle
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? id = null,
+    Object? createdAt = null,
+    Object? updatedAt = null,
+    Object? deletedAt = freezed,
+    Object? thumbnail = null,
+    Object? title = null,
+    Object? description = null,
+    Object? content = null,
+    Object? url = null,
+    Object? hash = null,
+    Object? source = null,
+    Object? publishedAt = freezed,
+  }) {
+    return _then(_value.copyWith(
+      id: null == id
+          ? _value.id
+          : id // ignore: cast_nullable_to_non_nullable
+              as int,
+      createdAt: null == createdAt
+          ? _value.createdAt
+          : createdAt // ignore: cast_nullable_to_non_nullable
+              as DateTime,
+      updatedAt: null == updatedAt
+          ? _value.updatedAt
+          : updatedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime,
+      deletedAt: freezed == deletedAt
+          ? _value.deletedAt
+          : deletedAt // ignore: cast_nullable_to_non_nullable
+              as dynamic,
+      thumbnail: null == thumbnail
+          ? _value.thumbnail
+          : thumbnail // ignore: cast_nullable_to_non_nullable
+              as String,
+      title: null == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String,
+      description: null == description
+          ? _value.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String,
+      content: null == content
+          ? _value.content
+          : content // ignore: cast_nullable_to_non_nullable
+              as String,
+      url: null == url
+          ? _value.url
+          : url // ignore: cast_nullable_to_non_nullable
+              as String,
+      hash: null == hash
+          ? _value.hash
+          : hash // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      publishedAt: freezed == publishedAt
+          ? _value.publishedAt
+          : publishedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$SnNewsArticleImplCopyWith<$Res>
+    implements $SnNewsArticleCopyWith<$Res> {
+  factory _$$SnNewsArticleImplCopyWith(
+          _$SnNewsArticleImpl value, $Res Function(_$SnNewsArticleImpl) then) =
+      __$$SnNewsArticleImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {int id,
+      DateTime createdAt,
+      DateTime updatedAt,
+      dynamic deletedAt,
+      String thumbnail,
+      String title,
+      String description,
+      String content,
+      String url,
+      String hash,
+      String source,
+      DateTime? publishedAt});
+}
+
+/// @nodoc
+class __$$SnNewsArticleImplCopyWithImpl<$Res>
+    extends _$SnNewsArticleCopyWithImpl<$Res, _$SnNewsArticleImpl>
+    implements _$$SnNewsArticleImplCopyWith<$Res> {
+  __$$SnNewsArticleImplCopyWithImpl(
+      _$SnNewsArticleImpl _value, $Res Function(_$SnNewsArticleImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of SnNewsArticle
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? id = null,
+    Object? createdAt = null,
+    Object? updatedAt = null,
+    Object? deletedAt = freezed,
+    Object? thumbnail = null,
+    Object? title = null,
+    Object? description = null,
+    Object? content = null,
+    Object? url = null,
+    Object? hash = null,
+    Object? source = null,
+    Object? publishedAt = freezed,
+  }) {
+    return _then(_$SnNewsArticleImpl(
+      id: null == id
+          ? _value.id
+          : id // ignore: cast_nullable_to_non_nullable
+              as int,
+      createdAt: null == createdAt
+          ? _value.createdAt
+          : createdAt // ignore: cast_nullable_to_non_nullable
+              as DateTime,
+      updatedAt: null == updatedAt
+          ? _value.updatedAt
+          : updatedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime,
+      deletedAt: freezed == deletedAt
+          ? _value.deletedAt
+          : deletedAt // ignore: cast_nullable_to_non_nullable
+              as dynamic,
+      thumbnail: null == thumbnail
+          ? _value.thumbnail
+          : thumbnail // ignore: cast_nullable_to_non_nullable
+              as String,
+      title: null == title
+          ? _value.title
+          : title // ignore: cast_nullable_to_non_nullable
+              as String,
+      description: null == description
+          ? _value.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String,
+      content: null == content
+          ? _value.content
+          : content // ignore: cast_nullable_to_non_nullable
+              as String,
+      url: null == url
+          ? _value.url
+          : url // ignore: cast_nullable_to_non_nullable
+              as String,
+      hash: null == hash
+          ? _value.hash
+          : hash // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      publishedAt: freezed == publishedAt
+          ? _value.publishedAt
+          : publishedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$SnNewsArticleImpl implements _SnNewsArticle {
+  const _$SnNewsArticleImpl(
+      {required this.id,
+      required this.createdAt,
+      required this.updatedAt,
+      required this.deletedAt,
+      required this.thumbnail,
+      required this.title,
+      required this.description,
+      required this.content,
+      required this.url,
+      required this.hash,
+      required this.source,
+      required this.publishedAt});
+
+  factory _$SnNewsArticleImpl.fromJson(Map<String, dynamic> json) =>
+      _$$SnNewsArticleImplFromJson(json);
+
+  @override
+  final int id;
+  @override
+  final DateTime createdAt;
+  @override
+  final DateTime updatedAt;
+  @override
+  final dynamic deletedAt;
+  @override
+  final String thumbnail;
+  @override
+  final String title;
+  @override
+  final String description;
+  @override
+  final String content;
+  @override
+  final String url;
+  @override
+  final String hash;
+  @override
+  final String source;
+  @override
+  final DateTime? publishedAt;
+
+  @override
+  String toString() {
+    return 'SnNewsArticle(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, thumbnail: $thumbnail, title: $title, description: $description, content: $content, url: $url, hash: $hash, source: $source, publishedAt: $publishedAt)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$SnNewsArticleImpl &&
+            (identical(other.id, id) || other.id == id) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
+            const DeepCollectionEquality().equals(other.deletedAt, deletedAt) &&
+            (identical(other.thumbnail, thumbnail) ||
+                other.thumbnail == thumbnail) &&
+            (identical(other.title, title) || other.title == title) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.content, content) || other.content == content) &&
+            (identical(other.url, url) || other.url == url) &&
+            (identical(other.hash, hash) || other.hash == hash) &&
+            (identical(other.source, source) || other.source == source) &&
+            (identical(other.publishedAt, publishedAt) ||
+                other.publishedAt == publishedAt));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      id,
+      createdAt,
+      updatedAt,
+      const DeepCollectionEquality().hash(deletedAt),
+      thumbnail,
+      title,
+      description,
+      content,
+      url,
+      hash,
+      source,
+      publishedAt);
+
+  /// Create a copy of SnNewsArticle
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$SnNewsArticleImplCopyWith<_$SnNewsArticleImpl> get copyWith =>
+      __$$SnNewsArticleImplCopyWithImpl<_$SnNewsArticleImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$SnNewsArticleImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _SnNewsArticle implements SnNewsArticle {
+  const factory _SnNewsArticle(
+      {required final int id,
+      required final DateTime createdAt,
+      required final DateTime updatedAt,
+      required final dynamic deletedAt,
+      required final String thumbnail,
+      required final String title,
+      required final String description,
+      required final String content,
+      required final String url,
+      required final String hash,
+      required final String source,
+      required final DateTime? publishedAt}) = _$SnNewsArticleImpl;
+
+  factory _SnNewsArticle.fromJson(Map<String, dynamic> json) =
+      _$SnNewsArticleImpl.fromJson;
+
+  @override
+  int get id;
+  @override
+  DateTime get createdAt;
+  @override
+  DateTime get updatedAt;
+  @override
+  dynamic get deletedAt;
+  @override
+  String get thumbnail;
+  @override
+  String get title;
+  @override
+  String get description;
+  @override
+  String get content;
+  @override
+  String get url;
+  @override
+  String get hash;
+  @override
+  String get source;
+  @override
+  DateTime? get publishedAt;
+
+  /// Create a copy of SnNewsArticle
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$SnNewsArticleImplCopyWith<_$SnNewsArticleImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/types/news.g.dart

@@ -0,0 +1,61 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'news.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$SnNewsSourceImpl _$$SnNewsSourceImplFromJson(Map<String, dynamic> json) =>
+    _$SnNewsSourceImpl(
+      id: json['id'] as String,
+      label: json['label'] as String,
+      type: json['type'] as String,
+      source: json['source'] as String,
+      depth: (json['depth'] as num).toInt(),
+      enabled: json['enabled'] as bool,
+    );
+
+Map<String, dynamic> _$$SnNewsSourceImplToJson(_$SnNewsSourceImpl instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'label': instance.label,
+      'type': instance.type,
+      'source': instance.source,
+      'depth': instance.depth,
+      'enabled': instance.enabled,
+    };
+
+_$SnNewsArticleImpl _$$SnNewsArticleImplFromJson(Map<String, dynamic> json) =>
+    _$SnNewsArticleImpl(
+      id: (json['id'] as num).toInt(),
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      deletedAt: json['deleted_at'],
+      thumbnail: json['thumbnail'] as String,
+      title: json['title'] as String,
+      description: json['description'] as String,
+      content: json['content'] as String,
+      url: json['url'] as String,
+      hash: json['hash'] as String,
+      source: json['source'] as String,
+      publishedAt: json['published_at'] == null
+          ? null
+          : DateTime.parse(json['published_at'] as String),
+    );
+
+Map<String, dynamic> _$$SnNewsArticleImplToJson(_$SnNewsArticleImpl instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt,
+      'thumbnail': instance.thumbnail,
+      'title': instance.title,
+      'description': instance.description,
+      'content': instance.content,
+      'url': instance.url,
+      'hash': instance.hash,
+      'source': instance.source,
+      'published_at': instance.publishedAt?.toIso8601String(),
+    };

lib/widgets/attachment/attachment_list.dart

@@ -196,68 +196,71 @@ class _AttachmentListState extends State<AttachmentList> {
           );
         }
 
-        return 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),
-                  child: AspectRatio(
-                    aspectRatio: (widget.data[idx]?.data['ratio'] ?? 1).toDouble(),
-                    child: GestureDetector(
-                      onTap: () {
-                        if (widget.data[idx]?.mediaType != SnMediaType.image) return;
-                        context.pushTransparentRoute(
-                          AttachmentZoomView(
-                            data: widget.data.where((ele) => ele != null && ele.mediaType == SnMediaType.image).cast(),
-                            initialIndex: idx,
-                            heroTags: heroTags,
-                          ),
-                          backgroundColor: Colors.black.withOpacity(0.7),
-                          rootNavigator: true,
-                        );
-                      },
-                      child: Stack(
-                        fit: StackFit.expand,
-                        children: [
-                          Container(
-                            decoration: BoxDecoration(
-                              color: backgroundColor,
-                              border: Border(
-                                top: borderSide,
-                                bottom: borderSide,
-                              ),
-                              borderRadius: AttachmentList.kDefaultRadius,
+        return AspectRatio(
+          aspectRatio: widget.data[0]?.data['ratio']?.toDouble() ?? 1,
+          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),
+                    child: AspectRatio(
+                      aspectRatio: (widget.data[idx]?.data['ratio'] ?? 1).toDouble(),
+                      child: GestureDetector(
+                        onTap: () {
+                          if (widget.data[idx]?.mediaType != SnMediaType.image) return;
+                          context.pushTransparentRoute(
+                            AttachmentZoomView(
+                              data: widget.data.where((ele) => ele != null && ele.mediaType == SnMediaType.image).cast(),
+                              initialIndex: idx,
+                              heroTags: heroTags,
                             ),
-                            child: ClipRRect(
-                              borderRadius: AttachmentList.kDefaultRadius,
-                              child: AttachmentItem(
-                                data: widget.data[idx],
-                                heroTag: heroTags[idx],
+                            backgroundColor: Colors.black.withOpacity(0.7),
+                            rootNavigator: true,
+                          );
+                        },
+                        child: Stack(
+                          fit: StackFit.expand,
+                          children: [
+                            Container(
+                              decoration: BoxDecoration(
+                                color: backgroundColor,
+                                border: Border(
+                                  top: borderSide,
+                                  bottom: borderSide,
+                                ),
+                                borderRadius: AttachmentList.kDefaultRadius,
+                              ),
+                              child: ClipRRect(
+                                borderRadius: AttachmentList.kDefaultRadius,
+                                child: AttachmentItem(
+                                  data: widget.data[idx],
+                                  heroTag: heroTags[idx],
+                                ),
                               ),
                             ),
-                          ),
-                          Positioned(
-                            right: 8,
-                            bottom: 8,
-                            child: Chip(
-                              label: Text('${idx + 1}/${widget.data.length}'),
+                            Positioned(
+                              right: 8,
+                              bottom: 8,
+                              child: Chip(
+                                label: Text('${idx + 1}/${widget.data.length}'),
+                              ),
                             ),
-                          ),
-                        ],
+                          ],
+                        ),
                       ),
                     ),
-                  ),
-                );
-              },
-              separatorBuilder: (context, index) => const Gap(8),
-              physics: const BouncingScrollPhysics(),
-              scrollDirection: Axis.horizontal,
+                  );
+                },
+                separatorBuilder: (context, index) => const Gap(8),
+                physics: const BouncingScrollPhysics(),
+                scrollDirection: Axis.horizontal,
+              ),
             ),
           ),
         );

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),

lib/widgets/universal_image.dart

@@ -5,10 +5,9 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:flutter_animate/flutter_animate.dart';
-
+import 'package:surface/providers/config.dart';
 // Keep this import to make the web image render work
 import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart';
-import 'package:surface/providers/config.dart';
 
 class UniversalImage extends StatelessWidget {
   final String url;

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -13,6 +13,7 @@ import file_selector_macos
 import firebase_analytics
 import firebase_core
 import firebase_messaging
+import flutter_inappwebview_macos
 import flutter_udid
 import flutter_webrtc
 import gal
@@ -40,6 +41,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
+  InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
   FlutterUdidPlugin.register(with: registry.registrar(forPlugin: "FlutterUdidPlugin"))
   FlutterWebRTCPlugin.register(with: registry.registrar(forPlugin: "FlutterWebRTCPlugin"))
   GalPlugin.register(with: registry.registrar(forPlugin: "GalPlugin"))

macos/Podfile.lock

@@ -22,14 +22,14 @@ PODS:
   - Firebase/Messaging (11.6.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 11.6.0)
-  - firebase_analytics (11.4.0):
+  - firebase_analytics (11.4.1):
     - Firebase/Analytics (= 11.6.0)
     - firebase_core
     - FlutterMacOS
-  - firebase_core (3.10.0):
+  - firebase_core (3.10.1):
     - Firebase/CoreOnly (~> 11.6.0)
     - FlutterMacOS
-  - firebase_messaging (15.2.0):
+  - firebase_messaging (15.2.1):
     - Firebase/CoreOnly (~> 11.6.0)
     - Firebase/Messaging (~> 11.6.0)
     - firebase_core
@@ -72,6 +72,9 @@ PODS:
     - GoogleUtilities/Reachability (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - nanopb (~> 3.30910.0)
+  - flutter_inappwebview_macos (0.0.1):
+    - FlutterMacOS
+    - OrderedSet (~> 6.0.3)
   - flutter_udid (0.0.1):
     - FlutterMacOS
     - SAMKeychain
@@ -149,6 +152,7 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
+  - OrderedSet (6.0.3)
   - package_info_plus (0.0.1):
     - FlutterMacOS
   - pasteboard (0.0.1):
@@ -186,6 +190,7 @@ DEPENDENCIES:
   - firebase_analytics (from `Flutter/ephemeral/.symlinks/plugins/firebase_analytics/macos`)
   - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
   - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`)
+  - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`)
   - flutter_udid (from `Flutter/ephemeral/.symlinks/plugins/flutter_udid/macos`)
   - flutter_webrtc (from `Flutter/ephemeral/.symlinks/plugins/flutter_webrtc/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
@@ -218,6 +223,7 @@ SPEC REPOS:
     - GoogleDataTransport
     - GoogleUtilities
     - nanopb
+    - OrderedSet
     - PromisesObjC
     - SAMKeychain
     - WebRTC-SDK
@@ -241,6 +247,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos
   firebase_messaging:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos
+  flutter_inappwebview_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos
   flutter_udid:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_udid/macos
   flutter_webrtc:
@@ -288,14 +296,15 @@ SPEC CHECKSUMS:
   file_saver: 44e6fbf666677faf097302460e214e977fdd977b
   file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
   Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
-  firebase_analytics: 5249f87da6fed852901581aab2602e0280ec2fdb
-  firebase_core: 6d9bb8b0ea817e8fe0d928177d42275b45fdba6f
-  firebase_messaging: ae8e88b586e4d50abc7cac5bacf74d21967fd226
+  firebase_analytics: 91efc58e8e37964469fdd59ad11ba36bc97e75d6
+  firebase_core: 75e003524565fb5bd80c9960bc5892e8475821cd
+  firebase_messaging: 082a385eb98b5bb843a566cb30404859c4bd6e25
   FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7
   FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
   FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c
   FirebaseMessaging: e1aca1fcc23e8b9eddb0e33f375ff90944623021
+  flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b
   flutter_udid: 2e7b3da4b5fdfba86a396b97898f5fe8f4ec1a52
   flutter_webrtc: d55fd3f5c75b42940b6b4b2cf376a5797398d1f8
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
@@ -309,6 +318,7 @@ SPEC CHECKSUMS:
   media_kit_native_event_loop: 81fd5b45192b72f8b5b69eaf5b540f45777eb8d5
   media_kit_video: c75b07f14d59706c775778e4dd47dd027de8d1e5
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
   pasteboard: 9b69dba6fedbb04866be632205d532fe2f6b1d99
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46

pubspec.lock

@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "27899c95f9e7ec06c8310e6e0eac967707714b9f1450c4a58fa00ca011a4a8ae"
+      sha256: e4f2a7ef31b0ab2c89d2bde35ef3e6e6aff1dce5e66069c6540b0e9cfe33ee6b
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.49"
+    version: "1.3.50"
   _macros:
     dependency: transitive
     description: dart
@@ -338,10 +338,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
+      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.7"
+    version: "2.3.8"
   dart_webrtc:
     dependency: "direct main"
     description:
@@ -418,10 +418,10 @@ packages:
     dependency: "direct main"
     description:
       name: easy_localization
-      sha256: fa59bcdbbb911a764aa6acf96bbb6fa7a5cf8234354fc45ec1a43a0349ef0201
+      sha256: "0f5239c7b8ab06c66440cfb0e9aa4b4640429c6668d5a42fe389c5de42220b12"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "3.0.7+1"
   easy_localization_loader:
     dependency: "direct main"
     description:
@@ -538,34 +538,34 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_analytics
-      sha256: "498c6cb8468e348a556709c745d92a52173ab3a9b906aa0593393f0787f201ea"
+      sha256: eac382bbcd5ae78c1d1ce5619d13f5a7424429f4bf55df9e3ad5110da34d1060
       url: "https://pub.dev"
     source: hosted
-    version: "11.4.0"
+    version: "11.4.1"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_analytics_platform_interface
-      sha256: ccbb350554e98afdb4b59852689292d194d31232a2647b5012a66622b3711df9
+      sha256: a34db46c367265c4c961626e4b128bfb7b7e50958e7add4c27ba103f5f81b9b0
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.0"
+    version: "4.3.1"
   firebase_analytics_web:
     dependency: transitive
     description:
       name: firebase_analytics_web
-      sha256: "68e1f18fc16482c211c658e739c25f015b202a260d9ad8249c6d3d7963b8105f"
+      sha256: b6b4cef08e45e4c7d48476d9fc49fe9577081809a59026fe95b1a1b1eea165fa
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.10+6"
+    version: "0.5.10+7"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "0307c1fde82e2b8b97e0be2dab93612aff9a72f31ebe9bfac66ed8b37ef7c568"
+      sha256: d851c1ca98fd5a4c07c747f8c65dacc2edd84a4d9ac055d32a5f0342529069f5
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.0"
+    version: "3.10.1"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -586,26 +586,26 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "48a8a59197c1c5174060ba9aa1e0036e9b5a0d28a0cc22d19c1fcabc67fafe3c"
+      sha256: e20ea2a0ecf9b0971575ab3ab42a6e285a94e50092c555b090c1a588a81b4d54
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.0"
+    version: "15.2.1"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "9770a8e91f54296829dcaa61ce9b7c2f9ae9abbf99976dd3103a60470d5264dd"
+      sha256: c57a92b5ae1857ef4fe4ae2e73452b44d32e984e15ab8b53415ea1bb514bdabd
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.0"
+    version: "4.6.1"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "329ca4ef45ec616abe6f1d5e58feed0934a50840a65aa327052354ad3c64ed77"
+      sha256: "83694a990d8525d6b01039240b97757298369622ca0253ad0ebcfed221bf8ee0"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.0"
+    version: "3.10.1"
   fixnum:
     dependency: transitive
     description:
@@ -675,6 +675,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  flutter_inappwebview:
+    dependency: "direct main"
+    description:
+      name: flutter_inappwebview
+      sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.5"
+  flutter_inappwebview_android:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_android
+      sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  flutter_inappwebview_internal_annotations:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_internal_annotations
+      sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  flutter_inappwebview_ios:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_ios
+      sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  flutter_inappwebview_macos:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_macos
+      sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  flutter_inappwebview_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_platform_interface
+      sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0+1"
+  flutter_inappwebview_web:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_web
+      sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  flutter_inappwebview_windows:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_windows
+      sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
@@ -766,10 +830,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_webrtc
-      sha256: "188401cc3275bc4f1f965babdff6cac612a4b46572f1e49f49db8af5361d5712"
+      sha256: "4c76069f724f79dc6e8739c8f16c2ee00ca30a1f8e3aa75c0e830f8183278f03"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.7"
   freezed:
     dependency: "direct dev"
     description:
@@ -814,18 +878,18 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   go_router:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d"
+      sha256: daf3ff5570f55396b2d2c9bf8136d7db3a8acf208ac0cef92a3ae2beb9a81550
       url: "https://pub.dev"
     source: hosted
-    version: "14.6.3"
+    version: "14.7.1"
   google_fonts:
     dependency: "direct main"
     description:
@@ -875,7 +939,7 @@ packages:
     source: hosted
     version: "0.7.0"
   html:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: html
       sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
@@ -886,10 +950,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.3.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -966,10 +1030,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_macos
-      sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62"
+      sha256: "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.1+2"
   image_picker_platform_interface:
     dependency: transitive
     description:
@@ -1646,18 +1710,18 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a
+      sha256: c59819dacc6669a1165d54d2735a9543f136f9b3cec94ca65cea6ab8dffc422e
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.4.0"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5"
+      sha256: "650584dcc0a39856f369782874e562efd002a9c94aec032412c9eb81419cce1f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.4"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -2107,10 +2171,10 @@ packages:
     dependency: "direct main"
     description:
       name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   webrtc_interface:
     dependency: transitive
     description:
@@ -2123,10 +2187,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29"
+      sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e
       url: "https://pub.dev"
     source: hosted
-    version: "5.10.0"
+    version: "5.10.1"
   win32_registry:
     dependency: transitive
     description:

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.2+55
+version: 2.2.2+58
 
 environment:
   sdk: ^3.5.4
@@ -115,6 +115,8 @@ dependencies:
   slide_countdown: ^2.0.2
   video_compress: ^3.1.3
   cached_network_image: ^3.4.1
+  flutter_inappwebview: ^6.1.5
+  html: ^0.15.5
 
 dev_dependencies:
   flutter_test:

web/index.html

@@ -16,6 +16,8 @@
     -->
     <base href="$FLUTTER_BASE_HREF">
 
+    <script type="application/javascript" src="/assets/packages/flutter_inappwebview_web/assets/web/web_support.js" defer></script>
+
     <meta charset="UTF-8">
     <meta content="IE=Edge" http-equiv="X-UA-Compatible">
     <meta name="description" content="A new Flutter project.">

windows/flutter/generated_plugin_registrant.cc

@@ -11,6 +11,7 @@
 #include <file_saver/file_saver_plugin.h>
 #include <file_selector_windows/file_selector_windows.h>
 #include <firebase_core/firebase_core_plugin_c_api.h>
+#include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
 #include <flutter_udid/flutter_udid_plugin_c_api.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
 #include <gal/gal_plugin_c_api.h>
@@ -34,6 +35,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
   FirebaseCorePluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
+  FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
   FlutterUdidPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterUdidPluginCApi"));
   FlutterWebRTCPluginRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   file_saver
   file_selector_windows
   firebase_core
+  flutter_inappwebview_windows
   flutter_udid
   flutter_webrtc
   gal