Skip to content

Add automatic text scaling support to IconCraft #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Add automatic text scaling support to IconCraft #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e462d1d
Initial plan
Copilot Jan 31, 2026
a71d2df
Add automatic text scaling support to IconCraft
Copilot Jan 31, 2026
dd8426f
Simplify text scaling calculation using direct scale method
Copilot Jan 31, 2026
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 0.2.0

* Added automatic text scaling support via `IconThemeData(applyTextScaling: true)`
* IconCraft now automatically respects `textScaleFactor` from `MediaQuery` when enabled
* Both primary and secondary icons scale proportionally
* Maintains backward compatibility - existing code without `applyTextScaling` continues to work unchanged

## 0.1.1

* Added support for fill property
Expand Down
10 changes: 9 additions & 1 deletion lib/src/icon_craft.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,15 @@ class IconCraft extends StatelessWidget {
final secondaryIconData = secondaryIcon.icon!;
final textDirection = icon.textDirection ?? Directionality.of(context);
final iconTheme = IconTheme.of(context);
final iconSize = icon.size ?? iconTheme.size ?? 24.0;

// Calculate base icon size
double iconSize = icon.size ?? iconTheme.size ?? 24.0;

// Apply text scaling if enabled in IconTheme
if (iconTheme.applyTextScaling ?? false) {
iconSize = MediaQuery.textScalerOf(context).scale(iconSize);
}

final secondaryIconSize = iconSize * secondaryIconSizeFactor;
final iconOpacity = iconTheme.opacity ?? 1.0;
final border = decoration?.border;
Expand Down
201 changes: 201 additions & 0 deletions test/icon_craft_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,205 @@ void main() {
expect(secondaryIcon.text.style?.color, equals(Colors.red));
expect(secondaryIcon.text.style?.fontSize, equals(24.0 * 0.1)); // Assuming default size is 24.0
});

testWidgets('IconCraft applies text scaling when applyTextScaling is true', (WidgetTester tester) async {
const double testIconSize = 24.0;
const double textScaleFactor = 1.5;

await tester.pumpWidget(
MaterialApp(
theme: ThemeData(
iconTheme: const IconThemeData(applyTextScaling: true),
),
home: MediaQuery(
data: const MediaQueryData(
textScaler: TextScaler.linear(textScaleFactor),
),
child: const Scaffold(
body: IconCraft(
Icon(Icons.email, size: testIconSize),
Icon(Icons.check_circle),
),
),
),
),
);

// Find the primary icon RichText widget
final richTextWidgets = tester.widgetList<RichText>(find.byType(RichText)).toList();

// The primary icon should have scaled size
final primaryIconWidget = richTextWidgets.firstWhere(
(widget) => (widget.text as TextSpan).text == String.fromCharCode(Icons.email.codePoint),
);
expect(primaryIconWidget.text.style?.fontSize, equals(testIconSize * textScaleFactor));
});

testWidgets('IconCraft applies text scaling with 2.0x scale factor', (WidgetTester tester) async {
const double testIconSize = 24.0;
const double textScaleFactor = 2.0;

await tester.pumpWidget(
MaterialApp(
theme: ThemeData(
iconTheme: const IconThemeData(applyTextScaling: true),
),
home: MediaQuery(
data: const MediaQueryData(
textScaler: TextScaler.linear(textScaleFactor),
),
child: const Scaffold(
body: IconCraft(
Icon(Icons.email, size: testIconSize),
Icon(Icons.check_circle),
),
),
),
),
);

final richTextWidgets = tester.widgetList<RichText>(find.byType(RichText)).toList();

final primaryIconWidget = richTextWidgets.firstWhere(
(widget) => (widget.text as TextSpan).text == String.fromCharCode(Icons.email.codePoint),
);
expect(primaryIconWidget.text.style?.fontSize, equals(testIconSize * textScaleFactor));
});

