From 55f07c5b3b717d603b50e39717685de47b6f2475 Mon Sep 17 00:00:00 2001 From: Kate Lovett Date: Thu, 24 Sep 2026 14:38:36 -0500 Subject: [PATCH 1/2] [google_fonts] Migrate to material_ui & cupertino_ui --- packages/google_fonts/CHANGELOG.md | 5 +++-- .../google_fonts/example/lib/example_font_selection.dart | 2 +- packages/google_fonts/example/lib/example_simple.dart | 2 +- packages/google_fonts/example/lib/main.dart | 2 +- packages/google_fonts/example/lib/readme_excerpts.dart | 7 +++---- packages/google_fonts/example/pubspec.yaml | 4 +++- packages/google_fonts/example/test/widget_test.dart | 2 +- packages/google_fonts/generator/google_fonts.tmpl | 2 +- packages/google_fonts/generator/google_fonts_lite.tmpl | 2 +- packages/google_fonts/generator/google_fonts_part.tmpl | 4 +++- .../google_fonts/lib/src/google_fonts_all_parts.dart | 2 +- packages/google_fonts/lib/src/google_fonts_base.dart | 2 +- packages/google_fonts/lib/src/google_fonts_lite.dart | 2 +- .../google_fonts/lib/src/google_fonts_parts/part_a.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_b.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_c.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_d.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_e.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_f.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_g.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_h.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_i.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_j.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_k.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_l.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_m.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_n.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_o.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_p.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_q.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_r.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_s.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_t.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_u.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_v.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_w.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_x.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_y.dart | 4 +++- .../google_fonts/lib/src/google_fonts_parts/part_z.dart | 4 +++- packages/google_fonts/pubspec.yaml | 9 +++++---- .../find_family_with_variant_asset_path_web_test.dart | 2 +- .../google_fonts/test/generated_font_methods_test.dart | 2 +- .../test/google_fonts_family_with_variant_test.dart | 2 +- packages/google_fonts/test/google_fonts_lite_test.dart | 2 +- .../google_fonts/test/google_fonts_text_style_test.dart | 4 ++-- .../google_fonts/test/google_fonts_variant_test.dart | 2 +- .../google_fonts/test/load_font_if_necessary_test.dart | 2 +- .../load_font_if_necessary_with_local_fonts_test.dart | 2 +- 48 files changed, 113 insertions(+), 56 deletions(-) diff --git a/packages/google_fonts/CHANGELOG.md b/packages/google_fonts/CHANGELOG.md index 2c47b3394ea9..ac9df4e114a3 100644 --- a/packages/google_fonts/CHANGELOG.md +++ b/packages/google_fonts/CHANGELOG.md @@ -1,6 +1,7 @@ -## NEXT +## 9.0.0 -- Updates minimum supported SDK version to Flutter 3.41/Dart 3.11. +- Migrates to `material_ui` and `cupertino_ui` packages. +- Updates minimum supported SDK version to Flutter 3.47/Dart 3.13. - Adds `config`, `pendingFonts`, and `getTextTheme` to `GoogleFontsLite`. - Decouples internal base library from the main entry point to ensure complete tree-shakability. - Adds code samples and documentation for `GoogleFontsLite`. diff --git a/packages/google_fonts/example/lib/example_font_selection.dart b/packages/google_fonts/example/lib/example_font_selection.dart index af160a7f4562..a7de50217c40 100644 --- a/packages/google_fonts/example/lib/example_font_selection.dart +++ b/packages/google_fonts/example/lib/example_font_selection.dart @@ -4,8 +4,8 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; class ExampleFontSelection extends StatefulWidget { const ExampleFontSelection({super.key}); diff --git a/packages/google_fonts/example/lib/example_simple.dart b/packages/google_fonts/example/lib/example_simple.dart index a5d38dafc541..f463d579b714 100644 --- a/packages/google_fonts/example/lib/example_simple.dart +++ b/packages/google_fonts/example/lib/example_simple.dart @@ -4,8 +4,8 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; class ExampleSimple extends StatefulWidget { const ExampleSimple({super.key}); diff --git a/packages/google_fonts/example/lib/main.dart b/packages/google_fonts/example/lib/main.dart index 646f9dfd6a60..e392c6cbdaa3 100644 --- a/packages/google_fonts/example/lib/main.dart +++ b/packages/google_fonts/example/lib/main.dart @@ -4,7 +4,7 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'example_font_selection.dart'; import 'example_simple.dart'; diff --git a/packages/google_fonts/example/lib/readme_excerpts.dart b/packages/google_fonts/example/lib/readme_excerpts.dart index 7c146386f7ed..a72fb1b1e742 100644 --- a/packages/google_fonts/example/lib/readme_excerpts.dart +++ b/packages/google_fonts/example/lib/readme_excerpts.dart @@ -5,9 +5,9 @@ // ignore_for_file: public_member_api_docs, unreachable_from_main import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; List textStyleExamples(BuildContext context) { return [ @@ -103,9 +103,8 @@ class MyMultiFontApp extends StatelessWidget { title: 'Example', // #docregion AppThemeComplex theme: ThemeData( - textTheme: GoogleFonts.latoTextTheme( - textTheme, - ).copyWith(bodyMedium: GoogleFonts.oswald(textStyle: textTheme.bodyMedium)), + textTheme: GoogleFonts.latoTextTheme(textTheme) + .copyWith(bodyMedium: GoogleFonts.oswald(textStyle: textTheme.bodyMedium)), ), // #enddocregion AppThemeComplex home: const Text('placeholder'), diff --git a/packages/google_fonts/example/pubspec.yaml b/packages/google_fonts/example/pubspec.yaml index 20a16dd8a309..872be67e41e8 100644 --- a/packages/google_fonts/example/pubspec.yaml +++ b/packages/google_fonts/example/pubspec.yaml @@ -3,7 +3,8 @@ description: A Flutter application showcasing how to use the google_fonts packag publish_to: none environment: - sdk: ^3.11.0 + sdk: ^3.13.0 + flutter: ">=3.47.0" dependencies: cupertino_icons: ^1.0.0 @@ -11,6 +12,7 @@ dependencies: sdk: flutter google_fonts: path: ../ + material_ui: ^1.4.0 dev_dependencies: flutter_test: diff --git a/packages/google_fonts/example/test/widget_test.dart b/packages/google_fonts/example/test/widget_test.dart index 35fb91e64a0e..9f843de254c5 100644 --- a/packages/google_fonts/example/test/widget_test.dart +++ b/packages/google_fonts/example/test/widget_test.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; // Consider `flutter test --no-test-assets` if assets are not required. void main() { diff --git a/packages/google_fonts/generator/google_fonts.tmpl b/packages/google_fonts/generator/google_fonts.tmpl index 6b4fe20e55c6..f74b214ee6d8 100755 --- a/packages/google_fonts/generator/google_fonts.tmpl +++ b/packages/google_fonts/generator/google_fonts.tmpl @@ -8,7 +8,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'google_fonts_base.dart'; import 'google_fonts_config.dart'; diff --git a/packages/google_fonts/generator/google_fonts_lite.tmpl b/packages/google_fonts/generator/google_fonts_lite.tmpl index 0e7c1853b892..f71c2f11678b 100644 --- a/packages/google_fonts/generator/google_fonts_lite.tmpl +++ b/packages/google_fonts/generator/google_fonts_lite.tmpl @@ -6,7 +6,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'google_fonts_base.dart'; import 'google_fonts_config.dart'; diff --git a/packages/google_fonts/generator/google_fonts_part.tmpl b/packages/google_fonts/generator/google_fonts_part.tmpl index dae183049f01..6a0c8db6e865 100644 --- a/packages/google_fonts/generator/google_fonts_part.tmpl +++ b/packages/google_fonts/generator/google_fonts_part.tmpl @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_all_parts.dart b/packages/google_fonts/lib/src/google_fonts_all_parts.dart index 64b4894c7409..d92d62747f8a 100644 --- a/packages/google_fonts/lib/src/google_fonts_all_parts.dart +++ b/packages/google_fonts/lib/src/google_fonts_all_parts.dart @@ -8,7 +8,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'google_fonts_base.dart'; import 'google_fonts_config.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_base.dart b/packages/google_fonts/lib/src/google_fonts_base.dart index 3210e71d2f46..cfe3d1974084 100755 --- a/packages/google_fonts/lib/src/google_fonts_base.dart +++ b/packages/google_fonts/lib/src/google_fonts_base.dart @@ -4,9 +4,9 @@ import 'package:crypto/crypto.dart'; import 'package:flutter/foundation.dart' show kIsWeb; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'file_io.dart' // Stubbed implementation by default. // Concrete implementation if File IO is available. diff --git a/packages/google_fonts/lib/src/google_fonts_lite.dart b/packages/google_fonts/lib/src/google_fonts_lite.dart index 018337fcf219..843855d1d527 100644 --- a/packages/google_fonts/lib/src/google_fonts_lite.dart +++ b/packages/google_fonts/lib/src/google_fonts_lite.dart @@ -6,7 +6,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'google_fonts_base.dart'; import 'google_fonts_config.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_a.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_a.dart index 5103663ffc1b..c54186bd102e 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_a.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_a.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_b.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_b.dart index 4902afb767f8..7dbd0b6ea180 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_b.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_b.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_c.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_c.dart index 926b2d8329d3..31edbd8bd85c 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_c.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_c.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_d.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_d.dart index c5e2b5775ecb..c20cea02f43d 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_d.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_d.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_e.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_e.dart index aae122ee0733..b220a6918cc2 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_e.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_e.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_f.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_f.dart index 591a19ebb4ce..0c776638f8f7 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_f.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_f.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_g.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_g.dart index 3ac5a5b9e2d9..f516f233e36e 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_g.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_g.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_h.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_h.dart index f328f8f3f50a..d756f7ecdba2 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_h.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_h.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_i.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_i.dart index a62993c46691..e68393dfd938 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_i.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_i.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_j.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_j.dart index ad19de3ad2ab..1b3dda7abd39 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_j.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_j.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_k.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_k.dart index 4e262c0c2628..424b3926cc55 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_k.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_k.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_l.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_l.dart index 2d4b4980b4b9..c56ad24e23d4 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_l.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_l.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_m.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_m.dart index 44874f9bf989..bd226dccb88f 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_m.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_m.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_n.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_n.dart index 6e8868daaf10..5ff2e7666a86 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_n.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_n.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_o.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_o.dart index 5854eca67235..dc2b74f88297 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_o.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_o.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_p.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_p.dart index 973b984d89ae..ac17620932ca 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_p.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_p.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_q.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_q.dart index 44ce13ad3cab..8afb65896fad 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_q.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_q.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_r.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_r.dart index 5b46b9d76b9e..33bd54c790cf 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_r.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_r.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_s.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_s.dart index 784af970ffda..3cddfeb1c2db 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_s.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_s.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_t.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_t.dart index e9cedf663207..6d94f940c35e 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_t.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_t.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_u.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_u.dart index 17a397b0f173..dff4da06c365 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_u.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_u.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_v.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_v.dart index 947da324a9de..2a0f38cb19f2 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_v.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_v.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_w.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_w.dart index 04d20965717c..151a4c2b52fa 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_w.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_w.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_x.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_x.dart index 2b9a6c650aa8..7be3f5156f47 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_x.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_x.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_y.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_y.dart index cf2d17c26bd5..2fde2fffcb4f 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_y.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_y.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/lib/src/google_fonts_parts/part_z.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_z.dart index 9f2ebb28bd6a..b476b3792733 100644 --- a/packages/google_fonts/lib/src/google_fonts_parts/part_z.dart +++ b/packages/google_fonts/lib/src/google_fonts_parts/part_z.dart @@ -5,7 +5,9 @@ // found in the LICENSE file. import 'dart:ui' as ui; -import 'package:flutter/material.dart'; + +import 'package:material_ui/material_ui.dart'; + import '../google_fonts_base.dart'; import '../google_fonts_descriptor.dart'; import '../google_fonts_variant.dart'; diff --git a/packages/google_fonts/pubspec.yaml b/packages/google_fonts/pubspec.yaml index c1749dc2e96f..5d85e2ec0c60 100644 --- a/packages/google_fonts/pubspec.yaml +++ b/packages/google_fonts/pubspec.yaml @@ -2,22 +2,23 @@ name: google_fonts description: A Flutter package to use fonts from fonts.google.com. Supports HTTP fetching, caching, and asset bundling. repository: https://github.com/flutter/packages/tree/main/packages/google_fonts issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_fonts%22 -version: 8.2.1 -publish_to: none +version: 9.0.0 environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.13.0 + flutter: ">=3.47.0" dependencies: crypto: ^3.0.0 flutter: sdk: flutter http: ^1.0.0 + material_ui: ^1.4.0 meta: ^1.10.0 path_provider: ^2.0.0 dev_dependencies: + cupertino_ui: ^1.1.1 flutter_test: sdk: flutter mockito: ^5.0.0 diff --git a/packages/google_fonts/test/find_family_with_variant_asset_path_web_test.dart b/packages/google_fonts/test/find_family_with_variant_asset_path_web_test.dart index b79a814dc6cf..f8121d7f6930 100644 --- a/packages/google_fonts/test/find_family_with_variant_asset_path_web_test.dart +++ b/packages/google_fonts/test/find_family_with_variant_asset_path_web_test.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_fonts/src/google_fonts_base.dart'; import 'package:google_fonts/src/google_fonts_family_with_variant.dart'; import 'package:google_fonts/src/google_fonts_variant.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('findFamilyWithVariantAssetPath', () { diff --git a/packages/google_fonts/test/generated_font_methods_test.dart b/packages/google_fonts/test/generated_font_methods_test.dart index b65293fb7675..3c67a97201b8 100644 --- a/packages/google_fonts/test/generated_font_methods_test.dart +++ b/packages/google_fonts/test/generated_font_methods_test.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // 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/google_fonts_base.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/mockito.dart'; class MockAssetManifest extends Mock implements AssetManifest { diff --git a/packages/google_fonts/test/google_fonts_family_with_variant_test.dart b/packages/google_fonts/test/google_fonts_family_with_variant_test.dart index 1de66bdd40c7..29d67e7dec3f 100644 --- a/packages/google_fonts/test/google_fonts_family_with_variant_test.dart +++ b/packages/google_fonts/test/google_fonts_family_with_variant_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_fonts/src/google_fonts_family_with_variant.dart'; import 'package:google_fonts/src/google_fonts_variant.dart'; diff --git a/packages/google_fonts/test/google_fonts_lite_test.dart b/packages/google_fonts/test/google_fonts_lite_test.dart index 15b7645bade0..74d70b2a782f 100644 --- a/packages/google_fonts/test/google_fonts_lite_test.dart +++ b/packages/google_fonts/test/google_fonts_lite_test.dart @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // 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/google_fonts_lite.dart' as lite; import 'package:google_fonts/src/google_fonts_base.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/mockito.dart'; class MockAssetManifest extends Mock implements AssetManifest { diff --git a/packages/google_fonts/test/google_fonts_text_style_test.dart b/packages/google_fonts/test/google_fonts_text_style_test.dart index 6ec3837a5518..96ecd4894eec 100644 --- a/packages/google_fonts/test/google_fonts_text_style_test.dart +++ b/packages/google_fonts/test/google_fonts_text_style_test.dart @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -11,6 +10,7 @@ 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'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/mockito.dart'; class MockHttpClient extends Mock implements http.Client { diff --git a/packages/google_fonts/test/google_fonts_variant_test.dart b/packages/google_fonts/test/google_fonts_variant_test.dart index 282760681579..e274ae733675 100644 --- a/packages/google_fonts/test/google_fonts_variant_test.dart +++ b/packages/google_fonts/test/google_fonts_variant_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_fonts/src/google_fonts_variant.dart'; diff --git a/packages/google_fonts/test/load_font_if_necessary_test.dart b/packages/google_fonts/test/load_font_if_necessary_test.dart index 9f63c1e4eea2..79b40a5f6716 100644 --- a/packages/google_fonts/test/load_font_if_necessary_test.dart +++ b/packages/google_fonts/test/load_font_if_necessary_test.dart @@ -8,7 +8,7 @@ library; import 'dart:async'; import 'dart:io'; -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/packages/google_fonts/test/load_font_if_necessary_with_local_fonts_test.dart b/packages/google_fonts/test/load_font_if_necessary_with_local_fonts_test.dart index 63212c4beadc..883f36315278 100644 --- a/packages/google_fonts/test/load_font_if_necessary_with_local_fonts_test.dart +++ b/packages/google_fonts/test/load_font_if_necessary_with_local_fonts_test.dart @@ -8,7 +8,6 @@ library; import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -17,6 +16,7 @@ import 'package:google_fonts/src/google_fonts_descriptor.dart'; import 'package:google_fonts/src/google_fonts_family_with_variant.dart'; import 'package:google_fonts/src/google_fonts_variant.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/mockito.dart'; import 'package:path_provider_platform_interface/path_provider_platform_interface.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; From 69e45a4f0c648b3b130af3236d9036ec98923aa0 Mon Sep 17 00:00:00 2001 From: Kate Lovett Date: Thu, 24 Sep 2026 16:38:27 -0500 Subject: [PATCH 2/2] ++ --- packages/google_fonts/README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/google_fonts/README.md b/packages/google_fonts/README.md index 5758afc0ec89..13fca9bf8dbc 100644 --- a/packages/google_fonts/README.md +++ b/packages/google_fonts/README.md @@ -106,9 +106,8 @@ final TextTheme textTheme = Theme.of(context).textTheme; return MaterialApp( // ··· theme: ThemeData( - textTheme: GoogleFonts.latoTextTheme( - textTheme, - ).copyWith(bodyMedium: GoogleFonts.oswald(textStyle: textTheme.bodyMedium)), + textTheme: GoogleFonts.latoTextTheme(textTheme) + .copyWith(bodyMedium: GoogleFonts.oswald(textStyle: textTheme.bodyMedium)), ), // ··· );