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
7 changes: 4 additions & 3 deletions lib/src/screenshot/load_fonts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,18 @@ Future<void> loadFont(String family, List<String> fontPaths) async {
await TestAsyncUtils.guard<void>(() async {
final fontLoader = FontLoader(family);
for (final path in fontPaths) {
final decodedPath = Uri.decodeComponent(path);
try {
final file = File(path);
final file = File(decodedPath);
if (file.existsSync()) {
final Uint8List bytes = file.readAsBytesSync();
fontLoader.addFont(Future.value(bytes.buffer.asByteData()));
} else {
final data = rootBundle.load(path);
final data = rootBundle.load(decodedPath);
fontLoader.addFont(Future.value(data));
}
} catch (e, stack) {
debugPrint("Could not load font $path\n$e\n$stack");
debugPrint("Could not load font $decodedPath\n$e\n$stack");
}
}
// the fontLoader is unusable after calling load().
Expand Down
4 changes: 2 additions & 2 deletions test/fonts/templates/app_font/pubspec_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ flutter:
fonts:
- family: Montserrat
fonts:
- asset: packages/app_font/fonts/Montserrat-Regular.ttf
- asset: packages/app_font/fonts/Montserrat Regular.ttf
- family: PrivateFont
fonts:
- asset: lib/fonts/Montserrat-Regular.ttf
- asset: lib/fonts/Montserrat Regular.ttf
6 changes: 3 additions & 3 deletions test/fonts/templates/app_font/test/test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void main() {
(tester) async {
await loadFont(
'Montserrat',
['packages/app_font/fonts/Montserrat-Regular.ttf'],
['packages/app_font/fonts/Montserrat Regular.ttf'],
);

await tester.pumpWidget(
Expand All @@ -84,7 +84,7 @@ void main() {

testWidgets('Montserrat can be loaded with via file reference',
(tester) async {
final fontPath = File('lib/fonts/Montserrat-Regular.ttf').absolute.path;
final fontPath = File('lib/fonts/Montserrat Regular.ttf').absolute.path;
await loadFont('Montserrat', [fontPath]);

await tester.pumpWidget(
Expand All @@ -104,7 +104,7 @@ void main() {

testWidgets('Montserrat can be loaded with blank family name',
(tester) async {
final fontPath = File('lib/fonts/Montserrat-Regular.ttf').absolute.path;
final fontPath = File('lib/fonts/Montserrat Regular.ttf').absolute.path;
await loadFont('', [fontPath]);

await tester.pumpWidget(
Expand Down