rework tab bar; added contextual bar and quick switcher; tab abr dismissable; reorder now opt in; consolidated controllers and menu buttons;

app/lib/features/user/data/models/general_settings.dart

@@ -72,6 +72,8 @@ class GeneralSettings with FastEquatable {
   final Duration historyAutoCleanInterval;
   final bool tabViewBottomSheet;
   final bool tabBarReaderView;
+  final bool tabBarShowContextualBar;
+  final bool tabBarShowQuickTabSwitcherBar;
 
   GeneralSettings({
     required this.themeMode,
@@ -90,6 +92,8 @@ class GeneralSettings with FastEquatable {
     required this.historyAutoCleanInterval,
     required this.tabViewBottomSheet,
     required this.tabBarReaderView,
+    required this.tabBarShowContextualBar,
+    required this.tabBarShowQuickTabSwitcherBar,
   });
 
   GeneralSettings.withDefaults({
@@ -109,6 +113,8 @@ class GeneralSettings with FastEquatable {
     Duration? historyAutoCleanInterval,
     bool? tabViewBottomSheet,
     bool? tabBarReaderView,
+    bool? tabBarShowContextualBar,
+    bool? tabBarShowQuickTabSwitcherBar,
   }) : themeMode = themeMode ?? ThemeMode.dark,
        enableReadability = enableReadability ?? true,
        enforceReadability = enforceReadability ?? false,
@@ -126,7 +132,9 @@ class GeneralSettings with FastEquatable {
        historyAutoCleanInterval =
            historyAutoCleanInterval ?? const Duration(days: 90),
        tabViewBottomSheet = tabViewBottomSheet ?? false,
-       tabBarReaderView = tabBarReaderView ?? false;
+       tabBarReaderView = tabBarReaderView ?? false,
+       tabBarShowContextualBar = tabBarShowContextualBar ?? true,
+       tabBarShowQuickTabSwitcherBar = tabBarShowQuickTabSwitcherBar ?? true;
 
   factory GeneralSettings.fromJson(Map<String, dynamic> json) =>
       _$GeneralSettingsFromJson(json);
@@ -151,5 +159,7 @@ class GeneralSettings with FastEquatable {
     historyAutoCleanInterval,
     tabViewBottomSheet,
     tabBarReaderView,
+    tabBarShowContextualBar,
+    tabBarShowQuickTabSwitcherBar,
   ];
 }

app/lib/features/user/data/models/general_settings.g.dart

@@ -45,6 +45,12 @@ abstract class _$GeneralSettingsCWProxy {
 
   GeneralSettings tabBarReaderView(bool tabBarReaderView);
 
+  GeneralSettings tabBarShowContextualBar(bool tabBarShowContextualBar);
+
+  GeneralSettings tabBarShowQuickTabSwitcherBar(
+    bool tabBarShowQuickTabSwitcherBar,
+  );
+
   /// Creates a new instance with the provided field values.
   /// Passing `null` to a nullable field nullifies it, while `null` for a non-nullable field is ignored. To update a single field use `GeneralSettings(...).copyWith.fieldName(value)`.
   ///
@@ -69,6 +75,8 @@ abstract class _$GeneralSettingsCWProxy {
     Duration historyAutoCleanInterval,
     bool tabViewBottomSheet,
     bool tabBarReaderView,
+    bool tabBarShowContextualBar,
+    bool tabBarShowQuickTabSwitcherBar,
   });
 }
 
@@ -145,6 +153,15 @@ class _$GeneralSettingsCWProxyImpl implements _$GeneralSettingsCWProxy {
   GeneralSettings tabBarReaderView(bool tabBarReaderView) =>
       call(tabBarReaderView: tabBarReaderView);
 
+  @override
+  GeneralSettings tabBarShowContextualBar(bool tabBarShowContextualBar) =>
+      call(tabBarShowContextualBar: tabBarShowContextualBar);
+
+  @override
+  GeneralSettings tabBarShowQuickTabSwitcherBar(
+    bool tabBarShowQuickTabSwitcherBar,
+  ) => call(tabBarShowQuickTabSwitcherBar: tabBarShowQuickTabSwitcherBar);
+
   @override
   /// Creates a new instance with the provided field values.
   /// Passing `null` to a nullable field nullifies it, while `null` for a non-nullable field is ignored. To update a single field use `GeneralSettings(...).copyWith.fieldName(value)`.
@@ -170,6 +187,8 @@ class _$GeneralSettingsCWProxyImpl implements _$GeneralSettingsCWProxy {
     Object? historyAutoCleanInterval = const $CopyWithPlaceholder(),
     Object? tabViewBottomSheet = const $CopyWithPlaceholder(),
     Object? tabBarReaderView = const $CopyWithPlaceholder(),
+    Object? tabBarShowContextualBar = const $CopyWithPlaceholder(),
+    Object? tabBarShowQuickTabSwitcherBar = const $CopyWithPlaceholder(),
   }) {
     return GeneralSettings(
       themeMode: themeMode == const $CopyWithPlaceholder() || themeMode == null
@@ -264,6 +283,18 @@ class _$GeneralSettingsCWProxyImpl implements _$GeneralSettingsCWProxy {
           ? _value.tabBarReaderView
           // ignore: cast_nullable_to_non_nullable
           : tabBarReaderView as bool,
+      tabBarShowContextualBar:
+          tabBarShowContextualBar == const $CopyWithPlaceholder() ||
+              tabBarShowContextualBar == null
+          ? _value.tabBarShowContextualBar
+          // ignore: cast_nullable_to_non_nullable
+          : tabBarShowContextualBar as bool,
+      tabBarShowQuickTabSwitcherBar:
+          tabBarShowQuickTabSwitcherBar == const $CopyWithPlaceholder() ||
+              tabBarShowQuickTabSwitcherBar == null
+          ? _value.tabBarShowQuickTabSwitcherBar
+          // ignore: cast_nullable_to_non_nullable
+          : tabBarShowQuickTabSwitcherBar as bool,
     );
   }
 }
@@ -279,46 +310,48 @@ extension $GeneralSettingsCopyWith on GeneralSettings {
 // JsonSerializableGenerator
 // **************************************************************************
 
-GeneralSettings _$GeneralSettingsFromJson(Map<String, dynamic> json) =>
-    GeneralSettings.withDefaults(
-      themeMode: $enumDecodeNullable(_$ThemeModeEnumMap, json['themeMode']),
-      enableReadability: json['enableReadability'] as bool?,
-      enforceReadability: json['enforceReadability'] as bool?,
-      deleteBrowsingDataOnQuit:
-          (json['deleteBrowsingDataOnQuit'] as List<dynamic>?)
-              ?.map((e) => $enumDecode(_$DeleteBrowsingDataTypeEnumMap, e))
-              .toSet(),
-      defaultSearchProvider: const BangKeyConverter().fromJson(
-        json['defaultSearchProvider'] as String?,
-      ),
-      defaultSearchSuggestionsProvider: $enumDecodeNullable(
-        _$SearchSuggestionProvidersEnumMap,
-        json['defaultSearchSuggestionsProvider'],
-      ),
-      createChildTabsOption: json['createChildTabsOption'] as bool?,
-      showExtensionShortcut: json['showExtensionShortcut'] as bool?,
-      enableLocalAiFeatures: json['enableLocalAiFeatures'] as bool?,
-      defaultCreateTabType: $enumDecodeNullable(
-        _$TabTypeEnumMap,
-        json['defaultCreateTabType'],
-      ),
-      tabIntentOpenSetting: $enumDecodeNullable(
-        _$TabIntentOpenSettingEnumMap,
-        json['tabIntentOpenSetting'],
-      ),
-      autoHideTabBar: json['autoHideTabBar'] as bool?,
-      tabBarSwipeAction: $enumDecodeNullable(
-        _$TabBarSwipeActionEnumMap,
-        json['tabBarSwipeAction'],
-      ),
-      historyAutoCleanInterval: json['historyAutoCleanInterval'] == null
-          ? null
-          : Duration(
-              microseconds: (json['historyAutoCleanInterval'] as num).toInt(),
-            ),
-      tabViewBottomSheet: json['tabViewBottomSheet'] as bool?,
-      tabBarReaderView: json['tabBarReaderView'] as bool?,
-    );
+GeneralSettings _$GeneralSettingsFromJson(
+  Map<String, dynamic> json,
+) => GeneralSettings.withDefaults(
+  themeMode: $enumDecodeNullable(_$ThemeModeEnumMap, json['themeMode']),
+  enableReadability: json['enableReadability'] as bool?,
+  enforceReadability: json['enforceReadability'] as bool?,
+  deleteBrowsingDataOnQuit: (json['deleteBrowsingDataOnQuit'] as List<dynamic>?)
+      ?.map((e) => $enumDecode(_$DeleteBrowsingDataTypeEnumMap, e))
+      .toSet(),
+  defaultSearchProvider: const BangKeyConverter().fromJson(
+    json['defaultSearchProvider'] as String?,
+  ),
+  defaultSearchSuggestionsProvider: $enumDecodeNullable(
+    _$SearchSuggestionProvidersEnumMap,
+    json['defaultSearchSuggestionsProvider'],
+  ),
+  createChildTabsOption: json['createChildTabsOption'] as bool?,
+  showExtensionShortcut: json['showExtensionShortcut'] as bool?,
+  enableLocalAiFeatures: json['enableLocalAiFeatures'] as bool?,
+  defaultCreateTabType: $enumDecodeNullable(
+    _$TabTypeEnumMap,
+    json['defaultCreateTabType'],
+  ),
+  tabIntentOpenSetting: $enumDecodeNullable(
+    _$TabIntentOpenSettingEnumMap,
+    json['tabIntentOpenSetting'],
+  ),
+  autoHideTabBar: json['autoHideTabBar'] as bool?,
+  tabBarSwipeAction: $enumDecodeNullable(
+    _$TabBarSwipeActionEnumMap,
+    json['tabBarSwipeAction'],
+  ),
+  historyAutoCleanInterval: json['historyAutoCleanInterval'] == null
+      ? null
+      : Duration(
+          microseconds: (json['historyAutoCleanInterval'] as num).toInt(),
+        ),
+  tabViewBottomSheet: json['tabViewBottomSheet'] as bool?,
+  tabBarReaderView: json['tabBarReaderView'] as bool?,
+  tabBarShowContextualBar: json['tabBarShowContextualBar'] as bool?,
+  tabBarShowQuickTabSwitcherBar: json['tabBarShowQuickTabSwitcherBar'] as bool?,
+);
 
 Map<String, dynamic> _$GeneralSettingsToJson(
   GeneralSettings instance,
@@ -346,6 +379,8 @@ Map<String, dynamic> _$GeneralSettingsToJson(
   'historyAutoCleanInterval': instance.historyAutoCleanInterval.inMicroseconds,
   'tabViewBottomSheet': instance.tabViewBottomSheet,
   'tabBarReaderView': instance.tabBarReaderView,
+  'tabBarShowContextualBar': instance.tabBarShowContextualBar,
+  'tabBarShowQuickTabSwitcherBar': instance.tabBarShowQuickTabSwitcherBar,
 };
 
 const _$ThemeModeEnumMap = {

app/lib/features/user/domain/repositories/general_settings.dart

@@ -108,6 +108,12 @@ class GeneralSettingsRepository extends _$GeneralSettingsRepository {
         DriftSqlType.bool,
         db.typeMapping,
       ),
+      'tabBarShowContextualBar': settings['tabBarShowContextualBar']?.readAs(
+        DriftSqlType.bool,
+        db.typeMapping,
+      ),
+      'tabBarShowQuickTabSwitcherBar': settings['tabBarShowQuickTabSwitcherBar']
+          ?.readAs(DriftSqlType.bool, db.typeMapping),
     });
   }
 

app/lib/features/user/domain/repositories/general_settings.g.dart

@@ -35,7 +35,7 @@ final class GeneralSettingsRepositoryProvider
 }
 
 String _$generalSettingsRepositoryHash() =>
-    r'e929fd7a8bf315b08ea7f5a4df2bd5bf066bc84f';
+    r'4014986c9510d6d7210c5c16d814f6b018a1f93c';
 
 abstract class _$GeneralSettingsRepository
     extends $StreamNotifier<GeneralSettings> {