From ff08f0d8a9b6c780112afd4e9eca77dcdfb71718 Mon Sep 17 00:00:00 2001 From: Ricardo Dalarme Date: Wed, 9 Sep 2026 10:57:01 -0300 Subject: [PATCH] feat(google_fonts): migrate to material_ui --- packages/google_fonts/CHANGELOG.md | 2 ++ .../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 | 2 +- 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 | 2 +- packages/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 +- packages/google_fonts/lib/src/google_fonts_parts/part_a.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_b.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_c.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_d.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_e.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_f.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_g.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_h.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_i.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_j.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_k.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_l.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_m.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_n.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_o.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_p.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_q.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_r.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_s.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_t.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_u.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_v.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_w.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_x.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_y.dart | 2 +- packages/google_fonts/lib/src/google_fonts_parts/part_z.dart | 2 +- packages/google_fonts/pubspec.yaml | 5 +++-- .../test/find_family_with_variant_asset_path_web_test.dart | 2 +- packages/google_fonts/test/generated_font_methods_test.dart | 2 +- packages/google_fonts/test/google_fonts_lite_test.dart | 2 +- packages/google_fonts/test/google_fonts_text_style_test.dart | 2 +- .../test/load_font_if_necessary_with_local_fonts_test.dart | 2 +- 45 files changed, 50 insertions(+), 45 deletions(-) diff --git a/packages/google_fonts/CHANGELOG.md b/packages/google_fonts/CHANGELOG.md index 02db16a9be2..42573f2a9e8 100644 --- a/packages/google_fonts/CHANGELOG.md +++ b/packages/google_fonts/CHANGELOG.md @@ -1,5 +1,7 @@ ## NEXT +* Migrates to material_ui. +* Updates minimum supported SDK version to Flutter 3.44/Dart 3.12. - Adds the `GoogleFontsLite` class to allow tree-shaking unused font code. - Added fonts: - `Akt` diff --git a/packages/google_fonts/example/lib/example_font_selection.dart b/packages/google_fonts/example/lib/example_font_selection.dart index af160a7f456..a7de50217c4 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 a5d38dafc54..f463d579b71 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 646f9dfd6a6..e392c6cbdaa 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 49b0b688717..3c4faa23945 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 [ diff --git a/packages/google_fonts/example/pubspec.yaml b/packages/google_fonts/example/pubspec.yaml index d28357a1e30..ce9fb674e58 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.10.0 + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: cupertino_icons: ^1.0.0 @@ -11,6 +12,7 @@ dependencies: sdk: flutter google_fonts: path: ../ + material_ui: ^1.0.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 35fb91e64a0..9f843de254c 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 43821c728ed..ceb22c0cfbb 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 8c5d3a5086d..a5ceaf2401a 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_descriptor.dart'; diff --git a/packages/google_fonts/generator/google_fonts_part.tmpl b/packages/google_fonts/generator/google_fonts_part.tmpl index dae183049f0..e7044090a91 100644 --- a/packages/google_fonts/generator/google_fonts_part.tmpl +++ b/packages/google_fonts/generator/google_fonts_part.tmpl @@ -5,7 +5,7 @@ // 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 73c48ae08e0..9694231be13 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 b6879534051..881c035b6e1 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 '../google_fonts.dart'; import 'file_io.dart' // Stubbed implementation by default. diff --git a/packages/google_fonts/lib/src/google_fonts_lite.dart b/packages/google_fonts/lib/src/google_fonts_lite.dart index d98e040eb7c..6fc8e902681 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_descriptor.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 5103663ffc1..ea439a35966 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,7 @@ // 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 4902afb767f..00da8633771 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,7 @@ // 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 926b2d8329d..56cfcf45327 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,7 @@ // 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 c5e2b5775ec..aa3dfca6bcc 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,7 @@ // 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 aae122ee073..955684f3658 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,7 @@ // 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 591a19ebb4c..4983cf63f10 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,7 @@ // 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 3ac5a5b9e2d..d9774e43b60 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,7 @@ // 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 f328f8f3f50..f1e386e698a 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,7 @@ // 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 a62993c4669..1a508dee65b 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,7 @@ // 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 ad19de3ad2a..58ec77984c6 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,7 @@ // 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 4e262c0c262..35c870769f9 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,7 @@ // 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 2d4b4980b4b..5f6f04e63a6 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,7 @@ // 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 44874f9bf98..2c80a505371 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,7 @@ // 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 6e8868daaf1..a8bc71c1d5b 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,7 @@ // 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 5854eca6723..7d55eecd335 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,7 @@ // 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 973b984d89a..3afc989f686 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,7 @@ // 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 44ce13ad3ca..f166af2634d 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,7 @@ // 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 5b46b9d76b9..410875cf772 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,7 @@ // 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 784af970ffd..41b816f83e9 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,7 @@ // 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 e9cedf66320..dc8371f2eb4 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,7 @@ // 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 17a397b0f17..b6d954fc084 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,7 @@ // 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 947da324a9d..94949dafddd 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,7 @@ // 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 04d20965717..68346c28ac6 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,7 @@ // 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 2b9a6c650aa..a99cb5b4c97 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,7 @@ // 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 cf2d17c26bd..a792106df37 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,7 @@ // 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 9f2ebb28bd6..35631d2c793 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,7 @@ // 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 8580ea804bb..a98bb1ebda0 100644 --- a/packages/google_fonts/pubspec.yaml +++ b/packages/google_fonts/pubspec.yaml @@ -6,14 +6,15 @@ version: 8.2.1 publish_to: none environment: - sdk: ^3.10.0 - flutter: ">=3.38.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: crypto: ^3.0.0 flutter: sdk: flutter http: ^1.0.0 + material_ui: ^1.0.0 path_provider: ^2.0.0 dev_dependencies: 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 b79a814dc6c..f8121d7f693 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 b65293fb767..3c67a97201b 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_lite_test.dart b/packages/google_fonts/test/google_fonts_lite_test.dart index 1a0fd10aef6..8c1848ea45c 100644 --- a/packages/google_fonts/test/google_fonts_lite_test.dart +++ b/packages/google_fonts/test/google_fonts_lite_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'; void main() { testWidgets('GoogleFontsLite getFont returns the correct font with the given parameters', ( 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 6ec3837a551..ff416e44b5a 100644 --- a/packages/google_fonts/test/google_fonts_text_style_test.dart +++ b/packages/google_fonts/test/google_fonts_text_style_test.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. 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'; @@ -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/load_font_if_necessary_with_local_fonts_test.dart b/packages/google_fonts/test/load_font_if_necessary_with_local_fonts_test.dart index 63212c4bead..883f3631527 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';