firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds support for custom fonts for icons (#8880)

Browse Source 
This update adds support for custom fonts in icons. As an example, it
can be used with the icon-set from https://materialdesignicons.com

Thanks to @vlidholt for the original patch.

Fixes #4494
Fixes #3199
This commit is contained in:
Adam Barth 2017-03-18 14:09:51 -07:00 committed by GitHub
parent 3e37b1ef13
commit c95e73418f
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/material/icon.dart
View File

@ -114,7 +114,7 @@ class Icon extends StatelessWidget {
inherit: false,
color: iconColor,
fontSize: iconSize,
fontFamily: 'MaterialIcons'
fontFamily: icon.fontFamily
)
)
)

7
packages/flutter/lib/src/material/icons.dart
View File

@ -10,11 +10,16 @@ class IconData {
///
/// Rarely used directly. Instead, consider using one of the predefined icons
/// from the [Icons] collection.
const IconData(this.codePoint);
const IconData(this.codePoint, {
this.fontFamily: 'MaterialIcons'
});
/// The unicode code point at which this icon is stored in the icon font.
final int codePoint;
/// The font family from which the glyph for the [codePoint] will be selected.
final String fontFamily;
@override
bool operator ==(dynamic other) {
if (other is! IconData)

40
packages/flutter/test/material/icon_test.dart
View File

@ -11,8 +11,8 @@ void main() {
testWidgets('Icon sizing - no theme, default size', (WidgetTester tester) async {
await tester.pumpWidget(
new Center(
child: const Icon(null)
)
child: const Icon(null),
),
);
final RenderBox renderObject = tester.renderObject(find.byType(Icon));
@ -24,9 +24,9 @@ void main() {
new Center(
child: const Icon(
null,
size: 96.0
)
)
size: 96.0,
),
),
);
final RenderBox renderObject = tester.renderObject(find.byType(Icon));
@ -38,9 +38,9 @@ void main() {
new Center(
child: new IconTheme(
data: const IconThemeData(size: 36.0),
child: const Icon(null)
)
)
child: const Icon(null),
),
),
);
final RenderBox renderObject = tester.renderObject(find.byType(Icon));
@ -54,9 +54,9 @@ void main() {
data: const IconThemeData(size: 36.0),
child: const Icon(
null,
size: 48.0
)
)
size: 48.0,
),
),
)
);
@ -69,12 +69,24 @@ void main() {
new Center(
child: new IconTheme(
data: const IconThemeData(),
child: const Icon(null)
)
)
child: const Icon(null),
),
),
);
final RenderBox renderObject = tester.renderObject(find.byType(Icon));
expect(renderObject.size, equals(const Size.square(24.0)));
});
testWidgets('Icon with custom font', (WidgetTester tester) async {
await tester.pumpWidget(
new Center(
child: const Icon(const IconData(0x41, fontFamily: 'Roboto')),
),
);
final RichText richText = tester.firstWidget(find.byType(RichText));
expect(richText.text.style.fontFamily, equals('Roboto'));
});
}