Skip to content

Commit ff8ba5b

Browse files
ZhuchkaTriplesixZhuchkaTriplesix
authored
Merge pull request #1074 from QueryaHub/issue/1039-migrate-views-to-querya-ui-kit
refactor(ui): migrate views to Querya UI Kit and add architectural guard tests (#1039)
2 parents 61dafcc + 7b0da94 commit ff8ba5b

57 files changed

Lines changed: 271 additions & 507 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/core/sdui/sdui_tree_builder.dart‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,9 @@ class SduiTreeBuilderState extends material.State<SduiTreeBuilder> {
263263
expandable: node.expandable,
264264
),
265265
iconWidget: isLoading
266-
? const material.SizedBox(
267-
width: QueryaTreeTokens.spinnerNested,
268-
height: QueryaTreeTokens.spinnerNested,
269-
child: material.CircularProgressIndicator(
270-
strokeWidth: QueryaTreeTokens.spinnerStroke,
271-
),
266+
? const QueryaSpinner(
267+
customDimension: QueryaTreeTokens.spinnerNested,
268+
strokeWidth: QueryaTreeTokens.spinnerStroke,
272269
)
273270
: null,
274271
iconSize: iconSize,

‎lib/features/connections/extension_connection_form.dart‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class _ExtensionConnectionFormContentState
238238
const material.Padding(
239239
padding: material.EdgeInsets.all(24),
240240
child: material.Center(
241-
child: material.CircularProgressIndicator(),
241+
child: QueryaSpinner(size: QueryaSpinnerSize.md),
242242
),
243243
)
244244
else if (_loadError != null)
@@ -287,12 +287,8 @@ class _ExtensionConnectionFormContentState
287287
onPressed:
288288
_schema == null || _testing ? null : _testConnection,
289289
leading: _testing
290-
? const material.SizedBox(
291-
width: 14,
292-
height: 14,
293-
child: material.CircularProgressIndicator(
294-
strokeWidth: 2,
295-
),
290+
? const QueryaSpinner(
291+
size: QueryaSpinnerSize.sm,
296292
)
297293
: const material.Icon(
298294
material.Icons.bolt_rounded,

‎lib/features/connections/sqlite_connection_form.dart‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,10 @@ class _SqliteConnectionFormContentState
392392
onPressed:
393393
formValid && !_isTesting ? _testConnection : null,
394394
leading: _isTesting
395-
? material.SizedBox(
396-
width: 18,
397-
height: 18,
398-
child: material.CircularProgressIndicator(
399-
strokeWidth: 2,
400-
color: theme.primary,
401-
),
395+
? QueryaSpinner(
396+
customDimension: 18,
397+
strokeWidth: 2,
398+
color: theme.primary,
402399
)
403400
: material.Icon(
404401
material.Icons.link_rounded,

‎lib/features/extensions/extension_driver_recovery_banner.dart‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart' as material;
2-
import 'package:shadcn_flutter/shadcn_flutter.dart';
2+
import 'package:querya_desktop/shared/widgets/widgets.dart';
33

44
/// Banner displayed when an extension driver process crashes, deadlocks,
55
/// or disconnects unexpectedly, allowing the user to restart the driver process
@@ -65,12 +65,8 @@ class ExtensionDriverRecoveryBanner extends material.StatelessWidget {
6565
size: ButtonSize.small,
6666
onPressed: isRestarting ? null : onRestart,
6767
leading: isRestarting
68-
? const material.SizedBox(
69-
width: 14,
70-
height: 14,
71-
child: material.CircularProgressIndicator(
72-
strokeWidth: 2,
73-
),
68+
? const QueryaSpinner(
69+
size: QueryaSpinnerSize.sm,
7470
)
7571
: const material.Icon(
7672
material.Icons.restart_alt_rounded,

‎lib/features/extensions/extension_sql_workspace.dart‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -707,13 +707,9 @@ class _ExtensionSqlToolbar extends material.StatelessWidget {
707707
IconButton.ghost(
708708
onPressed: running || isRestarting ? null : onRestartDriver,
709709
icon: isRestarting
710-
? material.SizedBox(
711-
width: 14,
712-
height: 14,
713-
child: material.CircularProgressIndicator(
714-
strokeWidth: 2,
715-
color: accent,
716-
),
710+
? QueryaSpinner(
711+
size: QueryaSpinnerSize.sm,
712+
color: accent,
717713
)
718714
: material.Icon(
719715
material.Icons.restart_alt_rounded,
@@ -755,13 +751,9 @@ class _ExtensionSqlToolbar extends material.StatelessWidget {
755751
OutlineButton(
756752
onPressed: onExecute,
757753
leading: running
758-
? material.SizedBox(
759-
width: 16,
760-
height: 16,
761-
child: material.CircularProgressIndicator(
762-
strokeWidth: 2,
763-
color: accent,
764-
),
754+
? QueryaSpinner(
755+
size: QueryaSpinnerSize.sm,
756+
color: accent,
765757
)
766758
: material.Icon(
767759
material.Icons.play_arrow_rounded,

‎lib/features/extensions/extension_stats_view.dart‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,10 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView> {
127127
final cs = Theme.of(context).colorScheme;
128128

129129
if (_loading) {
130-
return material.Center(
131-
child: material.Column(
132-
mainAxisSize: material.MainAxisSize.min,
133-
children: [
134-
const material.SizedBox(
135-
width: 32,
136-
height: 32,
137-
child: material.CircularProgressIndicator(strokeWidth: 2),
138-
),
139-
const Gap(16),
140-
const Text('Loading server statistics...').muted().small(),
141-
],
130+
return const material.Center(
131+
child: QueryaSpinner(
132+
size: QueryaSpinnerSize.lg,
133+
label: 'Loading server statistics...',
142134
),
143135
);
144136
}

‎lib/features/extensions/extension_table_toolbar.dart‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,7 @@ class ExtensionTableToolbar extends material.StatelessWidget {
210210
size: ButtonSize.small,
211211
onPressed: loading || isRestarting ? null : onRestartDriver,
212212
leading: isRestarting
213-
? const material.SizedBox(
214-
width: 14,
215-
height: 14,
216-
child: material.CircularProgressIndicator(
217-
strokeWidth: 2,
218-
),
219-
)
213+
? const QueryaSpinner(size: QueryaSpinnerSize.sm)
220214
: const material.Icon(
221215
material.Icons.restart_alt_rounded,
222216
size: 15,

‎lib/features/extensions/extension_table_view.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ class _ExtensionTableViewState extends material.State<ExtensionTableView> {
512512
context: context,
513513
barrierDismissible: false,
514514
builder: (ctx) => const material.Center(
515-
child: material.CircularProgressIndicator(),
515+
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
516516
),
517517
));
518518

‎lib/features/extensions/presentation/pages/extension_manager_dialog.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class _ExtensionManagerContentState
273273
material.Widget _buildInstalledTab() {
274274
if (_loading) {
275275
return const material.Center(
276-
child: material.CircularProgressIndicator(),
276+
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
277277
);
278278
}
279279
return material.Column(
@@ -342,7 +342,7 @@ class _ExtensionManagerContentState
342342
material.Widget _buildMarketplaceTab() {
343343
if (_loading) {
344344
return const material.Center(
345-
child: material.CircularProgressIndicator(),
345+
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
346346
);
347347
}
348348
final theme = Theme.of(context).colorScheme;
@@ -431,7 +431,7 @@ class _ExtensionManagerContentState
431431
material.Widget _buildUpdatesTab() {
432432
if (_loading) {
433433
return const material.Center(
434-
child: material.CircularProgressIndicator(),
434+
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
435435
);
436436
}
437437
final theme = Theme.of(context).colorScheme;

‎lib/features/extensions/presentation/widgets/extension_sideload_dialog.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class _ExtensionSideloadDialogState
6060
final cs = Theme.of(context).colorScheme;
6161
final fileName = p.basename(widget.archivePath);
6262

63-
return material.AlertDialog(
63+
return QueryaModalDialog(
6464
title: const material.Text('Install local extension'),
6565
content: material.SizedBox(
6666
width: 440,

0 commit comments

Comments
 (0)