reorganize settings

app/lib/core/routing/routes.dart

@@ -58,21 +58,23 @@ import 'package:weblibre/features/geckoview/features/tabs/presentation/screens/c
 import 'package:weblibre/features/onboarding/presentation/onboarding.dart';
 import 'package:weblibre/features/settings/presentation/screens/addon_collection.dart';
 import 'package:weblibre/features/settings/presentation/screens/advanced_settings.dart';
-import 'package:weblibre/features/settings/presentation/screens/appearance_display_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/bang_settings.dart';
+import 'package:weblibre/features/settings/presentation/screens/browsing_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/contextual_toolbar_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/custom_tracking_protection.dart';
 import 'package:weblibre/features/settings/presentation/screens/doh_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/error_logs_screen.dart';
+import 'package:weblibre/features/settings/presentation/screens/experimental_settings.dart';
+import 'package:weblibre/features/settings/presentation/screens/extensions_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/fingerprint_settings.dart';
-import 'package:weblibre/features/settings/presentation/screens/fingerprinting_settings.dart';
+import 'package:weblibre/features/settings/presentation/screens/general_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/locale_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/privacy_security_settings.dart';
-import 'package:weblibre/features/settings/presentation/screens/search_content_settings.dart';
+import 'package:weblibre/features/settings/presentation/screens/search_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/settings.dart';
-import 'package:weblibre/features/settings/presentation/screens/tab_bar_settings.dart';
-import 'package:weblibre/features/settings/presentation/screens/tabs_behavior_settings.dart';
+import 'package:weblibre/features/settings/presentation/screens/toolbar_layout_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/tracking_protection_exceptions.dart';
+import 'package:weblibre/features/settings/presentation/screens/web_content_settings.dart';
 import 'package:weblibre/features/settings/presentation/screens/web_engine_hardening.dart';
 import 'package:weblibre/features/settings/presentation/screens/web_engine_hardening_group.dart';
 import 'package:weblibre/features/sync/presentation/screens/sync_settings.dart';

app/lib/core/routing/routes.g.dart

