Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/features/extensions/extension_driver_recovery_banner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ class ExtensionDriverRecoveryBanner extends material.StatelessWidget {
@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context);
final colors = context.colors;
final isDark = theme.brightness == material.Brightness.dark;

final bgColor = isDark
? theme.colorScheme.destructive.withValues(alpha: 0.12)
: theme.colorScheme.destructive.withValues(alpha: 0.08);
? colors.destructive.withValues(alpha: 0.12)
: colors.destructive.withValues(alpha: 0.08);

final borderColor = theme.colorScheme.destructive.withValues(alpha: 0.35);
final borderColor = colors.destructive.withValues(alpha: 0.35);

return material.Container(
margin: const material.EdgeInsets.fromLTRB(12, 8, 12, 8),
Expand All @@ -41,7 +42,7 @@ class ExtensionDriverRecoveryBanner extends material.StatelessWidget {
material.Icon(
material.Icons.power_off_rounded,
size: 20,
color: theme.colorScheme.destructive,
color: colors.destructive,
),
const Gap(12),
material.Expanded(
Expand Down
15 changes: 7 additions & 8 deletions lib/features/extensions/extension_stats_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import 'package:querya_desktop/core/extensions/models/extension_server_stats.dar
import 'package:querya_desktop/core/motion/polling_controller.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/core/util/deep_collection_equals.dart';
import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn
hide TextExtension;
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

const _pollInterval = Duration(seconds: 5);
Expand Down Expand Up @@ -113,7 +112,7 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView>

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

if (_loading) {
return const material.Center(
Expand Down Expand Up @@ -195,7 +194,7 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView>
}

material.Widget _header(material.BuildContext context) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return material.LayoutBuilder(
builder: (context, constraints) {
return material.SingleChildScrollView(
Expand Down Expand Up @@ -251,7 +250,7 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView>

material.Widget _summaryChips(
material.BuildContext context, ExtensionServerStats stats) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
final versionFull = stats.serverVersion ?? '—';
final uptimeSec = stats.uptimeSeconds;
final uptimeStr = uptimeSec == null
Expand Down Expand Up @@ -314,7 +313,7 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView>
}

material.Widget _buildChip(
shadcn.ColorScheme cs, ({String label, String value, material.IconData icon}) chip) {
QueryaUiColors cs, ({String label, String value, material.IconData icon}) chip) {
return Card(
padding: const material.EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: material.Row(
Expand Down Expand Up @@ -356,7 +355,7 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView>

material.Widget _databasesCard(
material.BuildContext context, ExtensionServerStats stats) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
final sizes = stats.databaseSizes;
final totalBytes = sizes.values.fold<int>(0, (a, b) => a + b);
final sorted = sizes.entries.toList()
Expand Down Expand Up @@ -457,7 +456,7 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView>

material.Widget _extraMetricsCard(
material.BuildContext context, ExtensionServerStats stats) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
final extra = stats.extraMetrics.entries.toList();

return Card(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/extensions/extension_table_toolbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ExtensionTableToolbar extends material.StatelessWidget {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
final isFiltered = filterActive || filterText.trim().isNotEmpty;

return material.Container(
Expand Down
7 changes: 2 additions & 5 deletions lib/features/extensions/extension_table_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,10 @@ class _ExtensionTableViewState extends material.State<ExtensionTableView> {
horizontal: 16, vertical: 8),
decoration: material.BoxDecoration(
color:
Theme.of(context).colorScheme.muted.withValues(alpha: 0.3),
context.colors.muted.withValues(alpha: 0.3),
border: material.Border(
bottom: material.BorderSide(
color: Theme.of(context)
.colorScheme
.border
.withValues(alpha: 0.3),
color: context.colors.border.withValues(alpha: 0.3),
),
),
),
Expand Down
6 changes: 3 additions & 3 deletions lib/features/extensions/extension_workspace_home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ class _ExtensionWorkspaceHomeState

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context);
final colors = context.colors;
return Column(
crossAxisAlignment: material.CrossAxisAlignment.stretch,
children: [
material.Container(
constraints: const material.BoxConstraints(minHeight: 44),
padding: const material.EdgeInsets.symmetric(horizontal: 12),
decoration: material.BoxDecoration(
color: theme.colorScheme.muted.withValues(alpha: 0.6),
color: colors.muted.withValues(alpha: 0.6),
),
child: material.Row(
children: [
Expand All @@ -104,7 +104,7 @@ class _ExtensionWorkspaceHomeState
material.Icon(
material.Icons.lock_outline_rounded,
size: 14,
color: theme.colorScheme.mutedForeground,
color: colors.mutedForeground,
),
],
if (widget.lastSelectedExtensionObject != null &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ class _ExtensionManagerContentState

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context).colorScheme;
final theme = context.colors;
final onPopover = theme.popoverForeground;

return material.DefaultTextStyle(
Expand Down Expand Up @@ -364,7 +364,7 @@ class _ExtensionManagerContentState
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
);
}
final theme = Theme.of(context).colorScheme;
final theme = context.colors;
return material.Column(
children: [
material.Padding(
Expand Down Expand Up @@ -499,7 +499,7 @@ class _ExtensionManagerContentState
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
);
}
final theme = Theme.of(context).colorScheme;
final theme = context.colors;
return material.Center(
child: material.Padding(
padding: const material.EdgeInsets.all(32.0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/extensions/extension_support.dart';
import 'package:querya_desktop/core/extensions/models/extension_manifest.dart';
import 'package:querya_desktop/core/extensions/models/extension_type.dart';
import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

Expand Down Expand Up @@ -29,7 +30,7 @@ class ExtensionCard extends material.StatelessWidget {

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context).colorScheme;
final theme = context.colors;
final radius = Theme.of(context).radiusMd;
final isPreview = ExtensionSupport.isPreviewOnlyManifest(manifest);

Expand Down Expand Up @@ -161,7 +162,7 @@ class ExtensionCard extends material.StatelessWidget {
);
}

material.Widget _buildIcon(ColorScheme theme, double radius) {
material.Widget _buildIcon(QueryaUiColors theme, double radius) {
return material.Container(
width: 48,
height: 48,
Expand All @@ -179,7 +180,7 @@ class ExtensionCard extends material.StatelessWidget {
);
}

material.Widget _buildPreviewBadge(ColorScheme theme) {
material.Widget _buildPreviewBadge(QueryaUiColors theme) {
return material.Container(
padding: const material.EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: material.BoxDecoration(
Expand All @@ -198,7 +199,7 @@ class ExtensionCard extends material.StatelessWidget {
);
}

material.Widget _buildTagBadge(ColorScheme theme, String tag) {
material.Widget _buildTagBadge(QueryaUiColors theme, String tag) {
return material.Container(
padding: const material.EdgeInsets.symmetric(horizontal: 6, vertical: 2),
decoration: material.BoxDecoration(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class _ExtensionSideloadDialogState

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
final fileName = p.basename(widget.archivePath);

return QueryaModalDialog(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Future<bool> showUnsandboxedDriverConsentDialog(
details.installHint!,
style: material.TextStyle(
fontSize: 13,
color: Theme.of(dialogContext).colorScheme.mutedForeground,
color: dialogContext.colors.mutedForeground,
),
),
],
Expand Down
1 change: 1 addition & 0 deletions test/guards/colors_through_context_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
void main() {
const migrated = <String>[
'lib/features/connections',
'lib/features/extensions',
'lib/features/mongodb',
'lib/features/mysql',
'lib/features/postgresql',
Expand Down
1 change: 0 additions & 1 deletion test/guards/shadcn_imports_ratchet_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ void main() {
'lib/features/erd/widgets/erd_group_menu.dart',
'lib/features/erd/widgets/erd_note_card.dart',
'lib/features/erd/widgets/erd_table_menu.dart',
'lib/features/extensions/extension_stats_view.dart',
'lib/features/main_screen/querya_window_title_bar.dart',
'lib/features/mongodb/mongo_document_tree_view.dart',
'lib/features/mongodb/mongo_documents_json_view.dart',
Expand Down
Loading