♻️ Refactored background image (skip ci)

assets/translations/en-US.json

@@ -193,6 +193,9 @@
   "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.",

assets/translations/zh-CN.json

@@ -191,6 +191,9 @@
   "settingsColorSchemeDescription": "设置应用主题色。",
   "settingsColorSeed": "预设色彩主题",
   "settingsColorSeedDescription": "选择一个预设色彩主题。",
+  "settingsFeatures": "功能",
+  "settingsNotifyWithHaptic": "新通知时振动",
+  "settingsNotifyWithHapticDescription": "在应用在前台时收到新通知出现时出发轻量的振动。",
   "settingsNetwork": "网络",
   "settingsNetworkServer": "HyperNet 服务器",
   "settingsNetworkServerDescription": "设置 HyperNet 服务器地址，选择我们提供的，或者自己搭建。",

assets/translations/zh-HK.json

@@ -191,6 +191,9 @@
   "settingsColorSchemeDescription": "設置應用主題色。",
   "settingsColorSeed": "預設色彩主題",
   "settingsColorSeedDescription": "選擇一個預設色彩主題。",
+  "settingsFeatures": "功能",
+  "settingsNotifyWithHaptic": "新通知時振動",
+  "settingsNotifyWithHapticDescription": "在應用在前台時收到新通知出現時出發輕量的振動。",
   "settingsNetwork": "網絡",
   "settingsNetworkServer": "HyperNet 服務器",
   "settingsNetworkServerDescription": "設置 HyperNet 服務器地址，選擇我們提供的，或者自己搭建。",
@@ -213,8 +216,9 @@
   "sensitiveContentCollapsed": "敏感內容已摺疊。",
   "sensitiveContentDescription": "此內容已被標記，可能不適合所有人查看。",
   "sensitiveContentReveal": "顯示內容",
-  "serverConnecting": "正在連接服務器…",
+  "serverConnecting": "正在連接…",
-  "serverDisconnected": "已與服務器斷開連接",
+  "serverDisconnected": "已斷開連接",
+  "serverConnected": "已連接",
   "fieldChatAlias": "頻道別名",
   "fieldChatAliasHint": "全站範圍內唯一的頻道別名，用於在 URL 中表示該頻道，留空則自動生成。應遵循 URL-Safe 的原則。",
   "fieldChatName": "名稱",
@@ -292,6 +296,7 @@
   "addAttachmentFromCameraPhoto": "拍攝照片",
   "addAttachmentFromCameraVideo": "拍攝視頻",
   "addAttachmentFromRandomId": "通過訪問 ID 鏈接",
+  "attachmentDetailInfo": "附件詳細信息",
   "attachmentPastedImage": "粘貼的圖片",
   "attachmentInsertLink": "插入連接",
   "attachmentSetAsPostThumbnail": "設置為帖子縮略圖",

assets/translations/zh-TW.json

@@ -191,6 +191,9 @@
   "settingsColorSchemeDescription": "設置應用主題色。",
   "settingsColorSeed": "預設色彩主題",
   "settingsColorSeedDescription": "選擇一個預設色彩主題。",
+  "settingsFeatures": "功能",
+  "settingsNotifyWithHaptic": "新通知時振動",
+  "settingsNotifyWithHapticDescription": "在應用在前臺時收到新通知出現時出發輕量的振動。",
   "settingsNetwork": "網絡",
   "settingsNetworkServer": "HyperNet 服務器",
   "settingsNetworkServerDescription": "設置 HyperNet 服務器地址，選擇我們提供的，或者自己搭建。",
@@ -213,8 +216,9 @@
   "sensitiveContentCollapsed": "敏感內容已摺疊。",
   "sensitiveContentDescription": "此內容已被標記，可能不適合所有人查看。",
   "sensitiveContentReveal": "顯示內容",
-  "serverConnecting": "正在連接服務器…",
+  "serverConnecting": "正在連接…",
-  "serverDisconnected": "已與服務器斷開連接",
+  "serverDisconnected": "已斷開連接",
+  "serverConnected": "已連接",
   "fieldChatAlias": "頻道別名",
   "fieldChatAliasHint": "全站範圍內唯一的頻道別名，用於在 URL 中表示該頻道，留空則自動生成。應遵循 URL-Safe 的原則。",
   "fieldChatName": "名稱",
@@ -292,6 +296,7 @@
   "addAttachmentFromCameraPhoto": "拍攝照片",
   "addAttachmentFromCameraVideo": "拍攝視頻",
   "addAttachmentFromRandomId": "通過訪問 ID 鏈接",
+  "attachmentDetailInfo": "附件詳細信息",
   "attachmentPastedImage": "粘貼的圖片",
   "attachmentInsertLink": "插入連接",
   "attachmentSetAsPostThumbnail": "設置為帖子縮略圖",

lib/providers/config.dart

@@ -14,6 +14,7 @@ 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,

lib/providers/notification.dart

@@ -4,8 +4,10 @@ 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';
@@ -15,11 +17,13 @@ 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 {
@@ -75,6 +79,8 @@ 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();
       }
     });
   }

lib/router.dart