@@ -1375,14 +1375,14 @@ RouteBase get $settingsRoute => GoRouteData.$route(
   factory: $SettingsRoute._fromState,
   routes: [
     GoRouteData.$route(
-      path: 'appearance_display',
-      name: 'AppearanceDisplaySettingsRoute',
-      factory: $AppearanceDisplaySettingsRoute._fromState,
+      path: 'general',
+      name: 'GeneralSettingsRoute',
+      factory: $GeneralSettingsRoute._fromState,
     ),
     GoRouteData.$route(
-      path: 'tab_bar',
-      name: 'TabBarSettingsRoute',
-      factory: $TabBarSettingsRoute._fromState,
+      path: 'browsing',
+      name: 'BrowsingSettingsRoute',
+      factory: $BrowsingSettingsRoute._fromState,
     ),
     GoRouteData.$route(
       path: 'privacy_security',
@@ -1390,25 +1390,35 @@ RouteBase get $settingsRoute => GoRouteData.$route(
       factory: $PrivacySecuritySettingsRoute._fromState,
     ),
     GoRouteData.$route(
-      path: 'search_content',
-      name: 'SearchContentSettingsRoute',
-      factory: $SearchContentSettingsRoute._fromState,
+      path: 'toolbar_layout',
+      name: 'ToolbarLayoutSettingsRoute',
+      factory: $ToolbarLayoutSettingsRoute._fromState,
     ),
     GoRouteData.$route(
-      path: 'tabs_behavior',
-      name: 'TabsBehaviorSettingsRoute',
-      factory: $TabsBehaviorSettingsRoute._fromState,
+      path: 'web_content',
+      name: 'WebContentSettingsRoute',
+      factory: $WebContentSettingsRoute._fromState,
     ),
     GoRouteData.$route(
-      path: 'fingerprinting',
-      name: 'FingerprintingSettingsRoute',
-      factory: $FingerprintingSettingsRoute._fromState,
+      path: 'search',
+      name: 'SearchSettingsRoute',
+      factory: $SearchSettingsRoute._fromState,
+    ),
+    GoRouteData.$route(
+      path: 'extensions',
+      name: 'ExtensionsSettingsRoute',
+      factory: $ExtensionsSettingsRoute._fromState,
     ),
     GoRouteData.$route(
       path: 'advanced',
       name: 'AdvancedSettingsRoute',
       factory: $AdvancedSettingsRoute._fromState,
     ),
+    GoRouteData.$route(
+      path: 'experimental',
+      name: 'ExperimentalSettingsRoute',
+      factory: $ExperimentalSettingsRoute._fromState,
+    ),
     GoRouteData.$route(
       path: 'bang',
       name: 'BangSettingsRoute',
@@ -1504,12 +1514,12 @@ mixin $SettingsRoute on GoRouteData {
   void replace(BuildContext context) => context.replace(location);
 }
 
-mixin $AppearanceDisplaySettingsRoute on GoRouteData {
-  static AppearanceDisplaySettingsRoute _fromState(GoRouterState state) =>
-      AppearanceDisplaySettingsRoute();
+mixin $GeneralSettingsRoute on GoRouteData {
+  static GeneralSettingsRoute _fromState(GoRouterState state) =>
+      GeneralSettingsRoute();
 
   @override
-  String get location => GoRouteData.$location('/settings/appearance_display');
+  String get location => GoRouteData.$location('/settings/general');
 
   @override
   void go(BuildContext context) => context.go(location);
@@ -1525,12 +1535,12 @@ mixin $AppearanceDisplaySettingsRoute on GoRouteData {
   void replace(BuildContext context) => context.replace(location);
 }
 
-mixin $TabBarSettingsRoute on GoRouteData {
-  static TabBarSettingsRoute _fromState(GoRouterState state) =>
-      TabBarSettingsRoute();
+mixin $BrowsingSettingsRoute on GoRouteData {
+  static BrowsingSettingsRoute _fromState(GoRouterState state) =>
+      BrowsingSettingsRoute();
 
   @override
-  String get location => GoRouteData.$location('/settings/tab_bar');
+  String get location => GoRouteData.$location('/settings/browsing');
 
   @override
   void go(BuildContext context) => context.go(location);
@@ -1567,12 +1577,12 @@ mixin $PrivacySecuritySettingsRoute on GoRouteData {
   void replace(BuildContext context) => context.replace(location);
 }
 
-mixin $SearchContentSettingsRoute on GoRouteData {
-  static SearchContentSettingsRoute _fromState(GoRouterState state) =>
-      SearchContentSettingsRoute();
+mixin $ToolbarLayoutSettingsRoute on GoRouteData {
+  static ToolbarLayoutSettingsRoute _fromState(GoRouterState state) =>
+      ToolbarLayoutSettingsRoute();
 
   @override
-  String get location => GoRouteData.$location('/settings/search_content');
+  String get location => GoRouteData.$location('/settings/toolbar_layout');
 
   @override
   void go(BuildContext context) => context.go(location);
@@ -1588,12 +1598,12 @@ mixin $SearchContentSettingsRoute on GoRouteData {
   void replace(BuildContext context) => context.replace(location);
 }
 
-mixin $TabsBehaviorSettingsRoute on GoRouteData {
-  static TabsBehaviorSettingsRoute _fromState(GoRouterState state) =>
-      TabsBehaviorSettingsRoute();
+mixin $WebContentSettingsRoute on GoRouteData {
+  static WebContentSettingsRoute _fromState(GoRouterState state) =>
+      WebContentSettingsRoute();
 
   @override
-  String get location => GoRouteData.$location('/settings/tabs_behavior');
+  String get location => GoRouteData.$location('/settings/web_content');
 
   @override
   void go(BuildContext context) => context.go(location);
@@ -1609,12 +1619,33 @@ mixin $TabsBehaviorSettingsRoute on GoRouteData {
   void replace(BuildContext context) => context.replace(location);
 }
 
-mixin $FingerprintingSettingsRoute on GoRouteData {
-  static FingerprintingSettingsRoute _fromState(GoRouterState state) =>
-      FingerprintingSettingsRoute();
+mixin $SearchSettingsRoute on GoRouteData {
+  static SearchSettingsRoute _fromState(GoRouterState state) =>
+      SearchSettingsRoute();
 
   @override
-  String get location => GoRouteData.$location('/settings/fingerprinting');
+  String get location => GoRouteData.$location('/settings/search');
+
+  @override
+  void go(BuildContext context) => context.go(location);
+
+  @override
+  Future<T?> push<T>(BuildContext context) => context.push<T>(location);
+
+  @override
+  void pushReplacement(BuildContext context) =>
+      context.pushReplacement(location);
+
+  @override
+  void replace(BuildContext context) => context.replace(location);
+}
+
+mixin $ExtensionsSettingsRoute on GoRouteData {
+  static ExtensionsSettingsRoute _fromState(GoRouterState state) =>
+      ExtensionsSettingsRoute();
+
+  @override
+  String get location => GoRouteData.$location('/settings/extensions');
 
   @override
   void go(BuildContext context) => context.go(location);
@@ -1651,6 +1682,27 @@ mixin $AdvancedSettingsRoute on GoRouteData {
   void replace(BuildContext context) => context.replace(location);
 }
 
+mixin $ExperimentalSettingsRoute on GoRouteData {
+  static ExperimentalSettingsRoute _fromState(GoRouterState state) =>
+      ExperimentalSettingsRoute();
+
+  @override
+  String get location => GoRouteData.$location('/settings/experimental');
+
+  @override
+  void go(BuildContext context) => context.go(location);
+
+  @override
+  Future<T?> push<T>(BuildContext context) => context.push<T>(location);
+
+  @override
+  void pushReplacement(BuildContext context) =>
+      context.pushReplacement(location);
+
+  @override
+  void replace(BuildContext context) => context.replace(location);
+}
+
 mixin $BangSettingsRoute on GoRouteData {
   static BangSettingsRoute _fromState(GoRouterState state) =>
       BangSettingsRoute();

app/lib/core/routing/routes.settings.dart

@@ -23,34 +23,42 @@ part of 'routes.dart';
   name: 'SettingsRoute',
   path: '/settings',
   routes: [
-    TypedGoRoute<AppearanceDisplaySettingsRoute>(
-      name: 'AppearanceDisplaySettingsRoute',
-      path: 'appearance_display',
+    TypedGoRoute<GeneralSettingsRoute>(
+      name: 'GeneralSettingsRoute',
+      path: 'general',
     ),
-    TypedGoRoute<TabBarSettingsRoute>(
-      name: 'TabBarSettingsRoute',
-      path: 'tab_bar',
+    TypedGoRoute<BrowsingSettingsRoute>(
+      name: 'BrowsingSettingsRoute',
+      path: 'browsing',
     ),
     TypedGoRoute<PrivacySecuritySettingsRoute>(
       name: 'PrivacySecuritySettingsRoute',
       path: 'privacy_security',
     ),
-    TypedGoRoute<SearchContentSettingsRoute>(
-      name: 'SearchContentSettingsRoute',
-      path: 'search_content',
+    TypedGoRoute<ToolbarLayoutSettingsRoute>(
+      name: 'ToolbarLayoutSettingsRoute',
+      path: 'toolbar_layout',
     ),
-    TypedGoRoute<TabsBehaviorSettingsRoute>(
-      name: 'TabsBehaviorSettingsRoute',
-      path: 'tabs_behavior',
+    TypedGoRoute<WebContentSettingsRoute>(
+      name: 'WebContentSettingsRoute',
+      path: 'web_content',
     ),
-    TypedGoRoute<FingerprintingSettingsRoute>(
-      name: 'FingerprintingSettingsRoute',
-      path: 'fingerprinting',
+    TypedGoRoute<SearchSettingsRoute>(
+      name: 'SearchSettingsRoute',
+      path: 'search',
+    ),
+    TypedGoRoute<ExtensionsSettingsRoute>(
+      name: 'ExtensionsSettingsRoute',
+      path: 'extensions',
     ),
     TypedGoRoute<AdvancedSettingsRoute>(
       name: 'AdvancedSettingsRoute',
       path: 'advanced',
     ),
+    TypedGoRoute<ExperimentalSettingsRoute>(
+      name: 'ExperimentalSettingsRoute',
+      path: 'experimental',
+    ),
     TypedGoRoute<BangSettingsRoute>(name: 'BangSettingsRoute', path: 'bang'),
     TypedGoRoute<WebEngineHardeningRoute>(
       name: 'WebEngineHardeningRoute',
@@ -106,18 +114,17 @@ class SettingsRoute extends GoRouteData with $SettingsRoute {
   }
 }
 
-class AppearanceDisplaySettingsRoute extends GoRouteData
-    with $AppearanceDisplaySettingsRoute {
+class GeneralSettingsRoute extends GoRouteData with $GeneralSettingsRoute {
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return const AppearanceDisplaySettingsScreen();
+    return const GeneralSettingsScreen();
   }
 }
 
-class TabBarSettingsRoute extends GoRouteData with $TabBarSettingsRoute {
+class BrowsingSettingsRoute extends GoRouteData with $BrowsingSettingsRoute {
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return const TabBarSettingsScreen();
+    return const BrowsingSettingsScreen();
   }
 }
 
@@ -129,27 +136,34 @@ class PrivacySecuritySettingsRoute extends GoRouteData
   }
 }
 
-class SearchContentSettingsRoute extends GoRouteData
-    with $SearchContentSettingsRoute {
+class ToolbarLayoutSettingsRoute extends GoRouteData
+    with $ToolbarLayoutSettingsRoute {
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return const SearchContentSettingsScreen();
+    return const ToolbarLayoutSettingsScreen();
   }
 }
 
-class TabsBehaviorSettingsRoute extends GoRouteData
-    with $TabsBehaviorSettingsRoute {
+class WebContentSettingsRoute extends GoRouteData
+    with $WebContentSettingsRoute {
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return const TabsBehaviorSettingsScreen();
+    return const WebContentSettingsScreen();
   }
 }
 
-class FingerprintingSettingsRoute extends GoRouteData
-    with $FingerprintingSettingsRoute {
+class SearchSettingsRoute extends GoRouteData with $SearchSettingsRoute {
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return const FingerprintingSettingsScreen();
+    return const SearchSettingsScreen();
+  }
+}
+
+class ExtensionsSettingsRoute extends GoRouteData
+    with $ExtensionsSettingsRoute {
+  @override
+  Widget build(BuildContext context, GoRouterState state) {
+    return const ExtensionsSettingsScreen();
   }
 }
 
@@ -160,6 +174,14 @@ class AdvancedSettingsRoute extends GoRouteData with $AdvancedSettingsRoute {
   }
 }
 
+class ExperimentalSettingsRoute extends GoRouteData
+    with $ExperimentalSettingsRoute {
+  @override
+  Widget build(BuildContext context, GoRouterState state) {
+    return const ExperimentalSettingsScreen();
+  }
+}
+
 class BangSettingsRoute extends GoRouteData with $BangSettingsRoute {
   @override
   Widget build(BuildContext context, GoRouterState state) {