Refactor: Create BuildContext extension for Theme to reduce boilerplate

lib/core/theme/querya_theme_scope.dart

@@ -1,4 +1,6 @@
+import 'package:flutter/material.dart' as material;
 import 'package:flutter/widgets.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
 
 import 'querya_editor_theme.dart';
 import 'querya_semantic_palette.dart';
@@ -30,8 +32,14 @@ class QueryaThemeScope extends InheritedWidget {
   bool updateShouldNotify(QueryaThemeScope oldWidget) => data != oldWidget.data;
 }
 
-/// Convenient access to [QueryaTheme] tokens from [BuildContext].
+/// Convenient access to [QueryaTheme] tokens and [Theme] / [ColorScheme] from [BuildContext].
 extension QueryaThemeContext on BuildContext {
+  /// Shortcut for Material [material.Theme.of].
+  material.ThemeData get theme => material.Theme.of(this);
+
+  /// Shortcut for [shadcn.ColorScheme] from [shadcn.Theme.of].
+  shadcn.ColorScheme get colors => shadcn.Theme.of(this).colorScheme;
+
   QueryaTheme get queryaTheme => QueryaThemeScope.of(this);
 
   QueryaWorkbenchTheme get workbench => queryaTheme.workbench;

lib/features/connections/connections_panel_sidebar.dart

@@ -6,7 +6,7 @@ material.Widget _sidebarConnectionShell({
   required material.VoidCallback? onTap,
   required material.Widget child,
 }) {
-  final p = Theme.of(context).colorScheme.primary;
+  final p = context.colors.primary;
   return material.Material(
     color: material.Colors.transparent,
     child: material.InkWell(

lib/features/connections/driver_icon.dart

@@ -24,7 +24,7 @@ class DriverIcon extends StatelessWidget {
     final fallback = material.Icon(
       fallbackIcon,
       size: size,
-      color: Theme.of(context).colorScheme.primary,
+      color: context.colors.primary,
     );
 
     if (filePath != null) {
@@ -64,7 +64,7 @@ class DriverIconImage extends StatelessWidget {
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context);
+    final theme = context.theme;
     final fallback = material.Icon(
       fallbackIcon,
       size: size,

lib/features/connections/driver_manager_dialog.dart

@@ -74,7 +74,7 @@ class _DriverManagerDialogContent extends material.StatelessWidget {
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context).colorScheme;
+    final theme = context.colors;
     final drivers = _buildDriverList();
     return QueryaDialogCard(
       constraints: WindowLayout.dialogConstraints(

lib/features/connections/extension_connection_form.dart

@@ -189,7 +189,7 @@ class _ExtensionConnectionFormContentState
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context).colorScheme;
+    final theme = context.colors;
     final title = _isEditing
         ? 'Edit ${widget.driver.displayName}'
         : widget.driver.displayName;

lib/features/connections/new_connection_dialog.dart

@@ -104,7 +104,7 @@ class _NewConnectionDialogContentState
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context).colorScheme;
+    final theme = context.colors;
     final dialogMaxW = WindowLayout.newConnectionDialogMaxWidth(context);
     final dialogH = WindowLayout.newConnectionDialogHeight(context);
     final headerPadH = dialogMaxW < 420 ? 16.0 : 24.0;

lib/features/connections/new_connection_url_dialog.dart

@@ -48,7 +48,7 @@ class _NewConnectionUrlDialogContentState
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context).colorScheme;
+    final theme = context.colors;
     return QueryaDialogCard(
       constraints: WindowLayout.dialogConstraints(
         context,

lib/features/connections/new_folder_dialog.dart

@@ -36,7 +36,7 @@ class _NewFolderDialogContentState
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context).colorScheme;
+    final theme = context.colors;
     return QueryaDialogCard(
       constraints: WindowLayout.dialogConstraints(
         context,

lib/features/connections/sqlite_connection_form.dart

@@ -169,7 +169,7 @@ class _SqliteConnectionFormContentState
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context).colorScheme;
+    final theme = context.colors;
     final dialogMaxW = WindowLayout.newConnectionDialogMaxWidth(context);
     final dialogH = WindowLayout.newConnectionDialogHeight(context);
     final scrollH = dialogH - 120.0; // Subtract header and footer heights

lib/features/extensions/extension_sql_workspace.dart

@@ -8,7 +8,6 @@ import 'package:querya_desktop/core/extensions/extension_driver_session.dart';
 import 'package:querya_desktop/core/layout/vertical_split_pane.dart';
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/features/main_screen/query_editor_tab.dart';
 import 'package:querya_desktop/features/main_screen/results_tab.dart';
 import 'package:querya_desktop/features/main_screen/sql_editor_chrome.dart';

lib/features/help/about_dialog.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart' as material;
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:querya_desktop/core/app/external_link.dart';
 import 'package:querya_desktop/core/layout/window_layout.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 
 /// Shows the About Querya dialog.

lib/features/main_screen/main_screen.dart

@@ -11,8 +11,6 @@ import 'package:querya_desktop/core/layout/querya_split_handle.dart';
 import 'package:querya_desktop/core/motion/querya_spring.dart';
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:querya_desktop/core/extensions/sandbox/unsandboxed_launch_consent_gate.dart';
 import 'package:querya_desktop/features/extensions/presentation/widgets/unsandboxed_driver_consent_dialog.dart';
 import 'package:querya_desktop/features/connections/connection_creation_flow.dart';

lib/features/main_screen/workspace_empty_hero.dart

@@ -6,7 +6,6 @@ import 'package:querya_desktop/core/motion/querya_fade_slide.dart';
 import 'package:querya_desktop/core/motion/querya_stagger.dart';
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/core/ui/querya_icons.dart';
 import 'package:querya_desktop/features/connections/driver_icon.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';

lib/features/mongodb/mongo_collections_view.dart

@@ -3,7 +3,6 @@ import 'dart:math' show min;
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/database/mongodb_connection.dart';
 import 'package:querya_desktop/core/database/mongodb_service.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
 

lib/features/mongodb/mongo_database_dialog.dart

@@ -41,7 +41,7 @@ class _CreateMongoDBDialogContentState
 
   @override
   material.Widget build(material.BuildContext context) {
-    final theme = Theme.of(context).colorScheme;
+    final theme = context.colors;
 
     return QueryaDialogCard(
       constraints: WindowLayout.dialogConstraints(context, maxWidth: 500),

lib/features/mongodb/mongo_databases_view.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/database/mongodb_connection.dart';
 import 'package:querya_desktop/core/database/mongodb_service.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
 

lib/features/mongodb/mongo_document_editor.dart

@@ -5,7 +5,6 @@ import 'package:querya_desktop/core/database/mongodb_connection.dart';
 import 'package:querya_desktop/core/editor/querya_code_editor.dart';
 import 'package:querya_desktop/core/editor/querya_code_language.dart';
 import 'package:querya_desktop/core/database/mongodb_service.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
 

lib/features/mongodb/mongo_documents_view.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/database/mongodb_connection.dart';
 import 'package:querya_desktop/core/database/mongodb_service.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
 

lib/features/mysql/mysql_sql_workspace.dart

@@ -11,7 +11,6 @@ import 'package:querya_desktop/core/database/result_row_string_convert.dart';
 import 'package:querya_desktop/core/layout/vertical_split_pane.dart';
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/features/settings/preferences_dialog.dart';
 import 'package:querya_desktop/features/settings/sql_statement_timeout_dropdown.dart';
 import 'package:querya_desktop/features/main_screen/query_editor_tab.dart';

lib/features/postgresql/postgres_sql_workspace.dart

@@ -13,7 +13,6 @@ import 'package:querya_desktop/core/database/result_row_string_convert.dart';
 import 'package:querya_desktop/core/layout/vertical_split_pane.dart';
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/features/postgresql/postgres_object_kind.dart';
 import 'package:querya_desktop/features/postgresql/postgres_table_utils.dart';
 import 'package:querya_desktop/features/settings/preferences_dialog.dart';

lib/features/redis/redis_key_editor.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/database/redis_connection.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
 

lib/features/redis/redis_keys_view.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/database/redis_connection.dart';
 import 'package:querya_desktop/core/theme/querya_semantic_palette.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/shared/widgets/widgets.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
 

lib/features/sqlite/sqlite_sql_workspace.dart

@@ -11,7 +11,6 @@ import 'package:querya_desktop/core/database/sql_limit.dart';
 import 'package:querya_desktop/core/layout/vertical_split_pane.dart';
 import 'package:querya_desktop/core/storage/app_settings.dart';
 import 'package:querya_desktop/core/storage/local_db.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/features/settings/preferences_dialog.dart';
 import 'package:querya_desktop/features/main_screen/query_editor_tab.dart';
 import 'package:querya_desktop/features/main_screen/results_tab.dart';

lib/features/updater/update_dialog.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart' as material;
 import 'package:querya_desktop/core/layout/window_layout.dart';
 import 'package:querya_desktop/core/motion/querya_motion.dart';
 import 'package:querya_desktop/core/motion/querya_motion_context.dart';
-import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
 import 'package:querya_desktop/core/updater/app_updater_service.dart';
 import 'package:querya_desktop/core/updater/update_manifest.dart';
 import 'package:querya_desktop/features/updater/update_changelog_view.dart';

lib/shared/widgets/widgets.dart

@@ -20,4 +20,6 @@ export 'querya_dropdown.dart'
         QueryaDropdownTokens,
         kPreferencesLabelWidth;
 export 'tree_load_error.dart';
+export 'package:querya_desktop/core/theme/querya_theme_scope.dart'
+    show QueryaThemeContext;
 export 'package:shadcn_flutter/shadcn_flutter.dart';