@@ -36,10 +36,7 @@ import 'package:surface/widgets/navigation/app_scaffold.dart';
 
 final _appRoutes = [
   ShellRoute(
-    builder: (context, state, child) => AppPageScaffold(
+    builder: (context, state, child) => child,
-      body: child,
-      showAppBar: false,
-    ),
     routes: [
       GoRoute(
         path: '/',
@@ -58,47 +55,39 @@ final _appRoutes = [
           GoRoute(
             path: '/write/:mode',
             name: 'postEditor',
-            builder: (context, state) => AppBackground(
+            builder: (context, state) => PostEditorScreen(
-              child: PostEditorScreen(
+              mode: state.pathParameters['mode']!,
-                mode: state.pathParameters['mode']!,
+              postEditId: int.tryParse(
-                postEditId: int.tryParse(
+                state.uri.queryParameters['editing'] ?? '',
-                  state.uri.queryParameters['editing'] ?? '',
-                ),
-                postReplyId: int.tryParse(
-                  state.uri.queryParameters['replying'] ?? '',
-                ),
-                postRepostId: int.tryParse(
-                  state.uri.queryParameters['reposting'] ?? '',
-                ),
-                extraProps: state.extra as PostEditorExtraProps?,
               ),
+              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) => AppBackground(
+            builder: (context, state) => PostSearchScreen(
-              child: PostSearchScreen(
+              initialTags: state.uri.queryParameters['tags']?.split(','),
-                initialTags: state.uri.queryParameters['tags']?.split(','),
+              initialCategories: state.uri.queryParameters['categories']?.split(','),
-                initialCategories: state.uri.queryParameters['categories']?.split(','),
-              ),
             ),
           ),
           GoRoute(
             path: '/publishers/:name',
             name: 'postPublisher',
-            builder: (context, state) => AppBackground(
+            builder: (context, state) => PostPublisherScreen(name: state.pathParameters['name']!),
-              child: PostPublisherScreen(name: state.pathParameters['name']!),
-            ),
           ),
           GoRoute(
             path: '/:slug',
             name: 'postDetail',
-            builder: (context, state) => AppBackground(
+            builder: (context, state) => PostDetailScreen(
-              child: PostDetailScreen(
+              slug: state.pathParameters['slug']!,
-                slug: state.pathParameters['slug']!,
+              preload: state.extra as SnPost?,
-                preload: state.extra as SnPost?,
-              ),
             ),
           ),
         ],
@@ -106,7 +95,15 @@ final _appRoutes = [
       GoRoute(
         path: '/account',
         name: 'account',
-        pageBuilder: (context, state) => NoTransitionPage(
+        pageBuilder: (context, state) => CustomTransitionPage(
+          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+            return FadeThroughTransition(
+              animation: animation,
+              secondaryAnimation: secondaryAnimation,
+              fillColor: Colors.transparent,
+              child: child,
+            );
+          },
           child: const AccountScreen(),
         ),
         routes: [],
@@ -114,7 +111,15 @@ final _appRoutes = [
       GoRoute(
         path: '/chat',
         name: 'chat',
-        pageBuilder: (context, state) => NoTransitionPage(
+        pageBuilder: (context, state) => CustomTransitionPage(
+          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+            return FadeThroughTransition(
+              animation: animation,
+              secondaryAnimation: secondaryAnimation,
+              fillColor: Colors.transparent,
+              child: child,
+            );
+          },
           child: const ChatScreen(),
         ),
         routes: [
@@ -228,57 +233,43 @@ final _appRoutes = [
     ],
   ),
   ShellRoute(
-    builder: (context, state, child) => AppPageScaffold(body: child),
+    builder: (context, state, child) => child,
     routes: [
       GoRoute(
         path: '/auth/login',
         name: 'authLogin',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => LoginScreen(),
-          child: LoginScreen(),
-        ),
       ),
       GoRoute(
         path: '/auth/register',
         name: 'authRegister',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => RegisterScreen(),
-          child: RegisterScreen(),
-        ),
       ),
       GoRoute(
         path: '/reports',
         name: 'abuseReport',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => AbuseReportScreen(),
-          child: AbuseReportScreen(),
-        ),
       ),
       GoRoute(
         path: '/account/profile/edit',
         name: 'accountProfileEdit',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => ProfileEditScreen(),
-          child: ProfileEditScreen(),
-        ),
       ),
       GoRoute(
         path: '/account/publishers',
         name: 'accountPublishers',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => PublisherScreen(),
-          child: PublisherScreen(),
-        ),
       ),
       GoRoute(
         path: '/account/publishers/new',
         name: 'accountPublisherNew',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => AccountPublisherNewScreen(),
-          child: AccountPublisherNewScreen(),
-        ),
       ),
       GoRoute(
         path: '/account/publishers/edit/:name',
         name: 'accountPublisherEdit',
-        builder: (context, state) => AppBackground(
+        builder: (context, state) => AccountPublisherEditScreen(
-          child: AccountPublisherEditScreen(
+          name: state.pathParameters['name']!,
-            name: state.pathParameters['name']!,
-          ),
         ),
       ),
     ],
@@ -296,9 +287,7 @@ final _appRoutes = [
       GoRoute(
         path: '/settings',
         name: 'settings',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => SettingsScreen(),
-          child: SettingsScreen(),
-        ),
       ),
     ],
   ),
@@ -308,9 +297,7 @@ final _appRoutes = [
       GoRoute(
         path: '/about',
         name: 'about',
-        builder: (context, state) => const AppBackground(
+        builder: (context, state) => AboutScreen(),
-          child: AboutScreen(),
-        ),
       ),
     ],
   ),

lib/screens/abuse_report.dart

@@ -6,6 +6,7 @@ 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';
 
@@ -56,7 +57,11 @@ class _AbuseReportScreenState extends State<AbuseReportScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppScaffold(
+      appBar: AppBar(
+        leading: const PageBackButton(),
+        title: Text('screenAbuseReport').tr(),
+      ),
       body: Column(
         children: [
           ListTile(
@@ -73,6 +78,7 @@ class _AbuseReportScreenState extends State<AbuseReportScreen> {
           else
             Expanded(
               child: ListView.builder(
+                padding: EdgeInsets.only(top: 8),
                 itemCount: _reports.length,
                 itemBuilder: (context, idx) {
                   return ListTile(

lib/screens/account.dart

@@ -12,6 +12,7 @@ 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});
@@ -20,7 +21,7 @@ class AccountScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     final ua = context.watch<UserProvider>();
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text("screenAccount").tr(),

lib/screens/account/profile_edit.dart

@@ -18,6 +18,7 @@ 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 {
@@ -81,8 +82,7 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
             onDateTimeChanged: (DateTime newDate) {
               setState(() {
                 _birthday = newDate;
-                _birthdayController.text =
+                _birthdayController.text = DateFormat(_kDateFormat).format(_birthday!);
-                    DateFormat(_kDateFormat).format(_birthday!);
               });
             },
           ),
@@ -96,11 +96,9 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
     if (image == null) return;
     if (!mounted) return;
 
-    final ImageProvider imageProvider =
+    final ImageProvider imageProvider = kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
-        kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
+    final aspectRatios =
-    final aspectRatios = place == 'banner'
+        place == 'banner' ? [CropAspectRatio(width: 16, height: 7)] : [CropAspectRatio(width: 1, height: 1)];
-        ? [CropAspectRatio(width: 16, height: 7)]
-        : [CropAspectRatio(width: 1, height: 1)];
     final result = (!kIsWeb && (Platform.isIOS || Platform.isMacOS))
         ? await showCupertinoImageCropper(
             // ignore: use_build_context_synchronously
@@ -122,10 +120,7 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
 
     setState(() => _isBusy = true);
 
-    final rawBytes =
+    final rawBytes = (await result.uiImage.toByteData(format: ImageByteFormat.png))!.buffer.asUint8List();
-        (await result.uiImage.toByteData(format: ImageByteFormat.png))!
-            .buffer
-            .asUint8List();
 
     try {
       final attachment = await attach.directUploadOne(
@@ -212,136 +207,141 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
 
     final sn = context.read<SnNetworkProvider>();
 
-    return SingleChildScrollView(
+    return AppScaffold(
-      child: Column(
+      appBar: AppBar(
-        crossAxisAlignment: CrossAxisAlignment.start,
+        leading: const PageBackButton(),
-        children: [
+        title: Text('screenProfileEdit').tr(),
-          LoadingIndicator(isActive: _isBusy),
+      ),
-          const Gap(24),
+      body: SingleChildScrollView(
-          Stack(
+        child: Column(
-            clipBehavior: Clip.none,
+          crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
+          children: [
-              Material(
+            LoadingIndicator(isActive: _isBusy),
-                elevation: 0,
+            const Gap(24),
-                child: InkWell(
+            Stack(
-                  child: ClipRRect(
+              clipBehavior: Clip.none,
-                    borderRadius: const BorderRadius.all(Radius.circular(8)),
+              children: [
-                    child: AspectRatio(
+                Material(
-                      aspectRatio: 16 / 9,
+                  elevation: 0,
-                      child: Container(
+                  child: InkWell(
-                        color:
+                    child: ClipRRect(
-                            Theme.of(context).colorScheme.surfaceContainerHigh,
+                      borderRadius: const BorderRadius.all(Radius.circular(8)),
-                        child: _banner != null
+                      child: AspectRatio(
-                            ? AutoResizeUniversalImage(
+                        aspectRatio: 16 / 9,
-                                sn.getAttachmentUrl(_banner!),
+                        child: Container(
-                                fit: BoxFit.cover,
+                          color: Theme.of(context).colorScheme.surfaceContainerHigh,
-                              )
+                          child: _banner != null
-                            : const SizedBox.shrink(),
+                              ? AutoResizeUniversalImage(
+                                  sn.getAttachmentUrl(_banner!),
+                                  fit: BoxFit.cover,
+                                )
+                              : const SizedBox.shrink(),
+                        ),
                       ),
                     ),
-                  ),
-                  onTap: () {
-                    _updateImage('banner');
-                  },
-                ),
-              ),
-              Positioned(
-                bottom: -28,
-                left: 16,
-                child: Material(
-                  elevation: 2,
-                  borderRadius: const BorderRadius.all(Radius.circular(40)),
-                  child: InkWell(
-                    child: AccountImage(content: _avatar, radius: 40),
                     onTap: () {
-                      _updateImage('avatar');
+                      _updateImage('banner');
                     },
                   ),
                 ),
-              ),
+                Positioned(
-            ],
+                  bottom: -28,
-          ).padding(horizontal: padding),
+                  left: 16,
-          const Gap(8 + 28),
+                  child: Material(
-          Column(
+                    elevation: 2,
-            children: [
+                    borderRadius: const BorderRadius.all(Radius.circular(40)),
-              TextField(
+                    child: InkWell(
-                readOnly: true,
+                      child: AccountImage(content: _avatar, radius: 40),
-                controller: _usernameController,
+                      onTap: () {
-                decoration: InputDecoration(
+                        _updateImage('avatar');
-                  border: const UnderlineInputBorder(),
+                      },
-                  labelText: 'fieldUsername'.tr(),
-                  helperText: 'fieldUsernameCannotEditHint'.tr(),
-                ),
-              ),
-              const Gap(4),
-              TextField(
-                controller: _nicknameController,
-                decoration: InputDecoration(
-                  border: const UnderlineInputBorder(),
-                  labelText: 'fieldNickname'.tr(),
-                ),
-              ),
-              const Gap(4),
-              Row(
-                children: [
-                  Flexible(
-                    flex: 1,
-                    child: TextField(
-                      controller: _firstNameController,
-                      decoration: InputDecoration(
-                        border: const UnderlineInputBorder(),
-                        labelText: 'fieldFirstName'.tr(),
-                      ),
                     ),
                   ),
-                  const Gap(8),
+                ),
-                  Flexible(
+              ],
-                    flex: 1,
+            ).padding(horizontal: padding),
-                    child: TextField(
+            const Gap(8 + 28),
-                      controller: _lastNameController,
+            Column(
-                      decoration: InputDecoration(
+              children: [
-                        border: const UnderlineInputBorder(),
+                TextField(
-                        labelText: 'fieldLastName'.tr(),
+                  readOnly: true,
+                  controller: _usernameController,
+                  decoration: InputDecoration(
+                    border: const UnderlineInputBorder(),
+                    labelText: 'fieldUsername'.tr(),
+                    helperText: 'fieldUsernameCannotEditHint'.tr(),
+                  ),
+                ),
+                const Gap(4),
+                TextField(
+                  controller: _nicknameController,
+                  decoration: InputDecoration(
+                    border: const UnderlineInputBorder(),
+                    labelText: 'fieldNickname'.tr(),
+                  ),
+                ),
+                const Gap(4),
+                Row(
+                  children: [
+                    Flexible(
+                      flex: 1,
+                      child: TextField(
+                        controller: _firstNameController,
+                        decoration: InputDecoration(
+                          border: const UnderlineInputBorder(),
+                          labelText: 'fieldFirstName'.tr(),
+                        ),
                       ),
                     ),
+                    const Gap(8),
+                    Flexible(
+                      flex: 1,
+                      child: TextField(
+                        controller: _lastNameController,
+                        decoration: InputDecoration(
+                          border: const UnderlineInputBorder(),
+                          labelText: 'fieldLastName'.tr(),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                const Gap(4),
+                TextField(
+                  controller: _descriptionController,
+                  keyboardType: TextInputType.multiline,
+                  maxLines: null,
+                  minLines: 3,
+                  decoration: InputDecoration(
+                    border: const UnderlineInputBorder(),
+                    labelText: 'fieldDescription'.tr(),
                   ),
-                ],
-              ),
-              const Gap(4),
-              TextField(
-                controller: _descriptionController,
-                keyboardType: TextInputType.multiline,
-                maxLines: null,
-                minLines: 3,
-                decoration: InputDecoration(
-                  border: const UnderlineInputBorder(),
-                  labelText: 'fieldDescription'.tr(),
                 ),
-              ),
+                const Gap(4),
-              const Gap(4),
+                TextField(
-              TextField(
+                  controller: _birthdayController,
-                controller: _birthdayController,
+                  readOnly: true,
-                readOnly: true,
+                  decoration: InputDecoration(
-                decoration: InputDecoration(
+                    border: const UnderlineInputBorder(),
-                  border: const UnderlineInputBorder(),
+                    labelText: 'fieldBirthday'.tr(),
-                  labelText: 'fieldBirthday'.tr(),
+                  ),
+                  onTap: () => _selectBirthday(),
                 ),
-                onTap: () => _selectBirthday(),
+              ],
-              ),
+            ).padding(horizontal: padding + 8),
-            ],
+            const Gap(12),
-          ).padding(horizontal: padding + 8),
+            Row(
-          const Gap(12),
+              mainAxisAlignment: MainAxisAlignment.end,
-          Row(
+              children: [
-            mainAxisAlignment: MainAxisAlignment.end,
+                ElevatedButton.icon(
-            children: [
+                  onPressed: _isBusy ? null : _updateUserInfo,
-              ElevatedButton.icon(
+                  icon: const Icon(Symbols.save),
-                onPressed: _isBusy ? null : _updateUserInfo,
+                  label: Text('apply').tr(),
-                icon: const Icon(Symbols.save),
+                ),
-                label: Text('apply').tr(),
+              ],
-              ),
+            ).padding(horizontal: padding),
-            ],
+          ],
-          ).padding(horizontal: padding),
+        ),
-        ],
       ),
     );
   }

lib/screens/account/profile_page.dart

@@ -19,6 +19,7 @@ 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 = {
@@ -241,6 +242,7 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
     final sn = context.read<SnNetworkProvider>();
 
     return Scaffold(
+      backgroundColor: Colors.transparent,
       body: CustomScrollView(
         controller: _scrollController,
         slivers: [

lib/screens/account/publishers/publisher_edit.dart

@@ -18,6 +18,7 @@ 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 {
@@ -176,7 +177,7 @@ class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen>
   Widget build(BuildContext context) {
     final sn = context.read<SnNetworkProvider>();
 
-    return Scaffold(
+    return AppScaffold(
       body: SingleChildScrollView(
         child: Column(
           children: [

lib/screens/account/publishers/publisher_new.dart

@@ -10,6 +10,7 @@ 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});
@@ -24,7 +25,11 @@ class _AccountPublisherNewScreenState extends State<AccountPublisherNewScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return  AppScaffold(
+      appBar: AppBar(
+        leading: const PageBackButton(),
+        title: Text('screenAccountPublisherNew').tr(),
+      ),
       body: SingleChildScrollView(
         child: Column(
           children: [

lib/screens/account/publishers/publishers.dart

@@ -10,6 +10,7 @@ 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});
@@ -32,8 +33,7 @@ class _PublisherScreenState extends State<PublisherScreen> {
 
     try {
       final resp = await sn.client.get('/cgi/co/publishers/me');
-      final List<SnPublisher> out = List<SnPublisher>.from(
+      final List<SnPublisher> out = List<SnPublisher>.from(resp.data?.map((e) => SnPublisher.fromJson(e)) ?? []);
-          resp.data?.map((e) => SnPublisher.fromJson(e)) ?? []);
 
       if (!mounted) return;
 
@@ -53,7 +53,11 @@ class _PublisherScreenState extends State<PublisherScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppScaffold(
+      appBar: AppBar(
+        leading: const PageBackButton(),
+        title: Text('screenAccountPublishers').tr(),
+      ),
       body: Column(
         children: [
           ListTile(
@@ -62,9 +66,7 @@ class _PublisherScreenState extends State<PublisherScreen> {
             contentPadding: const EdgeInsets.symmetric(horizontal: 24),
             leading: const Icon(Symbols.add_circle),
             onTap: () {
-              GoRouter.of(context)
+              GoRouter.of(context).pushNamed('accountPublisherNew').then((value) {
-                  .pushNamed('accountPublisherNew')
-                  .then((value) {
                 if (value == true) {
                   _publishers.clear();
                   _fetchPublishers();
@@ -75,48 +77,52 @@ class _PublisherScreenState extends State<PublisherScreen> {
           const Divider(height: 1),
           LoadingIndicator(isActive: _isBusy),
           Expanded(
-            child: RefreshIndicator(
+            child: MediaQuery.removePadding(
-              onRefresh: () {
+              context: context,
-                _publishers.clear();
+              removeTop: true,
-                return _fetchPublishers();
+              child: RefreshIndicator(
-              },
+                onRefresh: () {
-              child: ListView.builder(
+                  _publishers.clear();
-                itemCount: _publishers.length,
+                  return _fetchPublishers();
-                itemBuilder: (context, idx) {
-                  final publisher = _publishers[idx];
-                  return ListTile(
-                    title: Text(publisher.nick),
-                    subtitle: Text('@${publisher.name}'),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                    leading: AccountImage(content: publisher.avatar),
-                    trailing: PopupMenuButton(
-                      itemBuilder: (BuildContext context) => [
-                        PopupMenuItem(
-                          child: Row(
-                            children: [
-                              const Icon(Symbols.edit),
-                              const Gap(16),
-                              Text('edit').tr(),
-                            ],
-                          ),
-                          onTap: () {
-                            GoRouter.of(context).pushNamed(
-                              'accountPublisherEdit',
-                              pathParameters: {
-                                'name': publisher.name,
-                              },
-                            ).then((value) {
-                              if (value == true) {
-                                _publishers.clear();
-                                _fetchPublishers();
-                              }
-                            });
-                          },
-                        ),
-                      ],
-                    ),
-                  );
                 },
+                child: ListView.builder(
+                  itemCount: _publishers.length,
+                  itemBuilder: (context, idx) {
+                    final publisher = _publishers[idx];
+                    return ListTile(
+                      title: Text(publisher.nick),
+                      subtitle: Text('@${publisher.name}'),
+                      contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                      leading: AccountImage(content: publisher.avatar),
+                      trailing: PopupMenuButton(
+                        itemBuilder: (BuildContext context) => [
+                          PopupMenuItem(
+                            child: Row(
+                              children: [
+                                const Icon(Symbols.edit),
+                                const Gap(16),
+                                Text('edit').tr(),
+                              ],
+                            ),
+                            onTap: () {
+                              GoRouter.of(context).pushNamed(
+                                'accountPublisherEdit',
+                                pathParameters: {
+                                  'name': publisher.name,
+                                },
+                              ).then((value) {
+                                if (value == true) {
+                                  _publishers.clear();
+                                  _fetchPublishers();
+                                }
+                              });
+                            },
+                          ),
+                        ],
+                      ),
+                    );
+                  },
+                ),
               ),
             ),
           ),

lib/screens/album.dart

@@ -11,6 +11,7 @@ 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 {
@@ -82,7 +83,7 @@ class _AlbumScreenState extends State<AlbumScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppScaffold(
       body: CustomScrollView(
         controller: _scrollController,
         slivers: [

lib/screens/auth/login.dart

@@ -9,6 +9,7 @@ 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';
@@ -35,67 +36,73 @@ class _LoginScreenState extends State<LoginScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Theme(
+    return AppScaffold(
-      data: Theme.of(context).copyWith(canvasColor: Colors.transparent),
+      appBar: AppBar(
-      child: SingleChildScrollView(
+        leading: const PageBackButton(),
-        child: PageTransitionSwitcher(
+        title: Text('screenAuthLogin').tr(),
-          transitionBuilder: (
+      ),
-            Widget child,
+      body: Theme(
-            Animation<double> primaryAnimation,
+        data: Theme.of(context).copyWith(canvasColor: Colors.transparent),
-            Animation<double> secondaryAnimation,
+        child: SingleChildScrollView(
-          ) {
+          child: PageTransitionSwitcher(
-            return SharedAxisTransition(
+            transitionBuilder: (
-              animation: primaryAnimation,
+              Widget child,
-              secondaryAnimation: secondaryAnimation,
+              Animation<double> primaryAnimation,
-              transitionType: SharedAxisTransitionType.horizontal,
+              Animation<double> secondaryAnimation,
-              child: Container(
+            ) {
-                constraints: BoxConstraints(maxWidth: 380),
+              return SharedAxisTransition(
-                child: child,
+                animation: primaryAnimation,
-              ),
+                secondaryAnimation: secondaryAnimation,
-            );
+                transitionType: SharedAxisTransitionType.horizontal,
-          },
+                child: Container(
-          child: switch (_period % 3) {
+                  constraints: BoxConstraints(maxWidth: 380),
-            1 => _LoginPickerScreen(
+                  child: child,
-                key: const ValueKey(1),
+                ),
-                ticket: _currentTicket,
+              );
-                factors: _factors,
+            },
-                onTicket: (p0) => setState(() {
+            child: switch (_period % 3) {
-                  _currentTicket = p0;
+              1 => _LoginPickerScreen(
-                }),
+                  key: const ValueKey(1),
-                onPickFactor: (p0) => setState(() {
+                  ticket: _currentTicket,
-                  _factorPicked = p0;
+                  factors: _factors,
-                }),
+                  onTicket: (p0) => setState(() {
-                onNext: () => setState(() {
+                    _currentTicket = p0;
-                  _period++;
+                  }),
-                }),
+                  onPickFactor: (p0) => setState(() {
-              ),
+                    _factorPicked = p0;
-            2 => _LoginCheckScreen(
+                  }),
-                key: const ValueKey(2),
+                  onNext: () => setState(() {
-                ticket: _currentTicket,
+                    _period++;
-                factor: _factorPicked,
+                  }),
-                onTicket: (p0) => setState(() {
+                ),
-                  _currentTicket = p0;
+              2 => _LoginCheckScreen(
-                }),
+                  key: const ValueKey(2),
-                onNext: () => setState(() {
+                  ticket: _currentTicket,
-                  _period = 1;
+                  factor: _factorPicked,
-                }),
+                  onTicket: (p0) => setState(() {
-              ),
+                    _currentTicket = p0;
-            _ => _LoginLookupScreen(
+                  }),
-                key: const ValueKey(0),
+                  onNext: () => setState(() {
-                ticket: _currentTicket,
+                    _period = 1;
-                onTicket: (p0) => setState(() {
+                  }),
-                  _currentTicket = p0;
+                ),
-                }),
+              _ => _LoginLookupScreen(
-                onFactor: (p0) => setState(() {
+                  key: const ValueKey(0),
-                  _factors = p0;
+                  ticket: _currentTicket,
-                }),
+                  onTicket: (p0) => setState(() {
-                onNext: () => setState(() {
+                    _currentTicket = p0;
-                  _period++;
+                  }),
-                }),
+                  onFactor: (p0) => setState(() {
-              ),
+                    _factors = p0;
-          },
+                  }),
-        ).padding(all: 24),
+                  onNext: () => setState(() {
-      ).center(),
+                    _period++;
+                  }),
+                ),
+            },
+          ).padding(all: 24),
+        ).center(),
+      ),
     );
   }
 }
@@ -441,7 +448,7 @@ class _LoginLookupScreenState extends State<_LoginLookupScreen> {
 
       widget.onNext();
     } catch (err) {
-      if(mounted) context.showErrorDialog(err);
+      if (mounted) context.showErrorDialog(err);
       return;
     } finally {
       setState(() => _isBusy = false);

lib/screens/auth/register.dart

@@ -8,6 +8,7 @@ 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 {
@@ -54,175 +55,178 @@ class _RegisterScreenState extends State<RegisterScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return StyledWidget(Container(
+    return AppScaffold(
-      constraints: const BoxConstraints(maxWidth: 380),
+      appBar: AppBar(
-      child: SingleChildScrollView(
+        leading: const PageBackButton(),
-        child: Column(
+        title: Text('screenAuthRegister').tr(),
-          crossAxisAlignment: CrossAxisAlignment.start,
+      ),
-          children: [
+      body: StyledWidget(Container(
-            Align(
+        constraints: const BoxConstraints(maxWidth: 380),
-              alignment: Alignment.centerLeft,
+        child: SingleChildScrollView(
-              child: CircleAvatar(
+          child: Column(
-                radius: 26,
+            crossAxisAlignment: CrossAxisAlignment.start,
-                child: const Icon(
+            children: [
-                  Symbols.person_add,
+              Align(
-                  size: 28,
+                alignment: Alignment.centerLeft,
-                ),
+                child: CircleAvatar(
-              ).padding(bottom: 8),
+                  radius: 26,
-            ),
+                  child: const Icon(
-            Text(
+                    Symbols.person_add,
-              'screenAuthRegister',
+                    size: 28,
-              style: const TextStyle(
+                  ),
-                fontSize: 28,
+                ).padding(bottom: 8),
-                fontWeight: FontWeight.w900,
               ),
-            ).tr().padding(left: 4, bottom: 16),
+              Text(
-            Form(
+                'screenAuthRegister',
-              key: _formKey,
+                style: const TextStyle(
-              autovalidateMode: AutovalidateMode.onUserInteraction,
+                  fontSize: 28,
-              child: Column(
+                  fontWeight: FontWeight.w900,
-                children: [
+                ),
-                  TextFormField(
+              ).tr().padding(left: 4, bottom: 16),
-                    validator: (value) {
+              Form(
-                      if (value == null || value.length < 4 || value.length > 32) {
+                key: _formKey,
-                        return 'fieldUsernameLengthLimit'.tr(args: [4.toString(), 32.toString()]);
+                autovalidateMode: AutovalidateMode.onUserInteraction,
-                      }
+                child: Column(
-                      if (!RegExp(r'^[a-zA-Z0-9_]+$').hasMatch(value)) {
+                  children: [
-                        return 'fieldUsernameAlphanumOnly'.tr();
+                    TextFormField(
-                      }
+                      validator: (value) {
-                      return null;
+                        if (value == null || value.length < 4 || value.length > 32) {
-                    },
+                          return 'fieldUsernameLengthLimit'.tr(args: [4.toString(), 32.toString()]);
-                    autocorrect: false,
+                        }
-                    enableSuggestions: false,
+                        if (!RegExp(r'^[a-zA-Z0-9_]+$').hasMatch(value)) {
-                    controller: _usernameController,
+                          return 'fieldUsernameAlphanumOnly'.tr();
-                    autofillHints: const [AutofillHints.username],
+                        }
-                    decoration: InputDecoration(
+                        return null;
-                      isDense: true,
+                      },
-                      border: const UnderlineInputBorder(),
+                      autocorrect: false,
-                      labelText: 'fieldUsername'.tr(),
+                      enableSuggestions: false,
-                    ),
+                      controller: _usernameController,
-                    onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                      autofillHints: const [AutofillHints.username],
-                  ),
+                      decoration: InputDecoration(
-                  const Gap(12),
+                        isDense: true,
-                  TextFormField(
+                        border: const UnderlineInputBorder(),
-                    validator: (value) {
+                        labelText: 'fieldUsername'.tr(),
-                      if (value == null || value.length < 4 || value.length > 32) {
-                        return 'fieldNicknameLengthLimit'.tr(args: [4.toString(), 32.toString()]);
-                      }
-                      return null;
-                    },
-                    autocorrect: false,
-                    enableSuggestions: false,
-                    controller: _nicknameController,
-                    autofillHints: const [AutofillHints.nickname],
-                    decoration: InputDecoration(
-                      isDense: true,
-                      border: const UnderlineInputBorder(),
-                      labelText: 'fieldNickname'.tr(),
-                    ),
-                    onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                  ),
-                  const Gap(12),
-                  TextFormField(
-                    validator: (value) {
-                      if (value == null || value.isEmpty) {
-                        return 'fieldCannotBeEmpty'.tr();
-                      }
-                      if (!EmailValidator.validate(value)) {
-                        return 'fieldEmailAddressMustBeValid'.tr();
-                      }
-                      return null;
-                    },
-                    autocorrect: false,
-                    enableSuggestions: false,
-                    controller: _emailController,
-                    autofillHints: const [AutofillHints.email],
-                    decoration: InputDecoration(
-                      isDense: true,
-                      border: const UnderlineInputBorder(),
-                      labelText: 'fieldEmail'.tr(),
-                    ),
-                    onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                  ),
-                  const Gap(12),
-                  TextFormField(
-                    validator: (value) {
-                      if (value == null || value.isEmpty) {
-                        return 'fieldCannotBeEmpty'.tr();
-                      }
-                      return null;
-                    },
-                    obscureText: true,
-                    autocorrect: false,
-                    enableSuggestions: false,
-                    autofillHints: const [AutofillHints.password],
-                    controller: _passwordController,
-                    decoration: InputDecoration(
-                      isDense: true,
-                      border: const UnderlineInputBorder(),
-                      labelText: 'fieldPassword'.tr(),
-                    ),
-                    onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                  ),
-                ],
-              ).padding(horizontal: 7),
-            ),
-            const Gap(16),
-            Align(
-              alignment: Alignment.centerRight,
-              child: StyledWidget(
-                Container(
-                  constraints: const BoxConstraints(maxWidth: 290),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.end,
-                    children: [
-                      Text(
-                        'termAcceptNextWithAgree'.tr(),
-                        textAlign: TextAlign.end,
-                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                          color: Theme.of(context)
-                              .colorScheme
-                              .onSurface
-                              .withAlpha((255 * 0.75).round()),
-                        ),
                       ),
-                      Material(
+                      onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                        color: Colors.transparent,
+                    ),
-                        child: InkWell(
+                    const Gap(12),
-                          child: Row(
+                    TextFormField(
-                            mainAxisSize: MainAxisSize.min,
+                      validator: (value) {
-                            children: [
+                        if (value == null || value.length < 4 || value.length > 32) {
-                              Text('termAcceptLink'.tr()),
+                          return 'fieldNicknameLengthLimit'.tr(args: [4.toString(), 32.toString()]);
-                              const Gap(4),
+                        }
-                              const Icon(Symbols.launch, size: 14),
+                        return null;
-                            ],
+                      },
+                      autocorrect: false,
+                      enableSuggestions: false,
+                      controller: _nicknameController,
+                      autofillHints: const [AutofillHints.nickname],
+                      decoration: InputDecoration(
+                        isDense: true,
+                        border: const UnderlineInputBorder(),
+                        labelText: 'fieldNickname'.tr(),
+                      ),
+                      onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    const Gap(12),
+                    TextFormField(
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'fieldCannotBeEmpty'.tr();
+                        }
+                        if (!EmailValidator.validate(value)) {
+                          return 'fieldEmailAddressMustBeValid'.tr();
+                        }
+                        return null;
+                      },
+                      autocorrect: false,
+                      enableSuggestions: false,
+                      controller: _emailController,
+                      autofillHints: const [AutofillHints.email],
+                      decoration: InputDecoration(
+                        isDense: true,
+                        border: const UnderlineInputBorder(),
+                        labelText: 'fieldEmail'.tr(),
+                      ),
+                      onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                    const Gap(12),
+                    TextFormField(
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'fieldCannotBeEmpty'.tr();
+                        }
+                        return null;
+                      },
+                      obscureText: true,
+                      autocorrect: false,
+                      enableSuggestions: false,
+                      autofillHints: const [AutofillHints.password],
+                      controller: _passwordController,
+                      decoration: InputDecoration(
+                        isDense: true,
+                        border: const UnderlineInputBorder(),
+                        labelText: 'fieldPassword'.tr(),
+                      ),
+                      onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                    ),
+                  ],
+                ).padding(horizontal: 7),
+              ),
+              const Gap(16),
+              Align(
+                alignment: Alignment.centerRight,
+                child: StyledWidget(
+                  Container(
+                    constraints: const BoxConstraints(maxWidth: 290),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Text(
+                          'termAcceptNextWithAgree'.tr(),
+                          textAlign: TextAlign.end,
+                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                color: Theme.of(context).colorScheme.onSurface.withAlpha((255 * 0.75).round()),
+                              ),
+                        ),
+                        Material(
+                          color: Colors.transparent,
+                          child: InkWell(
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Text('termAcceptLink'.tr()),
+                                const Gap(4),
+                                const Icon(Symbols.launch, size: 14),
+                              ],
+                            ),
+                            onTap: () {
+                              launchUrlString('https://solsynth.dev/terms');
+                            },
                           ),
-                          onTap: () {
-                            launchUrlString('https://solsynth.dev/terms');
-                          },
                         ),
-                      ),
+                      ],
+                    ),
+                  ),
+                ).padding(horizontal: 16),
+              ),
+              Align(
+                alignment: Alignment.centerRight,
+                child: TextButton(
+                  onPressed: () => _performAction(context),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text('next').tr(),
+                      const Icon(Symbols.chevron_right),
                     ],
                   ),
                 ),
-              ).padding(horizontal: 16),
-            ),
-            Align(
-              alignment: Alignment.centerRight,
-              child: TextButton(
-                onPressed: () => _performAction(context),
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text('next').tr(),
-                    const Icon(Symbols.chevron_right),
-                  ],
-                ),
               ),
-            ),
+            ],
-          ],
+          ),
         ),
-      ),
+      )).padding(all: 24).center(),
-    )).padding(all: 24).center();
+    );
   }
 }

lib/screens/chat.dart

@@ -13,6 +13,7 @@ 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';
 
@@ -120,7 +121,7 @@ class _ChatScreenState extends State<ChatScreen> {
     final ua = context.read<UserProvider>();
 
     if (!ua.isAuthorized) {
-      return Scaffold(
+      return AppScaffold(
         appBar: AppBar(
           leading: AutoAppBarLeading(),
           title: Text('screenChat').tr(),
@@ -131,7 +132,7 @@ class _ChatScreenState extends State<ChatScreen> {
       );
     }
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text('screenChat').tr(),
@@ -195,22 +196,58 @@ class _ChatScreenState extends State<ChatScreen> {
         children: [
           LoadingIndicator(isActive: _isBusy),
           Expanded(
-            child: RefreshIndicator(
+            child: MediaQuery.removePadding(
-              onRefresh: () => Future.sync(() => _refreshChannels()),
+              context: context,
-              child: ListView.builder(
+              removeTop: true,
-                itemCount: _channels?.length ?? 0,
+              child: RefreshIndicator(
-                itemBuilder: (context, idx) {
+                onRefresh: () => Future.sync(() => _refreshChannels()),
-                  final channel = _channels![idx];
+                child: ListView.builder(
-                  final lastMessage = _lastMessages?[channel.id];
+                  itemCount: _channels?.length ?? 0,
+                  itemBuilder: (context, idx) {
+                    final channel = _channels![idx];
+                    final lastMessage = _lastMessages?[channel.id];
 
-                  if (channel.type == 1) {
+                    if (channel.type == 1) {
-                    final otherMember = channel.members?.cast<SnChannelMember?>().firstWhere(
+                      final otherMember = channel.members?.cast<SnChannelMember?>().firstWhere(
-                          (ele) => ele?.accountId != ua.user?.id,
+                            (ele) => ele?.accountId != ua.user?.id,
-                          orElse: () => null,
+                            orElse: () => null,
-                        );
+                          );
+
+                      return ListTile(
+                        title: Text(ud.getAccountFromCache(otherMember?.accountId)?.nick ?? channel.name),
+                        subtitle: lastMessage != null
+                            ? Text(
+                                '${ud.getAccountFromCache(lastMessage.sender.accountId)?.nick}: ${lastMessage.body['text'] ?? 'Unable preview'}',
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              )
+                            : Text(
+                                'channelDirectMessageDescription'.tr(args: [
+                                  '@${ud.getAccountFromCache(otherMember?.accountId)?.name}',
+                                ]),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                        contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                        leading: AccountImage(
+                          content: ud.getAccountFromCache(otherMember?.accountId)?.avatar,
+                        ),
+                        onTap: () {
+                          GoRouter.of(context).pushNamed(
+                            'chatRoom',
+                            pathParameters: {
+                              'scope': channel.realm?.alias ?? 'global',
+                              'alias': channel.alias,
+                            },
+                          ).then((value) {
+                            if (mounted) _refreshChannels();
+                          });
+                        },
+                      );
+                    }
 
                     return ListTile(
-                      title: Text(ud.getAccountFromCache(otherMember?.accountId)?.nick ?? channel.name),
+                      title: Text(channel.name),
                       subtitle: lastMessage != null
                           ? Text(
                               '${ud.getAccountFromCache(lastMessage.sender.accountId)?.nick}: ${lastMessage.body['text'] ?? 'Unable preview'}',
@@ -218,15 +255,14 @@ class _ChatScreenState extends State<ChatScreen> {
                               overflow: TextOverflow.ellipsis,
                             )
                           : Text(
-                              'channelDirectMessageDescription'.tr(args: [
+                              channel.description,
-                                '@${ud.getAccountFromCache(otherMember?.accountId)?.name}',
-                              ]),
                               maxLines: 1,
                               overflow: TextOverflow.ellipsis,
                             ),
                       contentPadding: const EdgeInsets.symmetric(horizontal: 16),
                       leading: AccountImage(
-                        content: ud.getAccountFromCache(otherMember?.accountId)?.avatar,
+                        content: null,
+                        fallbackWidget: const Icon(Symbols.chat, size: 20),
                       ),
                       onTap: () {
                         GoRouter.of(context).pushNamed(
@@ -236,43 +272,12 @@ class _ChatScreenState extends State<ChatScreen> {
                             'alias': channel.alias,
                           },
                         ).then((value) {
-                          if (mounted) _refreshChannels();
+                          if (value == true) _refreshChannels();
                         });
                       },
                     );
-                  }
+                  },
-
+                ),
-                  return ListTile(
-                    title: Text(channel.name),
-                    subtitle: lastMessage != null
-                        ? Text(
-                            '${ud.getAccountFromCache(lastMessage.sender.accountId)?.nick}: ${lastMessage.body['text'] ?? 'Unable preview'}',
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                          )
-                        : Text(
-                            channel.description,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                    leading: AccountImage(
-                      content: null,
-                      fallbackWidget: const Icon(Symbols.chat, size: 20),
-                    ),
-                    onTap: () {
-                      GoRouter.of(context).pushNamed(
-                        'chatRoom',
-                        pathParameters: {
-                          'scope': channel.realm?.alias ?? 'global',
-                          'alias': channel.alias,
-                        },
-                      ).then((value) {
-                        if (value == true) _refreshChannels();
-                      });
-                    },
-                  );
-                },
               ),
             ),
           ),

lib/screens/chat/call_room.dart

@@ -9,6 +9,7 @@ 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;
@@ -152,7 +153,7 @@ class _CallRoomScreenState extends State<CallRoomScreen> {
     return ListenableBuilder(
         listenable: call,
         builder: (context, _) {
-          return Scaffold(
+          return AppScaffold(
             appBar: AppBar(
               title: RichText(
                 textAlign: TextAlign.center,

lib/screens/chat/channel_detail.dart

@@ -14,6 +14,7 @@ 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 {
@@ -189,7 +190,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
 
     final isOwned = ua.isAuthorized && _channel?.accountId == ua.user?.id;
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         title: _channel != null ? Text(_channel!.name) : Text('loading').tr(),
       ),

lib/screens/chat/manage.dart

@@ -12,6 +12,7 @@ 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 {
@@ -121,7 +122,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         title: widget.editingChannelAlias != null
             ? Text('screenChatManage').tr()

lib/screens/chat/room.dart

@@ -20,6 +20,7 @@ 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';
@@ -211,7 +212,7 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
     final call = context.watch<ChatCallProvider>();
     final ud = context.read<UserDirectoryProvider>();
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         title: Text(
           _channel?.type == 1

lib/screens/explore.dart

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

lib/screens/friend.dart

@@ -11,6 +11,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/loading_indicator.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
 
 import '../providers/userinfo.dart';
 import '../widgets/unauthorized_hint.dart';
@@ -180,7 +181,7 @@ class _FriendScreenState extends State<FriendScreen> {
     final ua = context.read<UserProvider>();
 
     if (!ua.isAuthorized) {
-      return Scaffold(
+      return AppScaffold(
         appBar: AppBar(
           leading: AutoAppBarLeading(),
           title: Text('screenFriend').tr(),
@@ -191,7 +192,7 @@ class _FriendScreenState extends State<FriendScreen> {
       );
     }
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text('screenFriend').tr(),

lib/screens/home.dart

@@ -25,6 +25,7 @@ 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 {
@@ -67,7 +68,7 @@ class _HomeScreenState extends State<HomeScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text("screenHome").tr(),
@@ -387,6 +388,8 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> {
                         Text(
                           'dailyCheckInNone',
                           style: Theme.of(context).textTheme.bodyLarge,
+                          maxLines: 2,
+                          overflow: TextOverflow.ellipsis,
                         ).tr(),
                       ],
                     )

lib/screens/notification.dart

@@ -14,6 +14,7 @@ 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';
 
@@ -137,7 +138,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
     final ua = context.read<UserProvider>();
 
     if (!ua.isAuthorized) {
-      return Scaffold(
+      return AppScaffold(
         appBar: AppBar(
           leading: AutoAppBarLeading(),
           title: Text('screenNotification').tr(),
@@ -148,7 +149,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
       );
     }
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text('screenNotification').tr(),

lib/screens/post/post_detail.dart

@@ -14,6 +14,7 @@ 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';
@@ -67,7 +68,7 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
 
     return AppBackground(
       isRoot: widget.onBack != null,
-      child: Scaffold(
+      child: AppScaffold(
         appBar: AppBar(
           leading: BackButton(
             onPressed: () {

lib/screens/post/post_editor.dart

@@ -13,6 +13,7 @@ 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';
@@ -128,7 +129,7 @@ class _PostEditorScreenState extends State<PostEditorScreen> {
     return ListenableBuilder(
       listenable: _writeController,
       builder: (context, _) {
-        return Scaffold(
+        return AppScaffold(
           appBar: AppBar(
             leading: BackButton(
               onPressed: () {

lib/screens/post/post_search.dart

@@ -8,6 +8,7 @@ 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';
@@ -119,7 +120,7 @@ class _PostSearchScreenState extends State<PostSearchScreen> {
       ),
     ];
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         title: Text('screenPostSearch').tr(),
         actions: [

lib/screens/post/publisher_page.dart

@@ -17,6 +17,7 @@ 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';
@@ -274,7 +275,7 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> with SingleTi
 
     final sn = context.read<SnNetworkProvider>();
 
-    return Scaffold(
+    return AppScaffold(
       body: NestedScrollView(
         controller: _scrollController,
         headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {

lib/screens/realm.dart

@@ -12,6 +12,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/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';
 
@@ -83,7 +84,7 @@ class _RealmScreenState extends State<RealmScreen> {
     final ua = context.read<UserProvider>();
 
     if (!ua.isAuthorized) {
-      return Scaffold(
+      return AppScaffold(
         appBar: AppBar(
           leading: AutoAppBarLeading(),
           title: Text('screenRealm').tr(),
@@ -94,7 +95,7 @@ class _RealmScreenState extends State<RealmScreen> {
       );
     }
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text('screenRealm').tr(),

lib/screens/realm/manage.dart

@@ -18,6 +18,7 @@ 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';
 
@@ -179,7 +180,7 @@ class _RealmManageScreenState extends State<RealmManageScreen> {
   Widget build(BuildContext context) {
     final sn = context.read<SnNetworkProvider>();
 
-    return Scaffold(
+    return AppScaffold(
       appBar: AppBar(
         title: widget.editingRealmAlias != null
             ? Text('screenRealmManage').tr()

lib/screens/realm/realm_detail.dart

@@ -11,6 +11,7 @@ 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';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 
 import '../../types/post.dart';
@@ -70,19 +71,11 @@ class _RealmDetailScreenState extends State<RealmDetailScreen> {
   Widget build(BuildContext context) {
     return DefaultTabController(
       length: 3,
-      child: Scaffold(
+      child: AppScaffold(
         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()),

lib/screens/settings.dart

@@ -18,6 +18,7 @@ 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,6 +69,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     final sn = context.read<SnNetworkProvider>();
 
     return Scaffold(
+      backgroundColor: Colors.transparent,
       body: SingleChildScrollView(
         child: Column(
           spacing: 16,
@@ -255,6 +257,24 @@ 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: [

lib/theme.dart

@@ -55,11 +55,10 @@ Future<ThemeData> createAppTheme(
       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: ZoomPageTransitionsBuilder(),
+        TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
         TargetPlatform.macOS: ZoomPageTransitionsBuilder(),
         TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
         TargetPlatform.linux: ZoomPageTransitionsBuilder(),

lib/widgets/attachment/attachment_zoom.dart

@@ -365,7 +365,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
         ),
         onVerticalDragUpdate: (details) {
           if (_showDetail) return;
-          if (details.delta.dy < 0) {
+          if (details.delta.dy <= -40) {
             _showDetail = true;
             showModalBottomSheet(
               context: context,

lib/widgets/navigation/app_scaffold.dart

@@ -21,18 +21,90 @@ import 'package:surface/widgets/notify_indicator.dart';
 
 final globalRootScaffoldKey = GlobalKey<ScaffoldState>();
 
+class AppScaffold extends StatelessWidget {
+  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;
+
+  const AppScaffold({
+    super.key,
+    this.appBar,
+    this.body,
+    this.floatingActionButton,
+    this.floatingActionButtonLocation,
+    this.floatingActionButtonAnimator,
+    this.bottomNavigationBar,
+    this.bottomSheet,
+    this.drawer,
+    this.endDrawer,
+    this.onDrawerChanged,
+    this.onEndDrawerChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final appBarHeight = appBar?.preferredSize.height ?? 0;
+    final safeTop = MediaQuery.of(context).padding.top;
+
+    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();
+      },
+    );
+  }
+}
+
 class AppPageScaffold extends StatelessWidget {
   final String? title;
   final Widget? body;
   final bool showAppBar;
-  final bool showBottomNavigation;
 
   const AppPageScaffold({
     super.key,
     this.title,
     this.body,
     this.showAppBar = true,
-    this.showBottomNavigation = false,
   });
 
   @override
@@ -42,7 +114,7 @@ class AppPageScaffold extends StatelessWidget {
 
     final autoTitle = state != null ? 'screen${routeName?.capitalize()}' : 'screen';
 
-    return Scaffold(
+    return AppScaffold(
       appBar: showAppBar
           ? AppBar(
               title: Text(title ?? autoTitle.tr()),
@@ -101,64 +173,62 @@ class AppRootScaffold extends StatelessWidget {
 
     final safeTop = MediaQuery.of(context).padding.top;
 
-    return AppBackground(
+    return Scaffold(
-      isRoot: true,
+      key: globalRootScaffoldKey,
-      child: Scaffold(
+      backgroundColor: Theme.of(context).colorScheme.surface,
-        key: globalRootScaffoldKey,
+      body: Stack(
-        body: Stack(
+        children: [
-          children: [
+          Column(
-            Column(
+            children: [
-              children: [
+              if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS))
-                if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS))
+                WindowTitleBarBox(
-                  WindowTitleBarBox(
+                  child: Container(
-                    child: Container(
+                    decoration: BoxDecoration(
-                      decoration: BoxDecoration(
+                      border: Border(
-                        border: Border(
+                        bottom: BorderSide(
-                          bottom: BorderSide(
+                          color: Theme.of(context).dividerColor,
-                            color: Theme.of(context).dividerColor,
+                          width: 1 / devicePixelRatio,
-                            width: 1 / devicePixelRatio,
-                          ),
-                        ),
-                      ),
-                      child: MoveWindow(
-                        child: Row(
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          mainAxisAlignment: Platform.isMacOS ? MainAxisAlignment.center : MainAxisAlignment.start,
-                          children: [
-                            Text(
-                              'Solar Network',
-                              style: GoogleFonts.spaceGrotesk(),
-                            ).padding(horizontal: 12, vertical: 5),
-                            if (!Platform.isMacOS)
-                              Row(
-                                mainAxisSize: MainAxisSize.min,
-                                children: [
-                                  Expanded(child: MoveWindow()),
-                                  Row(
-                                    children: [
-                                      MinimizeWindowButton(colors: windowButtonColor),
-                                      MaximizeWindowButton(colors: windowButtonColor),
-                                      CloseWindowButton(colors: windowButtonColor),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                          ],
                         ),
                       ),
                     ),
+                    child: MoveWindow(
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        mainAxisAlignment: Platform.isMacOS ? MainAxisAlignment.center : MainAxisAlignment.start,
+                        children: [
+                          Text(
+                            'Solar Network',
+                            style: GoogleFonts.spaceGrotesk(),
+                          ).padding(horizontal: 12, vertical: 5),
+                          if (!Platform.isMacOS)
+                            Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Expanded(child: MoveWindow()),
+                                Row(
+                                  children: [
+                                    MinimizeWindowButton(colors: windowButtonColor),
+                                    MaximizeWindowButton(colors: windowButtonColor),
+                                    CloseWindowButton(colors: windowButtonColor),
+                                  ],
+                                ),
+                              ],
+                            ),
+                        ],
+                      ),
+                    ),
                   ),
-                Expanded(child: innerWidget),
+                ),
-              ],
+              Expanded(child: innerWidget),
-            ),
+            ],
-            Positioned(top: safeTop > 0 ? safeTop : 16, right: 8, child: NotifyIndicator()),
+          ),
-            Positioned(top: safeTop > 0 ? safeTop : 16, left: 8, child: ConnectionIndicator()),
+          Positioned(top: safeTop > 0 ? safeTop : 16, right: 8, child: NotifyIndicator()),
-          ],
+          Positioned(top: safeTop > 0 ? safeTop : 16, left: 8, child: ConnectionIndicator()),
-        ),
+        ],
-        drawer: !isExpandedDrawer ? AppNavigationDrawer() : null,
-        drawerEdgeDragWidth: isPopable ? 0 : null,
-        bottomNavigationBar: isShowBottomNavigation ? AppBottomNavigationBar() : null,
       ),
+      drawer: !isExpandedDrawer ? AppNavigationDrawer() : null,
+      drawerEdgeDragWidth: isPopable ? 0 : null,
+      bottomNavigationBar: isShowBottomNavigation ? AppBottomNavigationBar() : null,
     );
   }
 }