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
2 changes: 1 addition & 1 deletion lib/features/mysql/mysql_connection_form.dart
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ class _MysqlConnectionFormContentState

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

return QueryaDialogCard(
constraints: WindowLayout.dialogConstraints(
Expand Down
9 changes: 4 additions & 5 deletions lib/features/mysql/mysql_routine_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ class _MysqlRoutineViewState extends material.State<MysqlRoutineView> {

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context);
final cs = theme.colorScheme;
final cs = context.colors;
final kindTitle = widget.isFunction ? 'Function' : 'Procedure';

return material.Column(
Expand All @@ -134,10 +133,10 @@ class _MysqlRoutineViewState extends material.State<MysqlRoutineView> {
padding:
const material.EdgeInsets.symmetric(horizontal: 16, vertical: 10),
decoration: material.BoxDecoration(
color: theme.colorScheme.card,
color: cs.card,
border: material.Border(
bottom: material.BorderSide(
color: theme.colorScheme.border.withValues(alpha: 0.5),
color: cs.border.withValues(alpha: 0.5),
),
),
),
Expand All @@ -146,7 +145,7 @@ class _MysqlRoutineViewState extends material.State<MysqlRoutineView> {
material.Icon(
material.Icons.functions_rounded,
size: 18,
color: theme.colorScheme.primary,
color: cs.primary,
),
const Gap(8),
material.Expanded(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/mysql/mysql_sql_editor_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class _MysqlSqlEditorDialogState extends material.State<_MysqlSqlEditorDialog> {

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context).colorScheme;
final theme = context.colors;
return material.Dialog(
backgroundColor: material.Colors.transparent,
insetPadding: WindowLayout.dialogSymmetricInsets(context),
Expand Down
14 changes: 6 additions & 8 deletions lib/features/mysql/mysql_stats_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import 'package:querya_desktop/core/database/mysql_service.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/shared/widgets/querya_sparkline.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 @@ -164,7 +162,7 @@ class _MysqlStatsViewState extends material.State<MysqlStatsView>

@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 @@ -260,7 +258,7 @@ class _MysqlStatsViewState extends material.State<MysqlStatsView>
}

material.Widget _header(material.BuildContext context) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return material.Row(
children: [
material.Container(
Expand Down Expand Up @@ -354,7 +352,7 @@ class _MysqlStatsViewState extends material.State<MysqlStatsView>

material.Widget _summaryChips(
material.BuildContext context, Map<String, dynamic> stats) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
final versionFull = stats['version'] as String? ?? '—';
final versionShort = _extractMysqlVersion(versionFull);
final uptimeSec = stats['uptime_seconds'] as int? ?? 0;
Expand Down Expand Up @@ -436,7 +434,7 @@ class _MysqlStatsViewState extends material.State<MysqlStatsView>
double? minHeight,
bool stretchBody = false,
}) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return material.Container(
width: double.infinity,
constraints: minHeight != null
Expand Down Expand Up @@ -578,7 +576,7 @@ class _MysqlStatsViewState extends material.State<MysqlStatsView>
final databases = stats['databases'] as List<Map<String, dynamic>>? ?? [];
if (databases.isEmpty) return const material.SizedBox.shrink();

final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return _card(
context,
'Databases',
Expand Down Expand Up @@ -637,7 +635,7 @@ class _MysqlStatsViewState extends material.State<MysqlStatsView>

material.Widget _metricRow(
material.BuildContext context, String label, String value) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return material.Padding(
padding: const material.EdgeInsets.symmetric(vertical: 6),
child: material.Row(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/mysql/mysql_table_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ class _MysqlTableViewState extends material.State<MysqlTableView> {
onNavigateHome: widget.onNavigateHome,
showExportToolbar: true,
customToolbarBuilder: (ctx, state) {
final cs = Theme.of(ctx).colorScheme;
final cs = ctx.colors;
final title = '$tableTitle${widget.isView ? ' (view)' : ''}';

return material.Container(
Expand Down
6 changes: 3 additions & 3 deletions lib/features/mysql/mysql_workspace_home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ class _MysqlWorkspaceHomeState extends material.State<MysqlWorkspaceHome> {

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context);
final colors = context.colors;
return Column(
crossAxisAlignment: 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 _MysqlWorkspaceHomeState extends material.State<MysqlWorkspaceHome> {
material.Icon(
material.Icons.lock_outline_rounded,
size: 14,
color: theme.colorScheme.mutedForeground,
color: colors.mutedForeground,
),
],
if (widget.lastSelectedMysqlObject != null &&
Expand Down
12 changes: 6 additions & 6 deletions lib/features/postgresql/postgres_browser_views.dart
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class _PostgresIndexListViewState

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
if (_loading) {
return material.Container(
color: cs.background,
Expand Down Expand Up @@ -264,7 +264,7 @@ class _PostgresTriggerListViewState

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
if (_loading) {
return material.Container(
color: cs.background,
Expand Down Expand Up @@ -431,7 +431,7 @@ class _PostgresTypeListViewState extends material.State<PostgresTypeListView> {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
if (_loading) {
return const material.Center(
child: QueryaSpinner(size: QueryaSpinnerSize.md),
Expand Down Expand Up @@ -578,7 +578,7 @@ class _PostgresExtensionListViewState

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
if (_loading) {
return const material.Center(
child: QueryaSpinner(size: QueryaSpinnerSize.md),
Expand Down Expand Up @@ -722,7 +722,7 @@ class _PostgresFdwListViewState extends material.State<PostgresFdwListView> {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
if (_loading) {
return const material.Center(
child: QueryaSpinner(size: QueryaSpinnerSize.md),
Expand Down Expand Up @@ -832,7 +832,7 @@ material.Widget _browserToolbar(
required String title,
required VoidCallback onRefresh,
}) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
return material.Container(
padding: const material.EdgeInsets.fromLTRB(16, 10, 16, 10),
decoration: material.BoxDecoration(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/postgresql/postgres_routine_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class _PostgresRoutineViewState extends material.State<PostgresRoutineView> {

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

if (_loading) {
return material.Container(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/postgresql/postgres_sequence_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class _PostgresSequenceViewState extends material.State<PostgresSequenceView> {

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

if (_loading) {
return material.Container(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/postgresql/postgres_sql_editor_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class _PostgresSqlEditorDialogState

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context).colorScheme;
final theme = context.colors;
return material.Dialog(
backgroundColor: material.Colors.transparent,
insetPadding: WindowLayout.dialogSymmetricInsets(context),
Expand Down
14 changes: 6 additions & 8 deletions lib/features/postgresql/postgres_stats_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import 'package:querya_desktop/core/database/postgres_service.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/shared/widgets/querya_sparkline.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 @@ -202,7 +200,7 @@ class _PostgresStatsViewState extends material.State<PostgresStatsView>

@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 @@ -301,7 +299,7 @@ class _PostgresStatsViewState extends material.State<PostgresStatsView>
}

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 @@ -369,7 +367,7 @@ class _PostgresStatsViewState extends material.State<PostgresStatsView>

material.Widget _summaryChips(
material.BuildContext context, Map<String, dynamic> stats) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
final versionFull = stats['version'] as String? ?? '—';
final versionShort = _extractPgVersion(versionFull);
final settings = stats['settings'] as Map<String, String>? ?? {};
Expand Down Expand Up @@ -451,7 +449,7 @@ class _PostgresStatsViewState extends material.State<PostgresStatsView>
material.Widget _card(
material.BuildContext context, String title, material.Widget body,
{double? minHeight}) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return material.Container(
width: double.infinity,
constraints: minHeight != null
Expand Down Expand Up @@ -535,7 +533,7 @@ class _PostgresStatsViewState extends material.State<PostgresStatsView>
final databases = stats['databases'] as List<Map<String, dynamic>>? ?? [];
if (databases.isEmpty) return const material.SizedBox.shrink();

final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return _card(
context,
'Databases',
Expand Down Expand Up @@ -609,7 +607,7 @@ class _PostgresStatsViewState extends material.State<PostgresStatsView>

material.Widget _row(
material.BuildContext context, String key, String value) {
final cs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
return material.Padding(
padding: const material.EdgeInsets.symmetric(vertical: 4),
child: material.Row(
Expand Down
5 changes: 3 additions & 2 deletions lib/features/postgresql/postgres_table_privileges_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:querya_desktop/core/database/postgres_connection.dart';
import 'package:querya_desktop/core/layout/window_layout.dart';
import 'package:querya_desktop/core/database/postgres_metadata.dart';
import 'package:querya_desktop/core/theme/querya_typography.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 @@ -78,7 +79,7 @@ class _PrivilegesDialogBodyState extends material.State<_PrivilegesDialogBody> {

@override
material.Widget build(material.BuildContext context) {
final theme = Theme.of(context).colorScheme;
final theme = context.colors;
final mq = material.MediaQuery.sizeOf(context);
final hInset = WindowLayout.dialogVerticalInset(mq.height) * 2;
final wInset = WindowLayout.dialogHorizontalInset(mq.width) * 2;
Expand Down Expand Up @@ -167,7 +168,7 @@ class _PrivilegesDialogBodyState extends material.State<_PrivilegesDialogBody> {
);
}

material.Widget _buildListArea(ColorScheme theme) {
material.Widget _buildListArea(QueryaUiColors theme) {
if (_loading) {
return const material.Center(
child: QueryaSpinner(size: QueryaSpinnerSize.md),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/postgresql/postgres_table_toolbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class PostgresTableToolbar extends material.StatelessWidget {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
return material.Container(
padding: const material.EdgeInsets.fromLTRB(16, 10, 16, 10),
decoration: material.BoxDecoration(
Expand Down
6 changes: 3 additions & 3 deletions lib/features/postgresql/postgres_workspace_home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ class _PostgresWorkspaceHomeState

@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 @@ -119,7 +119,7 @@ class _PostgresWorkspaceHomeState
material.Icon(
material.Icons.lock_outline_rounded,
size: 14,
color: theme.colorScheme.mutedForeground,
color: colors.mutedForeground,
),
],
if (widget.lastSelectedPostgresObject != null &&
Expand Down
2 changes: 1 addition & 1 deletion lib/features/postgresql/postgresql_connection_form.dart
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ class _PostgresConnectionFormContentState

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

return QueryaDialogCard(
constraints: WindowLayout.dialogConstraints(
Expand Down
8 changes: 4 additions & 4 deletions lib/features/sqlite/sqlite_overview_tab.dart
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class _SqliteOverviewTabState extends material.State<SqliteOverviewTab> {

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

if (_loading && _overview == null) {
return const material.Center(
Expand Down Expand Up @@ -217,7 +217,7 @@ class _SqliteOverviewTabState extends material.State<SqliteOverviewTab> {
}

material.Widget _header(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
final name = widget.connectionRow.name;
final path = widget.connectionRow.host ?? 'in-memory';
return material.Row(
Expand Down Expand Up @@ -280,7 +280,7 @@ class _SqliteOverviewTabState extends material.State<SqliteOverviewTab> {
int pageCount,
int pageSize,
) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

material.Widget chip(String label, String value, material.IconData icon) {
return material.Expanded(
Expand Down Expand Up @@ -345,7 +345,7 @@ class _SqliteOverviewTabState extends material.State<SqliteOverviewTab> {
}

material.Widget _tablesCard(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
return material.Container(
decoration: material.BoxDecoration(
color: cs.card,
Expand Down
Loading
Loading