v9

lib/v9/pages/sort/views/settings/sort_setting.dart

@@ -38,26 +38,27 @@ class _SortSettingsState extends State<SortSettings> {
       backgroundColor: Colors.white,
       appBar: AppBar(
         backgroundColor: Colors.white,
-        leading: Align(
-          child: MouseRegion(
-            cursor: SystemMouseCursors.click,
-            child: GestureDetector(
-              onTap: (){
-                Navigator.of(context).pop();
-              },
-              child: Container(
-                  width: 28,
-                  height: 28,
-                  margin: EdgeInsets.only(right: 8,left: 8),
-                  alignment: Alignment.center,
-                  decoration: BoxDecoration(
-                      color: Color(0xffE3E5E7),
-                      borderRadius: BorderRadius.circular(6)
-                  ),
-                  child: Icon(Icons.arrow_back_ios_new,size: 18,)),
-            ),
-          ),
-        ),
+        automaticallyImplyLeading: false,
+        // leading: Align(
+        //   child: MouseRegion(
+        //     cursor: SystemMouseCursors.click,
+        //     child: GestureDetector(
+        //       onTap: (){
+        //         Navigator.of(context).pop();
+        //       },
+        //       child: Container(
+        //           width: 28,
+        //           height: 28,
+        //           margin: EdgeInsets.only(right: 8,left: 8),
+        //           alignment: Alignment.center,
+        //           decoration: BoxDecoration(
+        //               color: Color(0xffE3E5E7),
+        //               borderRadius: BorderRadius.circular(6)
+        //           ),
+        //           child: Icon(Icons.arrow_back_ios_new,size: 18,)),
+        //     ),
+        //   ),
+        // ),
         // leading: BackButton(),
         actions: [
           Padding(

lib/v9/pages/sort/views/sort_page/sort_page.dart

@@ -2,6 +2,7 @@ import 'dart:ffi';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:iroute/v9/app/navigation/router/iroute_config.dart';
 import '../player/sort_player.dart';
 import '../../../../app/navigation/router/app_router_delegate.dart';
 import '../settings/sort_setting.dart';
@@ -10,14 +11,10 @@ import 'sort_button.dart';
 import '../../functions.dart';
 import '../../provider/state.dart';
 
-class SortPage extends StatefulWidget {
-  const SortPage({super.key});
+class SortNavigation extends StatelessWidget {
+  final Widget navigator;
+  const SortNavigation({super.key, required this.navigator});
 
-  @override
-  State<SortPage> createState() => _SortPageState();
-}
-
-class _SortPageState extends State<SortPage> {
   @override
   Widget build(BuildContext context) {
     return  Material(
@@ -31,7 +28,7 @@ class _SortPageState extends State<SortPage> {
             width: 1,
           ),
           Expanded(
-            child: SortNavigatorScope(),
+            child: navigator,
           )
         ],
       ),
@@ -68,7 +65,7 @@ class SortRailPanel extends StatelessWidget {
                 cursor: SystemMouseCursors.click,
                 child: GestureDetector(
                     onTap: () {
-                      router.changePath('/sort/settings');
+                      router.changePath('/app/sort/settings',style: RouteStyle.push);
                     },
                     child: const Icon(
                       CupertinoIcons.settings,
@@ -87,7 +84,7 @@ class SortRailPanel extends StatelessWidget {
             options: sortNameMap.values.toList(),
             onSelected: (name) {
               state.selectName(name);
-              router.changePath('/sort');
+              router.changePath('/sort/player');
             },
           ),
         ),