⚡ Optimize

lib/shells/basic_shell.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:go_router/go_router.dart';
+import 'package:solian/router.dart';
+import 'package:solian/theme.dart';
+import 'package:solian/widgets/prev_page.dart';
+
+class BasicShell extends StatelessWidget {
+  final GoRouterState state;
+  final Widget child;
+
+  const BasicShell({super.key, required this.child, required this.state});
+
+  @override
+  Widget build(BuildContext context) {
+    final canPop = AppRouter.instance.canPop();
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(state.topRoute?.name?.tr ?? 'page'.tr),
+        centerTitle: false,
+        titleSpacing: canPop ? null : 24,
+        elevation: SolianTheme.isLargeScreen(context) ? 1 : 0,
+        leading: canPop ? const PrevPageButton() : null,
+        automaticallyImplyLeading: false,
+      ),
+      body: child,
+    );
+  }
+}

lib/shells/nav_shell.dart

@@ -3,6 +3,7 @@ import 'package:get/get.dart';
 import 'package:go_router/go_router.dart';
 import 'package:solian/router.dart';
 import 'package:solian/theme.dart';
+import 'package:solian/widgets/prev_page.dart';
 import 'package:solian/widgets/navigation/app_navigation_bottom_bar.dart';
 import 'package:solian/widgets/navigation/app_navigation_rail.dart';
 
@@ -22,9 +23,12 @@ class NavShell extends StatelessWidget {
         centerTitle: false,
         titleSpacing: canPop ? null : 24,
         elevation: SolianTheme.isLargeScreen(context) ? 1 : 0,
-        leading: canPop ? const BackButton() : null,
+        leading: canPop ? const PrevPageButton() : null,
+        automaticallyImplyLeading: false,
       ),
-      bottomNavigationBar: SolianTheme.isLargeScreen(context) ? null : const AppNavigationBottomBar(),
+      bottomNavigationBar: SolianTheme.isLargeScreen(context)
+          ? null
+          : const AppNavigationBottomBar(),
       body: SolianTheme.isLargeScreen(context)
           ? Row(
               children: [
@@ -37,20 +41,3 @@ class NavShell extends StatelessWidget {
     );
   }
 }
-
-class BackButton extends StatelessWidget {
-  const BackButton({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return IconButton(
-      icon: const Icon(Icons.arrow_back),
-      tooltip: MaterialLocalizations.of(context).backButtonTooltip,
-      onPressed: () {
-        if (AppRouter.instance.canPop()) {
-          AppRouter.instance.pop();
-        }
-      },
-    );
-  }
-}