Remove asset manifest

packages/google_fonts/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.3.1 - 2025-07-30
+### Changed
+- Update AssetManifest to use the builtin Flutter API.
+
 ## 6.3.0 - 2024-11-01
 ### Added
 - `Anton SC`

packages/google_fonts/lib/src/google_fonts_base.dart

@@ -4,20 +4,10 @@
 
 import 'package:crypto/crypto.dart';
 import 'package:flutter/material.dart';
-// TODO(andrewkolos): The flutter framework wishes to add a new class named
-// `AssetManifest` to its API (see https://github.com/flutter/flutter/pull/119277).
-// However, doing so would break integration tests that utilize google_fonts due
-// to name collision with the `AssetManifest` class that this package already
-// defines (see https://github.com/flutter/flutter/pull/119273).
-// Once the AssetManifest API is added to flutter, update this package to use it
-// instead of the AssetManifest class this package defines and remove this `hide`
-// and the ignore annotation.
-// ignore: undefined_hidden_name
-import 'package:flutter/services.dart' hide AssetManifest;
+import 'package:flutter/services.dart';
 import 'package:http/http.dart' as http;
 
 import '../google_fonts.dart';
-import 'asset_manifest.dart';
 import 'file_io.dart' // Stubbed implementation by default.
     // Concrete implementation if File IO is available.
     if (dart.library.io) 'file_io_desktop_and_mobile.dart' as file_io;
@@ -43,7 +33,7 @@ final Set<Future<void>> pendingFontFutures = {};
 http.Client httpClient = http.Client();
 
 @visibleForTesting
-AssetManifest assetManifest = AssetManifest();
+AssetManifest? assetManifest;
 
 /// Creates a [TextStyle] that either uses the [fontFamily] for the requested
 /// GoogleFont, or falls back to the pre-bundled [fontFamily].
@@ -147,11 +137,9 @@ Future<void> loadFontIfNecessary(GoogleFontsDescriptor descriptor) async {
     Future<ByteData?>? byteData;
 
     // Check if this font can be loaded by the pre-bundled assets.
-    final assetManifestJson = await assetManifest.json();
+    assetManifest ??= await AssetManifest.loadFromAssetBundle(rootBundle);
     final assetPath = _findFamilyWithVariantAssetPath(
-      descriptor.familyWithVariant,
-      assetManifestJson,
-    );
+        descriptor.familyWithVariant, assetManifest?.listAssets());
     if (assetPath != null) {
       byteData = rootBundle.load(assetPath);
     }
@@ -298,20 +286,18 @@ int _computeMatch(GoogleFontsVariant a, GoogleFontsVariant b) {
 /// Returns the path of the font asset if found, otherwise an empty string.
 String? _findFamilyWithVariantAssetPath(
   GoogleFontsFamilyWithVariant familyWithVariant,
-  Map<String, List<String>>? manifestJson,
+  List<String>? manifestValues,
 ) {
-  if (manifestJson == null) return null;
+  if (manifestValues == null) return null;
 
   final apiFilenamePrefix = familyWithVariant.toApiFilenamePrefix();
 
-  for (final assetList in manifestJson.values) {
-    for (final String asset in assetList) {
-      for (final matchingSuffix in ['.ttf', '.otf'].where(asset.endsWith)) {
-        final assetWithoutExtension =
-            asset.substring(0, asset.length - matchingSuffix.length);
-        if (assetWithoutExtension.endsWith(apiFilenamePrefix)) {
-          return asset;
-        }
+  for (final asset in manifestValues) {
+    for (final matchingSuffix in ['.ttf', '.otf'].where(asset.endsWith)) {
+      final assetWithoutExtension =
+          asset.substring(0, asset.length - matchingSuffix.length);
+      if (assetWithoutExtension.endsWith(apiFilenamePrefix)) {
+        return asset;
       }
     }
   }

packages/google_fonts/pubspec.yaml

@@ -1,6 +1,6 @@
 name: google_fonts
 description: A Flutter package to use fonts from fonts.google.com. Supports HTTP fetching, caching, and asset bundling.
-version: 6.3.0
+version: 6.3.1
 repository: https://github.com/material-foundation/flutter-packages/tree/main/packages/google_fonts
 issue_tracker: https://github.com/material-foundation/flutter-packages/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_fonts%22
 screenshots:

packages/google_fonts/test/generated_font_methods_test.dart

@@ -3,16 +3,19 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:google_fonts/src/asset_manifest.dart';
 import 'package:google_fonts/src/google_fonts_base.dart';
 import 'package:http/http.dart' as http;
 import 'package:mockito/mockito.dart';
 
 class MockHttpClient extends Mock implements http.Client {}
 
-class MockAssetManifest extends Mock implements AssetManifest {}
+class MockAssetManifest extends Mock implements AssetManifest {
+  @override
+  List<String> listAssets() => [];
+}
 
 void main() {
   setUpAll(() {

packages/google_fonts/test/google_fonts_text_style_test.dart

@@ -4,9 +4,9 @@ import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:google_fonts/src/asset_manifest.dart';
 import 'package:google_fonts/src/google_fonts_base.dart';
 import 'package:google_fonts/src/google_fonts_descriptor.dart';
 import 'package:google_fonts/src/google_fonts_variant.dart';
@@ -20,7 +20,10 @@ class MockHttpClient extends Mock implements http.Client {
   }
 }
 
-class MockAssetManifest extends Mock implements AssetManifest {}
+class MockAssetManifest extends Mock implements AssetManifest {
+  @override
+  List<String> listAssets() => [];
+}
 
 const _fakeResponse = 'fake response body - success';
 // The number of bytes in _fakeResponse.

packages/google_fonts/test/load_font_if_necessary_test.dart

@@ -2,11 +2,9 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
-// ignore: undefined_hidden_name
-import 'package:flutter/services.dart' hide AssetManifest;
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:google_fonts/src/asset_manifest.dart';
 import 'package:google_fonts/src/google_fonts_base.dart';
 import 'package:google_fonts/src/google_fonts_descriptor.dart';
 import 'package:google_fonts/src/google_fonts_family_with_variant.dart';
@@ -24,7 +22,12 @@ class MockHttpClient extends Mock implements http.Client {
   }
 }
 
-class MockAssetManifest extends Mock implements AssetManifest {}
+class MockAssetManifest extends Mock implements AssetManifest {
+  @override
+  List<String> listAssets() {
+    return [];
+  }
+}
 
 class FakePathProviderPlatform extends Fake
     with MockPlatformInterfaceMixin

packages/google_fonts/test/load_font_if_necessary_with_local_fonts_test.dart

@@ -2,8 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-// ignore: undefined_hidden_name
-import 'package:flutter/services.dart' hide AssetManifest;
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:google_fonts/src/google_fonts_base.dart';
@@ -22,6 +21,13 @@ class MockHttpClient extends Mock implements http.Client {
   }
 }
 
+class MockAssetManifest extends Mock implements AssetManifest {
+  @override
+  List<String> listAssets() {
+    return ['google_fonts/Foo-BlackItalic.ttf'];
+  }
+}
+
 class FakePathProviderPlatform extends Fake
     with MockPlatformInterfaceMixin
     implements PathProviderPlatform {
@@ -59,6 +65,7 @@ void main() {
   setUp(() async {
     mockHttpClient = MockHttpClient();
     httpClient = mockHttpClient;
+    assetManifest = MockAssetManifest();
     GoogleFonts.config.allowRuntimeFetching = true;
     when(mockHttpClient.gets(any)).thenAnswer((_) async {
       return http.Response(_fakeResponse, 200);