45 changed files with 1052 additions and 1206 deletions
--- a/assets/translations/en-US.json
+++ b/assets/translations/en-US.json
@ -193,9 +193,6 @@
  "settingsColorSchemeDescription": "Set the application primary color.",
  "settingsColorSeed": "Color Seed",
  "settingsColorSeedDescription": "Select one of the present color schemes.",
-  "settingsFeatures": "Features",
-  "settingsNotifyWithHaptic": "Haptic when Notified",
-  "settingsNotifyWithHapticDescription": "Vibrate lightly when a new notification appears in the foreground.",
  "settingsNetwork": "Network",
  "settingsNetworkServer": "HyperNet Server",
  "settingsNetworkServerDescription": "Set the HyperNet server address, choose ours or build your own.",
--- a/assets/translations/zh-CN.json
+++ b/assets/translations/zh-CN.json
@ -191,9 +191,6 @@
  "settingsColorSchemeDescription": "设置应用主题色。",
  "settingsColorSeed": "预设色彩主题",
  "settingsColorSeedDescription": "选择一个预设色彩主题。",
-  "settingsFeatures": "功能",
-  "settingsNotifyWithHaptic": "新通知时振动",
-  "settingsNotifyWithHapticDescription": "在应用在前台时收到新通知出现时出发轻量的振动。",
  "settingsNetwork": "网络",
  "settingsNetworkServer": "HyperNet 服务器",
  "settingsNetworkServerDescription": "设置 HyperNet 服务器地址，选择我们提供的，或者自己搭建。",
--- a/assets/translations/zh-HK.json
+++ b/assets/translations/zh-HK.json
@ -191,9 +191,6 @@
  "settingsColorSchemeDescription": "設置應用主題色。",
  "settingsColorSeed": "預設色彩主題",
  "settingsColorSeedDescription": "選擇一個預設色彩主題。",
-  "settingsFeatures": "功能",
-  "settingsNotifyWithHaptic": "新通知時振動",
-  "settingsNotifyWithHapticDescription": "在應用在前台時收到新通知出現時出發輕量的振動。",
  "settingsNetwork": "網絡",
  "settingsNetworkServer": "HyperNet 服務器",
  "settingsNetworkServerDescription": "設置 HyperNet 服務器地址，選擇我們提供的，或者自己搭建。",
@ -216,9 +213,8 @@
  "sensitiveContentCollapsed": "敏感內容已摺疊。",
  "sensitiveContentDescription": "此內容已被標記，可能不適合所有人查看。",
  "sensitiveContentReveal": "顯示內容",
-  "serverConnecting": "正在連接…",
-  "serverDisconnected": "已斷開連接",
-  "serverConnected": "已連接",
+  "serverConnecting": "正在連接服務器…",
+  "serverDisconnected": "已與服務器斷開連接",
  "fieldChatAlias": "頻道別名",
  "fieldChatAliasHint": "全站範圍內唯一的頻道別名，用於在 URL 中表示該頻道，留空則自動生成。應遵循 URL-Safe 的原則。",
  "fieldChatName": "名稱",
@ -296,7 +292,6 @@
  "addAttachmentFromCameraPhoto": "拍攝照片",
  "addAttachmentFromCameraVideo": "拍攝視頻",
  "addAttachmentFromRandomId": "通過訪問 ID 鏈接",
-  "attachmentDetailInfo": "附件詳細信息",
  "attachmentPastedImage": "粘貼的圖片",
  "attachmentInsertLink": "插入連接",
  "attachmentSetAsPostThumbnail": "設置為帖子縮略圖",
--- a/assets/translations/zh-TW.json
+++ b/assets/translations/zh-TW.json
@ -191,9 +191,6 @@
  "settingsColorSchemeDescription": "設置應用主題色。",
  "settingsColorSeed": "預設色彩主題",
  "settingsColorSeedDescription": "選擇一個預設色彩主題。",
-  "settingsFeatures": "功能",
-  "settingsNotifyWithHaptic": "新通知時振動",
-  "settingsNotifyWithHapticDescription": "在應用在前臺時收到新通知出現時出發輕量的振動。",
  "settingsNetwork": "網絡",
  "settingsNetworkServer": "HyperNet 服務器",
  "settingsNetworkServerDescription": "設置 HyperNet 服務器地址，選擇我們提供的，或者自己搭建。",
@ -216,9 +213,8 @@
  "sensitiveContentCollapsed": "敏感內容已摺疊。",
  "sensitiveContentDescription": "此內容已被標記，可能不適合所有人查看。",
  "sensitiveContentReveal": "顯示內容",
-  "serverConnecting": "正在連接…",
-  "serverDisconnected": "已斷開連接",
-  "serverConnected": "已連接",
+  "serverConnecting": "正在連接服務器…",
+  "serverDisconnected": "已與服務器斷開連接",
  "fieldChatAlias": "頻道別名",
  "fieldChatAliasHint": "全站範圍內唯一的頻道別名，用於在 URL 中表示該頻道，留空則自動生成。應遵循 URL-Safe 的原則。",
  "fieldChatName": "名稱",
@ -296,7 +292,6 @@
  "addAttachmentFromCameraPhoto": "拍攝照片",
  "addAttachmentFromCameraVideo": "拍攝視頻",
  "addAttachmentFromRandomId": "通過訪問 ID 鏈接",
-  "attachmentDetailInfo": "附件詳細信息",
  "attachmentPastedImage": "粘貼的圖片",
  "attachmentInsertLink": "插入連接",
  "attachmentSetAsPostThumbnail": "設置為帖子縮略圖",
--- a/lib/providers/config.dart
+++ b/lib/providers/config.dart
@ -14,7 +14,6 @@ const kAppbarTransparentStoreKey = 'app_bar_transparent';
 const kAppBackgroundStoreKey = 'app_has_background';
 const kAppColorSchemeStoreKey = 'app_color_scheme';
 const kAppDrawerPreferCollapse = 'app_drawer_prefer_collapse';
-const kAppNotifyWithHaptic = 'app_notify_with_haptic';

 const Map<String, FilterQuality> kImageQualityLevel = {
  'settingsImageQualityLowest': FilterQuality.none,
--- a/lib/providers/notification.dart
+++ b/lib/providers/notification.dart
@ -4,10 +4,8 @@ import 'dart:io';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_udid/flutter_udid.dart';
 import 'package:provider/provider.dart';
-import 'package:surface/providers/config.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/websocket.dart';
@ -17,13 +15,11 @@ class NotificationProvider extends ChangeNotifier {
  late final SnNetworkProvider _sn;
  late final UserProvider _ua;
  late final WebSocketProvider _ws;
-  late final ConfigProvider _cfg;

  NotificationProvider(BuildContext context) {
    _sn = context.read<SnNetworkProvider>();
    _ua = context.read<UserProvider>();
    _ws = context.read<WebSocketProvider>();
-    _cfg = context.read<ConfigProvider>();
  }

  Future<void> registerPushNotifications() async {
@ -79,8 +75,6 @@ class NotificationProvider extends ChangeNotifier {
        final notification = SnNotification.fromJson(event.payload!);
        notifications.add(notification);
        notifyListeners();
-        final doHaptic = _cfg.prefs.getBool(kAppNotifyWithHaptic) ?? true;
-        if (doHaptic) HapticFeedback.lightImpact();
      }
    });
  }
