diff --git a/lib/src/screenshot/load_fonts.dart b/lib/src/screenshot/load_fonts.dart index e17ce3f4..3f72a671 100644 --- a/lib/src/screenshot/load_fonts.dart +++ b/lib/src/screenshot/load_fonts.dart @@ -128,17 +128,18 @@ Future loadFont(String family, List fontPaths) async { await TestAsyncUtils.guard(() 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(). diff --git a/test/fonts/templates/app_font/lib/fonts/Montserrat-Regular.ttf b/test/fonts/templates/app_font/lib/fonts/Montserrat Regular.ttf similarity index 100% rename from test/fonts/templates/app_font/lib/fonts/Montserrat-Regular.ttf rename to test/fonts/templates/app_font/lib/fonts/Montserrat Regular.ttf diff --git a/test/fonts/templates/app_font/pubspec_template.yaml b/test/fonts/templates/app_font/pubspec_template.yaml index 8f47bdf7..34129909 100644 --- a/test/fonts/templates/app_font/pubspec_template.yaml +++ b/test/fonts/templates/app_font/pubspec_template.yaml @@ -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 diff --git a/test/fonts/templates/app_font/test/test.dart b/test/fonts/templates/app_font/test/test.dart index de16df3c..b17c55e4 100644 --- a/test/fonts/templates/app_font/test/test.dart +++ b/test/fonts/templates/app_font/test/test.dart @@ -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( @@ -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( @@ -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(