diff --git a/packages/google_fonts/CHANGELOG.md b/packages/google_fonts/CHANGELOG.md index 99a7d557fa8e..92cc4c9c0e0c 100644 --- a/packages/google_fonts/CHANGELOG.md +++ b/packages/google_fonts/CHANGELOG.md @@ -1,3 +1,7 @@ +## 8.2.2 + +- Adds support for the `material_ui` package so `TextStyle` and `TextTheme` types are compatible with Material Design widgets that use `material_ui`. + ## 8.2.1 - Fixes `pendingFonts()` retaining failed font loads. 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 49b0b6887175..3c4faa239450 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 d28357a1e309..5a53c8b8aa8b 100644 --- a/packages/google_fonts/example/pubspec.yaml +++ b/packages/google_fonts/example/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: google_fonts: path: ../ + material_ui: ^1.0.0 dev_dependencies: flutter_test: sdk: flutter 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/lib/src/google_fonts_all_parts.dart b/packages/google_fonts/lib/src/google_fonts_all_parts.dart index 521623b7cc4e..141278e20b64 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 b68795340514..881c035b6e1b 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_parts/part_a.dart b/packages/google_fonts/lib/src/google_fonts_parts/part_a.dart index 909c861d2d8d..78e3f272dc96 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 a742952e2e92..6d6365a74fb3 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 4b9acf7976ce..50ec0a0a2baa 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 920eaaece0ec..322600b3e800 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 2f0d8b641517..2a2e00406e91 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 0e5e4a828691..c95acf7b99be 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 4eb934037127..98ba3fb07342 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 3b9ba52b85fe..f24c8f27eae0 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 69edbe87c495..7531d87c5b34 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 14bdb48ea24a..53571386443d 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 fb413b0dda4e..76071ec56311 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 5186f5faa655..2537a56d0b15 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 7fb00b66c53f..75e27202e54d 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 194b71adaf6f..a70af735c21f 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 4c81fedc97d0..c9efb1bf9a76 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 f32788fc9321..e0151ceefe8f 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 ead68a02b81f..6c50410e8948 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 b76e81e2f778..6417cd59a8ad 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 b79113732ab7..3f12b380f590 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 a966d6431f29..4b65fbe99a4f 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 a65e863d1434..2f8435c04925 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 90a6cdebe5f3..8fc75908d22d 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 47013e8a86f6..c3b4430a43c7 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 c6503bd065b3..dba1d366286d 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 5f6c4a032231..283921c1fe07 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 48938c01d8a1..9ba28fd73b8f 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 54982f2b1b89..7316f563f71c 100644 --- a/packages/google_fonts/pubspec.yaml +++ b/packages/google_fonts/pubspec.yaml @@ -2,7 +2,7 @@ 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 +version: 8.2.2 environment: sdk: ^3.10.0 @@ -13,9 +13,11 @@ dependencies: flutter: sdk: flutter http: ^1.0.0 + material_ui: ^1.0.0 path_provider: ^2.0.0 dev_dependencies: + cupertino_ui: ^1.0.0 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_text_style_test.dart b/packages/google_fonts/test/google_fonts_text_style_test.dart index dc2f3226b571..704e98a21f24 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 ec7b54c1284b..cd95357482c1 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 ddda38f9ed3e..5d2959dc61a6 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';