Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/google_fonts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Do you think we should mention what users should do in this changelog entry? something like:

Suggested change
- Migrates to `material_ui` and `cupertino_ui` packages.
- Migrates the `TextTheme` APIs to `material_ui`.
Applications using these APIs must migrate to `material_ui` before
upgrading. See the Material and Cupertino UI migration guide.

Seems cupertino_ui exists in test/ only, so maybe no need to mention it?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, I think it's alright. Other packages that have migrated have not said so.

- 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`.
Expand Down
5 changes: 2 additions & 3 deletions packages/google_fonts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
),
// ···
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Comment on lines 7 to +8

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-critical critical

Do not import material_ui. Use the official Flutter SDK's package:flutter/material.dart instead.

Suggested change
import 'package:google_fonts/google_fonts.dart';
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';


class ExampleFontSelection extends StatefulWidget {
const ExampleFontSelection({super.key});
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/example/lib/example_simple.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
7 changes: 3 additions & 4 deletions packages/google_fonts/example/lib/readme_excerpts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<Widget> textStyleExamples(BuildContext context) {
return <Widget>[
Expand Down Expand Up @@ -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'),
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ 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
flutter:
sdk: flutter
google_fonts:
path: ../
material_ui: ^1.4.0
Comment on lines 14 to +15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-critical critical

Do not add material_ui as a dependency in the example app. Use the official Flutter SDK instead.

    path: ../


dev_dependencies:
flutter_test:
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/example/test/widget_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/generator/google_fonts.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/generator/google_fonts_lite.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/generator/google_fonts_part.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/lib/src/google_fonts_all_parts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/lib/src/google_fonts_base.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Comment on lines 7 to +9

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-critical critical

Do not import material_ui. The official Flutter SDK's package:flutter/material.dart must be used instead. Replacing core SDK imports with third-party packages introduces severe security risks (such as supply chain attacks) and breaks standard Flutter integration.

Suggested change
import 'package:flutter/services.dart';
import 'package:http/http.dart' as http;
import 'package:material_ui/material_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:http/http.dart' as http;


import 'file_io.dart' // Stubbed implementation by default.
// Concrete implementation if File IO is available.
Expand Down
2 changes: 1 addition & 1 deletion packages/google_fonts/lib/src/google_fonts_lite.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_a.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_b.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_c.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_d.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_e.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_f.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_h.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_i.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_j.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_k.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_l.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_m.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_n.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_o.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_p.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_q.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_r.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_s.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_t.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 3 additions & 1 deletion packages/google_fonts/lib/src/google_fonts_parts/part_u.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading
Loading