Skip to content

Commit edbb109

Browse files
refactor(ui): text styles from QueryaTextStyles, shadcn TextExtension hidden (#1468)
* refactor(ui): text styles from our own QueryaTextStyles, shadcn TextExtension hidden xSmall / small / base / large / medium / semiBold / bold / muted / foreground are a kit extension over DefaultTextStyle with the sizes the app already used. The widgets.dart barrel and every direct shadcn import hide shadcn's TextExtension, so call sites are unchanged. Refs #1465 * fix(ui): hide TextExtension on prefixed shadcn imports, add ellipsis() An extension from a prefixed import still applies implicitly, so the 27 files importing shadcn as shadcn saw both extensions and every chained modifier was ambiguous. They now hide it too. QueryaTextStyles also gets ellipsis() (one line, cut), which one call site used. * style: child last in QueryaTextStyles calls (sort_child_properties_last)
1 parent 886cb30 commit edbb109

119 files changed

Lines changed: 317 additions & 117 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/app/app.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:querya_desktop/core/motion/querya_motion_scope.dart';
55
import 'package:querya_desktop/core/motion/querya_theme_motion.dart';
66
import 'package:querya_desktop/core/theme/animated_querya_theme.dart';
77
import 'package:querya_desktop/core/theme/theme_controller.dart';
8-
import 'package:shadcn_flutter/shadcn_flutter.dart';
8+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
99

1010
import 'app_lifecycle_cleanup.dart';
1111
import '../features/main_screen/main_screen.dart';

‎lib/core/editor/querya_code_editor.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' as material;
22
import 'package:querya_desktop/core/theme/querya_editor_theme.dart';
33
import 'package:querya_desktop/core/theme/querya_theme.dart';
44
import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
5-
import 'package:shadcn_flutter/shadcn_flutter.dart';
5+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
66

77
import 'querya_code_language.dart';
88
import 'querya_highlight_controller.dart';

‎lib/core/layout/querya_split_handle.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' as material;
22
import 'package:flutter/services.dart';
33
import 'package:querya_desktop/core/motion/querya_motion.dart';
44
import 'package:querya_desktop/core/motion/querya_motion_context.dart';
5-
import 'package:shadcn_flutter/shadcn_flutter.dart';
5+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
66

77
/// Accessible split-pane handle that supports mouse dragging and arrow keys.
88
///

‎lib/core/layout/vertical_split_pane.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart' as material;
22
import 'package:querya_desktop/core/layout/querya_drag_settle.dart';
33
import 'package:querya_desktop/core/layout/querya_split_handle.dart';
44
import 'package:querya_desktop/core/motion/querya_spring.dart';
5-
import 'package:shadcn_flutter/shadcn_flutter.dart';
5+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
66

77
/// Counts full rebuilds of [VerticalSplitPane]'s body (cache misses) — should
88
/// only fire when the pane's height or its top/bottom/fraction/etc. inputs

‎lib/core/storage/app_settings.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:convert';
22

33

4-
import 'package:shadcn_flutter/shadcn_flutter.dart';
4+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
55

66
import '../motion/querya_motion_scope.dart';
77
import '../theme/querya_theme_preset.dart';

‎lib/core/theme/app_theme.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:shadcn_flutter/shadcn_flutter.dart';
1+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
22

33
import 'querya_theme.dart';
44

‎lib/core/theme/parser/querya_theme_color_scheme.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore_for_file: deprecated_member_use
22

33
import 'package:flutter/foundation.dart';
4-
import 'package:shadcn_flutter/shadcn_flutter.dart';
4+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
55

66
import '../querya_theme.dart';
77
import 'color_parser.dart';

‎lib/core/theme/querya_color_scheme.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:shadcn_flutter/shadcn_flutter.dart';
1+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
22

33
import 'querya_theme.dart';
44

‎lib/core/theme/querya_theme.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:shadcn_flutter/shadcn_flutter.dart';
1+
import 'package:shadcn_flutter/shadcn_flutter.dart' hide TextExtension;
22

33
import 'color_contrast.dart';
44
import 'parser/vscode_theme_manifest.dart';

‎lib/core/theme/querya_theme_scope.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/material.dart' as material;
22
import 'package:flutter/widgets.dart';
3-
import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn;
3+
import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn
4+
hide TextExtension;
45

56
import 'querya_editor_theme.dart';
67
import 'querya_semantic_palette.dart';

0 commit comments

Comments
 (0)