testWidgets('IconCraft scales both primary and secondary icons proportionally', (WidgetTester tester) async {
const double testIconSize = 24.0;
const double textScaleFactor = 1.5;
const double secondaryIconSizeFactor = 0.5;

await tester.pumpWidget(
MaterialApp(
theme: ThemeData(
iconTheme: const IconThemeData(applyTextScaling: true),
),
home: MediaQuery(
data: const MediaQueryData(
textScaler: TextScaler.linear(textScaleFactor),
),
child: const Scaffold(
body: IconCraft(
Icon(Icons.email, size: testIconSize),
Icon(Icons.check_circle),
secondaryIconSizeFactor: secondaryIconSizeFactor,
),
),
),
),
);

final richTextWidgets = tester.widgetList<RichText>(find.byType(RichText)).toList();

final primaryIconWidget = richTextWidgets.firstWhere(
(widget) => (widget.text as TextSpan).text == String.fromCharCode(Icons.email.codePoint),
);
final secondaryIconWidget = richTextWidgets.firstWhere(
(widget) => (widget.text as TextSpan).text == String.fromCharCode(Icons.check_circle.codePoint),
);

final expectedPrimarySize = testIconSize * textScaleFactor;
final expectedSecondarySize = expectedPrimarySize * secondaryIconSizeFactor;

expect(primaryIconWidget.text.style?.fontSize, equals(expectedPrimarySize));
expect(secondaryIconWidget.text.style?.fontSize, equals(expectedSecondarySize));
});

testWidgets('IconCraft does not apply text scaling when applyTextScaling is false', (WidgetTester tester) async {
const double testIconSize = 24.0;
const double textScaleFactor = 1.5;

await tester.pumpWidget(
MaterialApp(
theme: ThemeData(
iconTheme: const IconThemeData(applyTextScaling: false),
),
home: MediaQuery(
data: const MediaQueryData(
textScaler: TextScaler.linear(textScaleFactor),
),
child: const Scaffold(
body: IconCraft(
Icon(Icons.email, size: testIconSize),
Icon(Icons.check_circle),
),
),
),
),
);

final richTextWidgets = tester.widgetList<RichText>(find.byType(RichText)).toList();

final primaryIconWidget = richTextWidgets.firstWhere(
(widget) => (widget.text as TextSpan).text == String.fromCharCode(Icons.email.codePoint),
);

// Should NOT be scaled
expect(primaryIconWidget.text.style?.fontSize, equals(testIconSize));
});

testWidgets('IconCraft does not apply text scaling when applyTextScaling is not set', (WidgetTester tester) async {
const double testIconSize = 24.0;
const double textScaleFactor = 1.5;

await tester.pumpWidget(
MaterialApp(
home: MediaQuery(
data: const MediaQueryData(
textScaler: TextScaler.linear(textScaleFactor),
),
child: const Scaffold(
body: IconCraft(
Icon(Icons.email, size: testIconSize),
Icon(Icons.check_circle),
),
),
),
),
);

final richTextWidgets = tester.widgetList<RichText>(find.byType(RichText)).toList();

final primaryIconWidget = richTextWidgets.firstWhere(
(widget) => (widget.text as TextSpan).text == String.fromCharCode(Icons.email.codePoint),
);

// Should NOT be scaled (applyTextScaling defaults to false/null)
expect(primaryIconWidget.text.style?.fontSize, equals(testIconSize));
});

testWidgets('IconCraft with textScaleFactor 1.0 does not change size', (WidgetTester tester) async {
const double testIconSize = 24.0;
const double textScaleFactor = 1.0;

await tester.pumpWidget(
MaterialApp(
theme: ThemeData(
iconTheme: const IconThemeData(applyTextScaling: true),
),
home: MediaQuery(
data: const MediaQueryData(
textScaler: TextScaler.linear(textScaleFactor),
),
child: const Scaffold(
body: IconCraft(
Icon(Icons.email, size: testIconSize),
Icon(Icons.check_circle),
),
),
),
),
);

final richTextWidgets = tester.widgetList<RichText>(find.byType(RichText)).toList();

final primaryIconWidget = richTextWidgets.firstWhere(
(widget) => (widget.text as TextSpan).text == String.fromCharCode(Icons.email.codePoint),
);

// With scale factor of 1.0, size should remain the same
expect(primaryIconWidget.text.style?.fontSize, equals(testIconSize));
});
}