--- a/lib/router.dart
+++ b/lib/router.dart
@ -36,7 +36,10 @@ import 'package:surface/widgets/navigation/app_scaffold.dart';

 final _appRoutes = [
  ShellRoute(
-    builder: (context, state, child) => child,
+    builder: (context, state, child) => AppPageScaffold(
+      body: child,
+      showAppBar: false,
+    ),
    routes: [
      GoRoute(
        path: '/',
@ -55,7 +58,8 @@ final _appRoutes = [
          GoRoute(
            path: '/write/:mode',
            name: 'postEditor',
-            builder: (context, state) => PostEditorScreen(
+            builder: (context, state) => AppBackground(
+              child: PostEditorScreen(
                mode: state.pathParameters['mode']!,
                postEditId: int.tryParse(
                  state.uri.queryParameters['editing'] ?? '',
@ -69,41 +73,40 @@ final _appRoutes = [
                extraProps: state.extra as PostEditorExtraProps?,
              ),
            ),
+          ),
          GoRoute(
            path: '/search',
            name: 'postSearch',
-            builder: (context, state) => PostSearchScreen(
+            builder: (context, state) => AppBackground(
+              child: 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']!),
+            builder: (context, state) => AppBackground(
+              child: PostPublisherScreen(name: state.pathParameters['name']!),
+            ),
          ),
          GoRoute(
            path: '/:slug',
            name: 'postDetail',
-            builder: (context, state) => PostDetailScreen(
+            builder: (context, state) => AppBackground(
+              child: 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,
-            );
-          },
+        pageBuilder: (context, state) => NoTransitionPage(
          child: const AccountScreen(),
        ),
        routes: [],
@ -111,15 +114,7 @@ final _appRoutes = [
      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,
-            );
-          },
+        pageBuilder: (context, state) => NoTransitionPage(
          child: const ChatScreen(),
        ),
        routes: [
@ -233,45 +228,59 @@ final _appRoutes = [
    ],
  ),
  ShellRoute(
-    builder: (context, state, child) => child,
+    builder: (context, state, child) => AppPageScaffold(body: child),
    routes: [
      GoRoute(
        path: '/auth/login',
        name: 'authLogin',
-        builder: (context, state) => LoginScreen(),
+        builder: (context, state) => const AppBackground(
+          child: LoginScreen(),
+        ),
      ),
      GoRoute(
        path: '/auth/register',
        name: 'authRegister',
-        builder: (context, state) => RegisterScreen(),
+        builder: (context, state) => const AppBackground(
+          child: RegisterScreen(),
+        ),
      ),
      GoRoute(
        path: '/reports',
        name: 'abuseReport',
-        builder: (context, state) => AbuseReportScreen(),
+        builder: (context, state) => const AppBackground(
+          child: AbuseReportScreen(),
+        ),
      ),
      GoRoute(
        path: '/account/profile/edit',
        name: 'accountProfileEdit',
-        builder: (context, state) => ProfileEditScreen(),
+        builder: (context, state) => const AppBackground(
+          child: ProfileEditScreen(),
+        ),
      ),
      GoRoute(
        path: '/account/publishers',
        name: 'accountPublishers',
-        builder: (context, state) => PublisherScreen(),
+        builder: (context, state) => const AppBackground(
+          child: PublisherScreen(),
+        ),
      ),
      GoRoute(
        path: '/account/publishers/new',
        name: 'accountPublisherNew',
-        builder: (context, state) => AccountPublisherNewScreen(),
+        builder: (context, state) => const AppBackground(
+          child: AccountPublisherNewScreen(),
+        ),
      ),
      GoRoute(
        path: '/account/publishers/edit/:name',
        name: 'accountPublisherEdit',
-        builder: (context, state) => AccountPublisherEditScreen(
+        builder: (context, state) => AppBackground(
+          child: AccountPublisherEditScreen(
            name: state.pathParameters['name']!,
          ),
        ),
+      ),
    ],
  ),
  GoRoute(
@ -282,22 +291,26 @@ final _appRoutes = [
    ),
  ),
  ShellRoute(
-    builder: (context, state, child) => child,
+    builder: (context, state, child) => AppPageScaffold(body: child),
    routes: [
      GoRoute(
        path: '/settings',
        name: 'settings',
-        builder: (context, state) => SettingsScreen(),
+        builder: (context, state) => const AppBackground(
+          child: SettingsScreen(),
+        ),
      ),
    ],
  ),
  ShellRoute(
-    builder: (context, state, child) => child,
+    builder: (context, state, child) => AppPageScaffold(body: child),
    routes: [
      GoRoute(
        path: '/about',
        name: 'about',
-        builder: (context, state) => AboutScreen(),
+        builder: (context, state) => const AppBackground(
+          child: AboutScreen(),
+        ),
      ),
    ],
  ),
--- a/lib/screens/abuse_report.dart
+++ b/lib/screens/abuse_report.dart
@ -6,7 +6,6 @@ import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';

 import '../types/account.dart';

@ -57,11 +56,7 @@ class _AbuseReportScreenState extends State<AbuseReportScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenAbuseReport').tr(),
-      ),
+    return Scaffold(
      body: Column(
        children: [
          ListTile(
@ -78,7 +73,6 @@ class _AbuseReportScreenState extends State<AbuseReportScreen> {
          else
            Expanded(
              child: ListView.builder(
-                padding: EdgeInsets.only(top: 8),
                itemCount: _reports.length,
                itemBuilder: (context, idx) {
                  return ListTile(
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@ -12,7 +12,6 @@ import 'package:surface/providers/websocket.dart';
 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';

 class AccountScreen extends StatelessWidget {
  const AccountScreen({super.key});
@ -21,7 +20,7 @@ class AccountScreen extends StatelessWidget {
  Widget build(BuildContext context) {
    final ua = context.watch<UserProvider>();

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        leading: AutoAppBarLeading(),
        title: Text("screenAccount").tr(),
--- a/lib/screens/account/profile_edit.dart
+++ b/lib/screens/account/profile_edit.dart
@ -18,7 +18,6 @@ import 'package:surface/providers/userinfo.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/universal_image.dart';

 class ProfileEditScreen extends StatefulWidget {
@ -82,7 +81,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
            onDateTimeChanged: (DateTime newDate) {
              setState(() {
                _birthday = newDate;
-                _birthdayController.text = DateFormat(_kDateFormat).format(_birthday!);
+                _birthdayController.text =
+                    DateFormat(_kDateFormat).format(_birthday!);
              });
            },
          ),
@ -96,9 +96,11 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
    if (image == null) return;
    if (!mounted) return;

-    final ImageProvider imageProvider = kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
-    final aspectRatios =
-        place == 'banner' ? [CropAspectRatio(width: 16, height: 7)] : [CropAspectRatio(width: 1, height: 1)];
+    final ImageProvider imageProvider =
+        kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
+    final aspectRatios = place == 'banner'
+        ? [CropAspectRatio(width: 16, height: 7)]
+        : [CropAspectRatio(width: 1, height: 1)];
    final result = (!kIsWeb && (Platform.isIOS || Platform.isMacOS))
        ? await showCupertinoImageCropper(
            // ignore: use_build_context_synchronously
@ -120,7 +122,10 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {

    setState(() => _isBusy = true);

-    final rawBytes = (await result.uiImage.toByteData(format: ImageByteFormat.png))!.buffer.asUint8List();
+    final rawBytes =
+        (await result.uiImage.toByteData(format: ImageByteFormat.png))!
+            .buffer
+            .asUint8List();

    try {
      final attachment = await attach.directUploadOne(
@ -207,12 +212,7 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {

    final sn = context.read<SnNetworkProvider>();

-    return AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenAccountProfileEdit').tr(),
-      ),
-      body: SingleChildScrollView(
+    return SingleChildScrollView(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
@ -229,7 +229,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                    child: AspectRatio(
                      aspectRatio: 16 / 9,
                      child: Container(
-                          color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                        color:
+                            Theme.of(context).colorScheme.surfaceContainerHigh,
                        child: _banner != null
                            ? AutoResizeUniversalImage(
                                sn.getAttachmentUrl(_banner!),
@ -342,7 +343,6 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
          ).padding(horizontal: padding),
        ],
      ),
-      ),
    );
  }
 }
--- a/lib/screens/account/profile_page.dart
+++ b/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 = {
@ -242,7 +241,6 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
    final sn = context.read<SnNetworkProvider>();

    return Scaffold(
-      backgroundColor: Colors.transparent,
      body: CustomScrollView(
        controller: _scrollController,
        slivers: [
--- a/lib/screens/account/publishers/publisher_edit.dart
+++ b/lib/screens/account/publishers/publisher_edit.dart
@ -18,7 +18,6 @@ import 'package:surface/types/post.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/universal_image.dart';

 class AccountPublisherEditScreen extends StatefulWidget {
@ -177,7 +176,7 @@ class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen>
  Widget build(BuildContext context) {
    final sn = context.read<SnNetworkProvider>();

-    return AppScaffold(
+    return Scaffold(
      body: SingleChildScrollView(
        child: Column(
          children: [
--- a/lib/screens/account/publishers/publisher_new.dart
+++ b/lib/screens/account/publishers/publisher_new.dart
@ -10,7 +10,6 @@ import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/realm.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';

 class AccountPublisherNewScreen extends StatefulWidget {
  const AccountPublisherNewScreen({super.key});
@ -25,11 +24,7 @@ class _AccountPublisherNewScreenState extends State<AccountPublisherNewScreen> {

  @override
  Widget build(BuildContext context) {
-    return  AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenAccountPublisherNew').tr(),
-      ),
+    return Scaffold(
      body: SingleChildScrollView(
        child: Column(
          children: [
--- a/lib/screens/account/publishers/publishers.dart
+++ b/lib/screens/account/publishers/publishers.dart
@ -10,7 +10,6 @@ import 'package:surface/types/post.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';

 class PublisherScreen extends StatefulWidget {
  const PublisherScreen({super.key});
@ -33,7 +32,8 @@ class _PublisherScreenState extends State<PublisherScreen> {

    try {
      final resp = await sn.client.get('/cgi/co/publishers/me');
-      final List<SnPublisher> out = List<SnPublisher>.from(resp.data?.map((e) => SnPublisher.fromJson(e)) ?? []);
+      final List<SnPublisher> out = List<SnPublisher>.from(
+          resp.data?.map((e) => SnPublisher.fromJson(e)) ?? []);

      if (!mounted) return;

@ -53,11 +53,7 @@ class _PublisherScreenState extends State<PublisherScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenAccountPublishers').tr(),
-      ),
+    return Scaffold(
      body: Column(
        children: [
          ListTile(
@ -66,7 +62,9 @@ class _PublisherScreenState extends State<PublisherScreen> {
            contentPadding: const EdgeInsets.symmetric(horizontal: 24),
            leading: const Icon(Symbols.add_circle),
            onTap: () {
-              GoRouter.of(context).pushNamed('accountPublisherNew').then((value) {
+              GoRouter.of(context)
+                  .pushNamed('accountPublisherNew')
+                  .then((value) {
                if (value == true) {
                  _publishers.clear();
                  _fetchPublishers();
@ -77,9 +75,6 @@ class _PublisherScreenState extends State<PublisherScreen> {
          const Divider(height: 1),
          LoadingIndicator(isActive: _isBusy),
          Expanded(
-            child: MediaQuery.removePadding(
-              context: context,
-              removeTop: true,
            child: RefreshIndicator(
              onRefresh: () {
                _publishers.clear();
@ -125,7 +120,6 @@ class _PublisherScreenState extends State<PublisherScreen> {
              ),
            ),
          ),
-          ),
        ],
      ),
    );
--- a/lib/screens/album.dart
+++ b/lib/screens/album.dart
@ -11,7 +11,6 @@ import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/attachment/attachment_zoom.dart';
 import 'package:surface/widgets/attachment/attachment_item.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:uuid/uuid.dart';

 class AlbumScreen extends StatefulWidget {
@ -83,7 +82,7 @@ class _AlbumScreenState extends State<AlbumScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
+    return Scaffold(
      body: CustomScrollView(
        controller: _scrollController,
        slivers: [
--- a/lib/screens/auth/login.dart
+++ b/lib/screens/auth/login.dart
@ -9,7 +9,6 @@ import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/auth.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:url_launcher/url_launcher_string.dart';

 import '../../providers/websocket.dart';
@ -36,12 +35,7 @@ class _LoginScreenState extends State<LoginScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenAuthLogin').tr(),
-      ),
-      body: Theme(
+    return Theme(
      data: Theme.of(context).copyWith(canvasColor: Colors.transparent),
      child: SingleChildScrollView(
        child: PageTransitionSwitcher(
@ -102,7 +96,6 @@ class _LoginScreenState extends State<LoginScreen> {
          },
        ).padding(all: 24),
      ).center(),
-      ),
    );
  }
 }
--- a/lib/screens/auth/register.dart
+++ b/lib/screens/auth/register.dart
@ -8,7 +8,6 @@ import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:url_launcher/url_launcher_string.dart';

 class RegisterScreen extends StatefulWidget {
@ -55,12 +54,7 @@ class _RegisterScreenState extends State<RegisterScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenAuthRegister').tr(),
-      ),
-      body: StyledWidget(Container(
+    return StyledWidget(Container(
      constraints: const BoxConstraints(maxWidth: 380),
      child: SingleChildScrollView(
        child: Column(
@ -186,7 +180,10 @@ class _RegisterScreenState extends State<RegisterScreen> {
                        '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(
@ -226,7 +223,6 @@ class _RegisterScreenState extends State<RegisterScreen> {
          ],
        ),
      ),
-      )).padding(all: 24).center(),
-    );
+    )).padding(all: 24).center();
  }
 }
--- a/lib/screens/chat.dart
+++ b/lib/screens/chat.dart
@ -13,7 +13,6 @@ import 'package:surface/widgets/account/account_select.dart';
 import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/unauthorized_hint.dart';
 import 'package:uuid/uuid.dart';

@ -121,7 +120,7 @@ class _ChatScreenState extends State<ChatScreen> {
    final ua = context.read<UserProvider>();

    if (!ua.isAuthorized) {
-      return AppScaffold(
+      return Scaffold(
        appBar: AppBar(
          leading: AutoAppBarLeading(),
          title: Text('screenChat').tr(),
@ -132,7 +131,7 @@ class _ChatScreenState extends State<ChatScreen> {
      );
    }

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        leading: AutoAppBarLeading(),
        title: Text('screenChat').tr(),
@ -196,9 +195,6 @@ class _ChatScreenState extends State<ChatScreen> {
        children: [
          LoadingIndicator(isActive: _isBusy),
          Expanded(
-            child: MediaQuery.removePadding(
-              context: context,
-              removeTop: true,
            child: RefreshIndicator(
              onRefresh: () => Future.sync(() => _refreshChannels()),
              child: ListView.builder(
@ -280,7 +276,6 @@ class _ChatScreenState extends State<ChatScreen> {
              ),
            ),
          ),
-          ),
        ],
      ),
    );
--- a/lib/screens/chat/call_room.dart
+++ b/lib/screens/chat/call_room.dart
@ -9,7 +9,6 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/chat_call.dart';
 import 'package:surface/widgets/chat/call/call_controls.dart';
 import 'package:surface/widgets/chat/call/call_participant.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';

 class CallRoomScreen extends StatefulWidget {
  final String scope;
@ -153,7 +152,7 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
    return ListenableBuilder(
        listenable: call,
        builder: (context, _) {
-          return AppScaffold(
+          return Scaffold(
            appBar: AppBar(
              title: RichText(
                textAlign: TextAlign.center,
--- a/lib/screens/chat/channel_detail.dart
+++ b/lib/screens/chat/channel_detail.dart
@ -14,7 +14,6 @@ import 'package:surface/types/chat.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';

 class ChannelDetailScreen extends StatefulWidget {
@ -190,7 +189,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {

    final isOwned = ua.isAuthorized && _channel?.accountId == ua.user?.id;

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        title: _channel != null ? Text(_channel!.name) : Text('loading').tr(),
      ),
--- a/lib/screens/chat/manage.dart
+++ b/lib/screens/chat/manage.dart
@ -12,7 +12,6 @@ import 'package:surface/types/realm.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:uuid/uuid.dart';

 class ChatManageScreen extends StatefulWidget {
@ -122,7 +121,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        title: widget.editingChannelAlias != null
            ? Text('screenChatManage').tr()
--- a/lib/screens/chat/room.dart
+++ b/lib/screens/chat/room.dart
@ -20,7 +20,6 @@ import 'package:surface/widgets/chat/chat_message_input.dart';
 import 'package:surface/widgets/chat/chat_typing_indicator.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';

 import '../../providers/user_directory.dart';
@ -212,7 +211,7 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
    final call = context.watch<ChatCallProvider>();
    final ud = context.read<UserDirectoryProvider>();

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        title: Text(
          _channel?.type == 1
--- a/lib/screens/explore.dart
+++ b/lib/screens/explore.dart
@ -13,7 +13,6 @@ import 'package:surface/screens/post/post_detail.dart';
 import 'package:surface/types/post.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/post/post_item.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';

@ -96,7 +95,7 @@ class _ExploreScreenState extends State<ExploreScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
+    return Scaffold(
      floatingActionButtonLocation: ExpandableFab.location,
      floatingActionButton: ExpandableFab(
        key: _fabKey,
@ -213,7 +212,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
                ),
              ),
            ),
-            const SliverGap(12),
+            const SliverGap(8),
            SliverInfiniteList(
              itemCount: _posts.length,
              isLoading: _isBusy,
@ -243,10 +242,10 @@ class _ExploreScreenState extends State<ExploreScreen> {
                    ),
                    openColor: Colors.transparent,
                    openElevation: 0,
-                    closedColor: Theme.of(context).colorScheme.surfaceContainerLow.withOpacity(0.75),
+                    closedColor: Theme.of(context).colorScheme.surface,
                    transitionType: ContainerTransitionType.fade,
                    closedShape: const RoundedRectangleBorder(
-                      borderRadius: BorderRadius.all(Radius.circular(16)),
+                      borderRadius: BorderRadius.all(Radius.circular(8)),
                    ),
                  ),
                );
--- a/lib/screens/friend.dart
+++ b/lib/screens/friend.dart
@ -11,7 +11,6 @@ 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/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';

 import '../providers/userinfo.dart';
 import '../widgets/unauthorized_hint.dart';
@ -181,7 +180,7 @@ class _FriendScreenState extends State<FriendScreen> {
    final ua = context.read<UserProvider>();

    if (!ua.isAuthorized) {
-      return AppScaffold(
+      return Scaffold(
        appBar: AppBar(
          leading: AutoAppBarLeading(),
          title: Text('screenFriend').tr(),
@ -192,7 +191,7 @@ class _FriendScreenState extends State<FriendScreen> {
      );
    }

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        leading: AutoAppBarLeading(),
        title: Text('screenFriend').tr(),
@ -234,9 +233,6 @@ class _FriendScreenState extends State<FriendScreen> {
          if (_requests.isNotEmpty || _blocks.isNotEmpty)
            const Divider(height: 1),
          Expanded(
-            child: MediaQuery.removePadding(
-              context: context,
-              removeTop: true,
            child: RefreshIndicator(
              onRefresh: () => Future.wait([
                _fetchRelations(),
@ -286,7 +282,6 @@ class _FriendScreenState extends State<FriendScreen> {
              ),
            ),
          ),
-          ),
        ],
      ),
    );
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@ -25,7 +25,6 @@ import 'package:surface/types/check_in.dart';
 import 'package:surface/types/post.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/post/post_item.dart';

 class HomeScreenDashEntry {
@ -68,7 +67,7 @@ class _HomeScreenState extends State<HomeScreen> {

  @override
  Widget build(BuildContext context) {
-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        leading: AutoAppBarLeading(),
        title: Text("screenHome").tr(),
@ -388,8 +387,6 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> {
                        Text(
                          'dailyCheckInNone',
                          style: Theme.of(context).textTheme.bodyLarge,
-                          maxLines: 2,
-                          overflow: TextOverflow.ellipsis,
                        ).tr(),
                      ],
                    )
--- a/lib/screens/notification.dart
+++ b/lib/screens/notification.dart
@ -14,7 +14,6 @@ import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
 import 'package:surface/widgets/markdown_content.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/post/post_item.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';

@ -138,7 +137,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
    final ua = context.read<UserProvider>();

    if (!ua.isAuthorized) {
-      return AppScaffold(
+      return Scaffold(
        appBar: AppBar(
          leading: AutoAppBarLeading(),
          title: Text('screenNotification').tr(),
@ -149,7 +148,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
      );
    }

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        leading: AutoAppBarLeading(),
        title: Text('screenNotification').tr(),
--- a/lib/screens/post/post_detail.dart
+++ b/lib/screens/post/post_detail.dart
@ -14,7 +14,6 @@ import 'package:surface/types/post.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
 import 'package:surface/widgets/navigation/app_background.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/post/post_comment_list.dart';
 import 'package:surface/widgets/post/post_item.dart';
 import 'package:surface/widgets/post/post_mini_editor.dart';
@ -68,7 +67,7 @@ class _PostDetailScreenState extends State<PostDetailScreen> {

    return AppBackground(
      isRoot: widget.onBack != null,
-      child: AppScaffold(
+      child: Scaffold(
        appBar: AppBar(
          leading: BackButton(
            onPressed: () {
--- a/lib/screens/post/post_editor.dart
+++ b/lib/screens/post/post_editor.dart
@ -13,7 +13,6 @@ import 'package:surface/providers/sn_network.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/post/post_item.dart';
 import 'package:surface/widgets/post/post_media_pending_list.dart';
 import 'package:surface/widgets/post/post_meta_editor.dart';
@ -129,7 +128,7 @@ class _PostEditorScreenState extends State<PostEditorScreen> {
    return ListenableBuilder(
      listenable: _writeController,
      builder: (context, _) {
-        return AppScaffold(
+        return Scaffold(
          appBar: AppBar(
            leading: BackButton(
              onPressed: () {
--- a/lib/screens/post/post_search.dart
+++ b/lib/screens/post/post_search.dart
@ -8,7 +8,6 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/post.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/post/post_item.dart';
 import 'package:surface/widgets/post/post_tags_field.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';
@ -120,7 +119,7 @@ class _PostSearchScreenState extends State<PostSearchScreen> {
      ),
    ];

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        title: Text('screenPostSearch').tr(),
        actions: [
--- a/lib/screens/post/publisher_page.dart
+++ b/lib/screens/post/publisher_page.dart
@ -17,7 +17,6 @@ import 'package:surface/types/post.dart';
 import 'package:surface/types/realm.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/post/post_item.dart';
 import 'package:surface/widgets/universal_image.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';
@ -275,7 +274,7 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> with SingleTi

    final sn = context.read<SnNetworkProvider>();

-    return AppScaffold(
+    return Scaffold(
      body: NestedScrollView(
        controller: _scrollController,
        headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
--- a/lib/screens/realm.dart
+++ b/lib/screens/realm.dart
@ -12,7 +12,6 @@ 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/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/unauthorized_hint.dart';
 import 'package:surface/widgets/universal_image.dart';

@ -84,7 +83,7 @@ class _RealmScreenState extends State<RealmScreen> {
    final ua = context.read<UserProvider>();

    if (!ua.isAuthorized) {
-      return AppScaffold(
+      return Scaffold(
        appBar: AppBar(
          leading: AutoAppBarLeading(),
          title: Text('screenRealm').tr(),
@ -95,7 +94,7 @@ class _RealmScreenState extends State<RealmScreen> {
      );
    }

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        leading: AutoAppBarLeading(),
        title: Text('screenRealm').tr(),
@ -119,9 +118,6 @@ class _RealmScreenState extends State<RealmScreen> {
        children: [
          LoadingIndicator(isActive: _isBusy),
          Expanded(
-            child: MediaQuery.removePadding(
-              context: context,
-              removeTop: true,
            child: RefreshIndicator(
              onRefresh: _fetchRealms,
              child: ListView.builder(
@ -200,9 +196,7 @@ class _RealmScreenState extends State<RealmScreen> {
                                clipBehavior: Clip.none,
                                fit: StackFit.expand,
                                children: [
-                                    ClipRRect(
-                                      borderRadius: const BorderRadius.all(Radius.circular(8)),
-                                      child: Container(
+                                  Container(
                                    color: Theme.of(context).colorScheme.surfaceContainer,
                                    child: (realm.banner?.isEmpty ?? true)
                                        ? const SizedBox.shrink()
@ -211,7 +205,6 @@ class _RealmScreenState extends State<RealmScreen> {
                                            fit: BoxFit.cover,
                                          ),
                                  ),
-                                    ),
                                  Positioned(
                                    bottom: -30,
                                    left: 18,
@ -247,7 +240,6 @@ class _RealmScreenState extends State<RealmScreen> {
              ),
            ),
          ),
-          ),
        ],
      ),
    );
--- a/lib/screens/realm/manage.dart
+++ b/lib/screens/realm/manage.dart
@ -18,7 +18,6 @@ import 'package:surface/types/realm.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/universal_image.dart';
 import 'package:uuid/uuid.dart';

@ -180,7 +179,7 @@ class _RealmManageScreenState extends State<RealmManageScreen> {
  Widget build(BuildContext context) {
    final sn = context.read<SnNetworkProvider>();

-    return AppScaffold(
+    return Scaffold(
      appBar: AppBar(
        title: widget.editingRealmAlias != null
            ? Text('screenRealmManage').tr()
--- a/lib/screens/realm/realm_detail.dart
+++ b/lib/screens/realm/realm_detail.dart
@ -8,13 +8,13 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/user_directory.dart';
 import 'package:surface/providers/userinfo.dart';
-import 'package:surface/types/post.dart';
 import 'package:surface/types/realm.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:very_good_infinite_list/very_good_infinite_list.dart';

+import '../../types/post.dart';
+
 class RealmDetailScreen extends StatefulWidget {
  final String alias;

@ -70,11 +70,19 @@ class _RealmDetailScreenState extends State<RealmDetailScreen> {
  Widget build(BuildContext context) {
    return DefaultTabController(
      length: 3,
-      child: AppScaffold(
+      child: Scaffold(
        body: NestedScrollView(
          headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+            // These are the slivers that show up in the "outer" scroll view.
            return <Widget>[
              SliverOverlapAbsorber(
+                // This widget takes the overlapping behavior of the SliverAppBar,
+                // and redirects it to the SliverOverlapInjector below. If it is
+                // missing, then it is possible for the nested "inner" scroll view
+                // below to end up under the SliverAppBar even when the inner
+                // scroll view thinks it has not been scrolled.
+                // This is not necessary if the "headerSliverBuilder" only builds
+                // widgets that do not overlap the next sliver.
                handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
                sliver: SliverAppBar(
                  title: Text(_realm?.name ?? 'loading'.tr()),
@ -420,7 +428,7 @@ class _RealmSettingsWidgetState extends State<_RealmSettingsWidget> {

    return Column(
      children: [
-        const Gap(8),
+        const Gap(16),
        ListTile(
          leading: const Icon(Symbols.edit),
          trailing: const Icon(Symbols.chevron_right),
--- a/lib/screens/settings.dart
+++ b/lib/screens/settings.dart
@ -18,7 +18,6 @@ import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/theme.dart';
 import 'package:surface/theme.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';

 const Map<String, Color> kColorSchemes = {
  'colorSchemeIndigo': Colors.indigo,
@ -68,11 +67,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
  Widget build(BuildContext context) {
    final sn = context.read<SnNetworkProvider>();

-    return AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenSettings').tr(),
-      ),
+    return Scaffold(
      body: SingleChildScrollView(
        child: Column(
          spacing: 16,
@ -260,24 +255,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
                ),
              ],
            ),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text('settingsFeatures').bold().fontSize(17).tr().padding(horizontal: 20, bottom: 4),
-                CheckboxListTile(
-                  secondary: const Icon(Symbols.vibration),
-                  contentPadding: const EdgeInsets.only(left: 24, right: 17),
-                  title: Text('settingsNotifyWithHaptic').tr(),
-                  subtitle: Text('settingsNotifyWithHapticDescription').tr(),
-                  value: _prefs.getBool(kAppNotifyWithHaptic) ?? true,
-                  onChanged: (value) {
-                    setState(() {
-                      _prefs.setBool(kAppNotifyWithHaptic, value ?? false);
-                    });
-                  },
-                ),
-              ],
-            ),
            Column(
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
--- a/lib/theme.dart
+++ b/lib/theme.dart
@ -34,10 +34,9 @@ Future<ThemeData> createAppTheme(
  );

  final hasAppBarBlurry = prefs.getBool(kAppbarTransparentStoreKey) ?? false;
-  final useM3 = useMaterial3 ?? (prefs.getBool(kMaterialYouToggleStoreKey) ?? true);

  return ThemeData(
-    useMaterial3: useM3,
+    useMaterial3: useMaterial3 ?? (prefs.getBool(kMaterialYouToggleStoreKey) ?? true),
    colorScheme: colorScheme,
    brightness: brightness,
    iconTheme: IconThemeData(
@ -46,19 +45,17 @@ Future<ThemeData> createAppTheme(
      opticalSize: 20,
      color: colorScheme.onSurface,
    ),
-    snackBarTheme: SnackBarThemeData(
-      behavior: useM3 ? SnackBarBehavior.floating : SnackBarBehavior.fixed,
-    ),
    appBarTheme: AppBarTheme(
      centerTitle: true,
      elevation: hasAppBarBlurry ? 0 : null,
      backgroundColor: hasAppBarBlurry ? colorScheme.primary.withOpacity(0.3) : colorScheme.primary,
      foregroundColor: hasAppBarBlurry ? colorScheme.onSurface : colorScheme.onPrimary,
    ),
+    scaffoldBackgroundColor: Colors.transparent,
    pageTransitionsTheme: PageTransitionsTheme(
      builders: {
        TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
-        TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
+        TargetPlatform.iOS: ZoomPageTransitionsBuilder(),
        TargetPlatform.macOS: ZoomPageTransitionsBuilder(),
        TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
        TargetPlatform.linux: ZoomPageTransitionsBuilder(),
--- a/lib/widgets/about.dart
+++ b/lib/widgets/about.dart
@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:url_launcher/url_launcher_string.dart';

 class AboutScreen extends StatelessWidget {
@ -13,12 +12,7 @@ class AboutScreen extends StatelessWidget {
  Widget build(BuildContext context) {
    const denseButtonStyle = ButtonStyle(visualDensity: VisualDensity(vertical: -4));

-    return AppScaffold(
-      appBar: AppBar(
-        leading: const PageBackButton(),
-        title: Text('screenAbout').tr(),
-      ),
-      body: SizedBox(
+    return SizedBox(
      width: double.infinity,
      child: Column(
        mainAxisAlignment: MainAxisAlignment.center,
@ -110,7 +104,6 @@ class AboutScreen extends StatelessWidget {
          ),
        ],
      ),
-      ),
    );
  }
 }
--- a/lib/widgets/attachment/attachment_list.dart
+++ b/lib/widgets/attachment/attachment_list.dart
@ -15,7 +15,6 @@ class AttachmentList extends StatefulWidget {
  final List<SnAttachment?> data;
  final bool bordered;
  final bool gridded;
-  final bool columned;
  final BoxFit fit;
  final double? maxHeight;
  final double? minWidth;
@ -27,7 +26,6 @@ class AttachmentList extends StatefulWidget {
    required this.data,
    this.bordered = false,
    this.gridded = false,
-    this.columned = false,
    this.fit = BoxFit.cover,
    this.maxHeight,
    this.minWidth,
@ -107,10 +105,45 @@ class _AttachmentListState extends State<AttachmentList> {
          );
        }

+        if (widget.gridded) {
          final fullOfImage =
              widget.data.where((ele) => ele?.mediaType == SnMediaType.image).length == widget.data.length;
-
-        if (widget.gridded && fullOfImage) {
+          if(!fullOfImage) {
+            return Container(
+              margin: widget.padding ?? EdgeInsets.zero,
+              decoration: BoxDecoration(
+                color: backgroundColor,
+                border: Border(
+                  top: borderSide,
+                  bottom: borderSide,
+                ),
+                borderRadius: AttachmentList.kDefaultRadius,
+              ),
+              child: ClipRRect(
+                borderRadius: AttachmentList.kDefaultRadius,
+                child: Column(
+                  spacing: 4,
+                  children: widget.data
+                      .mapIndexed(
+                        (idx, ele) => GestureDetector(
+                          child: AspectRatio(
+                            aspectRatio: ele?.data['ratio']?.toDouble() ?? 1,
+                            child: Container(
+                              constraints: constraints,
+                              child: AttachmentItem(
+                                data: ele,
+                                heroTag: heroTags[idx],
+                                fit: BoxFit.cover,
+                              ),
+                            ),
+                          ),
+                        ),
+                      )
+                      .toList(),
+                ),
+              ),
+            );
+          }
          return Container(
            margin: widget.padding ?? EdgeInsets.zero,
            decoration: BoxDecoration(
@ -158,44 +191,6 @@ class _AttachmentListState extends State<AttachmentList> {
          );
        }

-        if ((!fullOfImage && widget.gridded) || widget.columned) {
-          return Container(
-            margin: widget.padding ?? EdgeInsets.zero,
-            decoration: BoxDecoration(
-              color: backgroundColor,
-              border: Border(
-                top: borderSide,
-                bottom: borderSide,
-              ),
-              borderRadius: AttachmentList.kDefaultRadius,
-            ),
-            child: ClipRRect(
-              borderRadius: AttachmentList.kDefaultRadius,
-              child: Column(
-                children: widget.data
-                    .mapIndexed(
-                      (idx, ele) => GestureDetector(
-                        child: AspectRatio(
-                          aspectRatio: ele?.data['ratio']?.toDouble() ?? 1,
-                          child: Container(
-                            constraints: constraints,
-                            child: AttachmentItem(
-                              data: ele,
-                              heroTag: heroTags[idx],
-                              fit: BoxFit.cover,
-                            ),
-                          ),
-                        ),
-                      ),
-                    )
-                    .expand((ele) => [ele, const Divider(height: 1)])
-                    .toList()
-                  ..removeLast(),
-              ),
-            ),
-          );
-        }
-
        return Container(
          constraints: BoxConstraints(maxHeight: constraints.maxHeight),
          child: ScrollConfiguration(
--- a/lib/widgets/attachment/attachment_zoom.dart
+++ b/lib/widgets/attachment/attachment_zoom.dart
@ -365,7 +365,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
        ),
        onVerticalDragUpdate: (details) {
          if (_showDetail) return;
-          if (details.delta.dy <= -40) {
+          if (details.delta.dy < 0) {
            _showDetail = true;
            showModalBottomSheet(
              context: context,
@ -415,7 +415,6 @@ class _AttachmentZoomDetailPopup extends StatelessWidget {
            ],
          ).padding(horizontal: 20, top: 16, bottom: 12),
          Expanded(
-            child: SingleChildScrollView(
            child: Table(
              columnWidths: {
                0: IntrinsicColumnWidth(),
@ -488,7 +487,6 @@ class _AttachmentZoomDetailPopup extends StatelessWidget {
              ],
            ).padding(horizontal: 20, vertical: 8),
          ),
-          ),
        ],
      ),
    );
--- a/lib/widgets/connection_indicator.dart
+++ b/lib/widgets/connection_indicator.dart
@ -18,11 +18,8 @@ class ConnectionIndicator extends StatelessWidget {
      listenable: ws,
      builder: (context, _) {
        final ua = context.read<UserProvider>();
-        final show = (ws.isBusy || !ws.isConnected) && ua.isAuthorized;

-        return IgnorePointer(
-          ignoring: !show,
-          child: GestureDetector(
+        return GestureDetector(
          child: Material(
            elevation: 2,
            shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16))),
@ -51,7 +48,7 @@ class ConnectionIndicator extends StatelessWidget {
                    ],
                  ).padding(horizontal: 8, vertical: 4)
                : const SizedBox.shrink(),
-            ).opacity(show ? 1 : 0, animate: true).animate(
+          ).opacity((ws.isBusy || !ws.isConnected) && ua.isAuthorized ? 1 : 0, animate: true).animate(
                const Duration(milliseconds: 300),
                Curves.easeInOut,
              ),
@ -60,7 +57,6 @@ class ConnectionIndicator extends StatelessWidget {
              ws.connect();
            }
          },
-          ),
        );
      },
    );
--- a/lib/widgets/link_preview.dart
+++ b/lib/widgets/link_preview.dart
@ -94,14 +94,11 @@ class _LinkPreviewEntry extends StatelessWidget {
                  crossAxisAlignment: CrossAxisAlignment.center,
                  children: [
                    if (meta.icon?.isNotEmpty ?? false)
-                      SizedBox(
-                        width: 36,
-                        height: 36,
-                        child: meta.icon!.endsWith('.svg')
-                            ? SvgPicture.network(meta.icon!, width: 36, height: 36)
+                      StyledWidget(
+                        meta.icon!.endsWith('.svg')
+                            ? SvgPicture.network(meta.icon!)
                            : UniversalImage(
                                meta.icon!,
-                                noErrorWidget: true,
                                width: 36,
                                height: 36,
                                cacheHeight: 36,
--- a/lib/widgets/navigation/app_scaffold.dart
+++ b/lib/widgets/navigation/app_scaffold.dart
@ -21,76 +21,34 @@ import 'package:surface/widgets/notify_indicator.dart';

 final globalRootScaffoldKey = GlobalKey<ScaffoldState>();

-class AppScaffold extends StatelessWidget {
+class AppPageScaffold extends StatelessWidget {
+  final String? title;
  final Widget? body;
-  final PreferredSizeWidget? bottomNavigationBar;
-  final PreferredSizeWidget? bottomSheet;
-  final Drawer? drawer;
-  final Widget? endDrawer;
-  final FloatingActionButtonAnimator? floatingActionButtonAnimator;
-  final FloatingActionButtonLocation? floatingActionButtonLocation;
-  final Widget? floatingActionButton;
-  final AppBar? appBar;
-  final DrawerCallback? onDrawerChanged;
-  final DrawerCallback? onEndDrawerChanged;
+  final bool showAppBar;
+  final bool showBottomNavigation;

-  const AppScaffold({
+  const AppPageScaffold({
    super.key,
-    this.appBar,
+    this.title,
    this.body,
-    this.floatingActionButton,
-    this.floatingActionButtonLocation,
-    this.floatingActionButtonAnimator,
-    this.bottomNavigationBar,
-    this.bottomSheet,
-    this.drawer,
-    this.endDrawer,
-    this.onDrawerChanged,
-    this.onEndDrawerChanged,
+    this.showAppBar = true,
+    this.showBottomNavigation = false,
  });

  @override
  Widget build(BuildContext context) {
-    final appBarHeight = appBar?.preferredSize.height ?? 0;
-    final safeTop = MediaQuery.of(context).padding.top;
+    final state = GoRouter.maybeOf(context);
+    final routeName = state?.routerDelegate.currentConfiguration.last.route.name;
+
+    final autoTitle = state != null ? 'screen${routeName?.capitalize()}' : 'screen';

    return Scaffold(
-      extendBody: true,
-      extendBodyBehindAppBar: true,
-      backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-      body: SizedBox.expand(
-        child: AppBackground(
-          child: Column(
-            children: [
-              IgnorePointer(child: SizedBox(height: appBar != null ? appBarHeight + safeTop : 0)),
-              if (body != null) Expanded(child: body!),
-            ],
-          ),
-        ),
-      ),
-      appBar: appBar,
-      bottomNavigationBar: bottomNavigationBar,
-      bottomSheet: bottomSheet,
-      drawer: drawer,
-      endDrawer: endDrawer,
-      floatingActionButton: floatingActionButton,
-      floatingActionButtonAnimator: floatingActionButtonAnimator,
-      floatingActionButtonLocation: floatingActionButtonLocation,
-      onDrawerChanged: onDrawerChanged,
-      onEndDrawerChanged: onEndDrawerChanged,
-    );
-  }
-}
-
-class PageBackButton extends StatelessWidget {
-  const PageBackButton({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BackButton(
-      onPressed: () {
-        GoRouter.of(context).pop();
-      },
+      appBar: showAppBar
+          ? AppBar(
+              title: Text(title ?? autoTitle.tr()),
+            )
+          : null,
+      body: body,
    );
  }
 }
@ -143,16 +101,16 @@ class AppRootScaffold extends StatelessWidget {

    final safeTop = MediaQuery.of(context).padding.top;

-    return Scaffold(
+    return AppBackground(
+      isRoot: true,
+      child: Scaffold(
        key: globalRootScaffoldKey,
-      backgroundColor: Theme.of(context).colorScheme.surface,
        body: Stack(
          children: [
            Column(
              children: [
                if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS))
-                WindowTitleBarBox(
-                  child: Container(
+                  Container(
                    decoration: BoxDecoration(
                      border: Border(
                        bottom: BorderSide(
@ -161,18 +119,22 @@ class AppRootScaffold extends StatelessWidget {
                        ),
                      ),
                    ),
-                    child: MoveWindow(
                    child: Row(
                      crossAxisAlignment: CrossAxisAlignment.center,
                      mainAxisAlignment: Platform.isMacOS ? MainAxisAlignment.center : MainAxisAlignment.start,
                      children: [
-                          Text(
+                        WindowTitleBarBox(
+                          child: MoveWindow(
+                            child: Text(
                              'Solar Network',
                              style: GoogleFonts.spaceGrotesk(),
                            ).padding(horizontal: 12, vertical: 5),
+                          ),
+                        ),
                        if (!Platform.isMacOS)
-                            Row(
-                              mainAxisSize: MainAxisSize.min,
+                          Expanded(
+                            child: WindowTitleBarBox(
+                              child: Row(
                                children: [
                                  Expanded(child: MoveWindow()),
                                  Row(
@ -184,11 +146,11 @@ class AppRootScaffold extends StatelessWidget {
                                  ),
                                ],
                              ),
+                            ),
+                          ),
                      ],
                    ),
                  ),
-                  ),
-                ),
                Expanded(child: innerWidget),
              ],
            ),
@ -199,6 +161,7 @@ class AppRootScaffold extends StatelessWidget {
        drawer: !isExpandedDrawer ? AppNavigationDrawer() : null,
        drawerEdgeDragWidth: isPopable ? 0 : null,
        bottomNavigationBar: isShowBottomNavigation ? AppBottomNavigationBar() : null,
+      ),
    );
  }
 }
--- a/lib/widgets/notify_indicator.dart
+++ b/lib/widgets/notify_indicator.dart
@ -15,14 +15,10 @@ class NotifyIndicator extends StatelessWidget {
    final ua = context.read<UserProvider>();
    final nty = context.watch<NotificationProvider>();

-    final show = nty.notifications.isNotEmpty && ua.isAuthorized;
-
    return ListenableBuilder(
        listenable: nty,
        builder: (context, _) {
-          return IgnorePointer(
-            ignoring: !show,
-            child: GestureDetector(
+          return GestureDetector(
            child: Material(
              elevation: 2,
              shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(16))),
@ -49,14 +45,13 @@ class NotifyIndicator extends StatelessWidget {
                      ],
                    ).padding(horizontal: 8, vertical: 4)
                  : const SizedBox.shrink(),
-              ).opacity(show ? 1 : 0, animate: true).animate(
+            ).opacity(nty.notifications.isNotEmpty && ua.isAuthorized ? 1 : 0, animate: true).animate(
                  const Duration(milliseconds: 300),
                  Curves.easeInOut,
                ),
            onTap: () {
              nty.clear();
            },
-            ),
          );
        });
  }
--- a/lib/widgets/post/post_item.dart
+++ b/lib/widgets/post/post_item.dart
@ -256,8 +256,9 @@ class PostItem extends StatelessWidget {
          AttachmentList(
            data: displayableAttachments!,
            bordered: true,
+            gridded: true,
            maxHeight: showFullPost ? null : 480,
-            maxWidth: MediaQuery.of(context).size.width - 20,
+            minWidth: 640,
            fit: showFullPost ? BoxFit.cover : BoxFit.contain,
            padding: const EdgeInsets.symmetric(horizontal: 12),
          ),
@ -343,7 +344,7 @@ class PostShareImageWidget extends StatelessWidget {
          if (data.type != 'article' && (data.preload?.attachments?.isNotEmpty ?? false))
            StyledWidget(AttachmentList(
              data: data.preload!.attachments!,
-              columned: true,
+              gridded: true,
            )).padding(horizontal: 16, bottom: 8),
          Column(
            crossAxisAlignment: CrossAxisAlignment.start,
--- a/lib/widgets/post/post_reaction.dart
+++ b/lib/widgets/post/post_reaction.dart
@ -1,6 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
@ -13,7 +12,6 @@ import 'package:surface/widgets/dialog.dart';
 class PostReactionPopup extends StatefulWidget {
  final SnPost data;
  final Function(Map<String, int> value, int attr, int delta)? onChanged;
-
  const PostReactionPopup({super.key, required this.data, this.onChanged});

  @override
@ -61,7 +59,6 @@ class _PostReactionPopupState extends State<PostReactionPopup> {
          );
        }
      }
-      HapticFeedback.mediumImpact();
    } catch (err) {
      // ignore: use_build_context_synchronously
      if (context.mounted) context.showErrorDialog(err);
@ -87,7 +84,9 @@ class _PostReactionPopupState extends State<PostReactionPopup> {
            children: [
              const Icon(Symbols.mood, size: 24),
              const Gap(16),
-              Text('postReactions').tr().textStyle(Theme.of(context).textTheme.titleLarge!),
+              Text('postReactions')
+                  .tr()
+                  .textStyle(Theme.of(context).textTheme.titleLarge!),
            ],
          ).padding(horizontal: 20, top: 16, bottom: 12),
          Container(
@ -103,7 +102,9 @@ class _PostReactionPopupState extends State<PostReactionPopup> {
                Text('postReactionDownvote').plural(widget.data.totalDownvote),
                const Gap(24),
                Icon(
-                  widget.data.totalUpvote >= widget.data.totalDownvote ? Symbols.trending_up : Symbols.trending_down,
+                  widget.data.totalUpvote >= widget.data.totalDownvote
+                      ? Symbols.trending_up
+                      : Symbols.trending_down,
                  size: 16,
                ),
                const Gap(8),
--- a/pubspec.yaml
+++ b/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+54

 environment:
  sdk: ^3.5.4