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
2 changes: 1 addition & 1 deletion third_party/packages/cupertino_icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## NEXT

* Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
* Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.

## 1.0.8

Expand Down
2 changes: 1 addition & 1 deletion third_party/packages/cupertino_icons/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+
version: 1.0.8

environment:
sdk: ^3.6.0
sdk: ^3.7.0

dev_dependencies:
collection: ^1.18.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,36 @@ void main() async {
if (kIsWeb || !Platform.isLinux) {
return;
}
final bool isMainChannel = !Platform.environment.containsKey('CHANNEL') ||
final bool isMainChannel =
!Platform.environment.containsKey('CHANNEL') ||
Platform.environment['CHANNEL'] == 'main' ||
Platform.environment['CHANNEL'] == 'master';
// Only test against main to avoid rendering differences between flutter channels.
if (!isMainChannel) {
return;
}
// Load font.
final String effectiveFontFamily = const TextStyle(
fontFamily: CupertinoIcons.iconFont,
package: CupertinoIcons.iconFontPackage)
.fontFamily!;
final String effectiveFontFamily =
const TextStyle(
fontFamily: CupertinoIcons.iconFont,
package: CupertinoIcons.iconFontPackage,
).fontFamily!;
final FontLoader fontLoader = FontLoader(effectiveFontFamily);
final String filePath = path.canonicalize('assets/CupertinoIcons.ttf');
final File file = File(filePath);
fontLoader
.addFont(file.readAsBytes().then((Uint8List v) => v.buffer.asByteData()));
fontLoader.addFont(
file.readAsBytes().then((Uint8List v) => v.buffer.asByteData()),
);
await fontLoader.load();

assert(icons.isNotEmpty);
for (int index = 0; index < icons.length;) {
final int groupEndCodePoint =
(icons[index].codePoint ~/ iconsPerImage + 1) * iconsPerImage;
final int next = icons.indexWhere(
(IconData icon) => icon.codePoint >= groupEndCodePoint, index);
(IconData icon) => icon.codePoint >= groupEndCodePoint,
index,
);
final int nextIndex = next < 0 ? icons.length : next;
registerTestForIconGroup(icons.slice(index, nextIndex));
index = nextIndex;
Expand All @@ -71,15 +76,19 @@ void registerTestForIconGroup(List<IconData> iconGroup) {

testWidgets('font golden test: $range', (WidgetTester tester) async {
addTearDown(tester.view.reset);
const Size canvasSize =
Size(iconSize * iconsPerRow, iconSize * iconsPerCol);
const Size canvasSize = Size(
iconSize * iconsPerRow,
iconSize * iconsPerCol,
);
tester.view.physicalSize = canvasSize * tester.view.devicePixelRatio;

const Widget fillerBox = SizedBox.square(dimension: iconSize);
final List<Widget> children = List<Widget>.filled(iconsPerImage, fillerBox);
for (final IconData icon in iconGroup) {
children[icon.codePoint - groupStartCodePoint] =
Icon(icon, size: iconSize);
children[icon.codePoint - groupStartCodePoint] = Icon(
icon,
size: iconSize,
);
}

final Widget widget = Directionality(
Expand All @@ -94,6 +103,8 @@ void registerTestForIconGroup(List<IconData> iconGroup) {
);
await tester.pumpWidget(widget);
await expectLater(
find.byType(Wrap), matchesGoldenFile('goldens/glyph_$range.png'));
find.byType(Wrap),
matchesGoldenFile('goldens/glyph_$range.png'),
);
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,17 @@ import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
testWidgets(
'Cupertino Icon Test',
(WidgetTester tester) async {
// #docregion CupertinoIcon
const Icon icon = Icon(
CupertinoIcons.heart_fill,
color: Colors.pink,
size: 24.0,
);
// #enddocregion CupertinoIcon
testWidgets('Cupertino Icon Test', (WidgetTester tester) async {
// #docregion CupertinoIcon
const Icon icon = Icon(
CupertinoIcons.heart_fill,
color: Colors.pink,
size: 24.0,
);
// #enddocregion CupertinoIcon

await tester.pumpWidget(
const MaterialApp(
home: Scaffold(
body: icon,
),
),
);
await tester.pumpWidget(const MaterialApp(home: Scaffold(body: icon)));

expect(find.byType(Icon), findsOne);
},
);
expect(find.byType(Icon), findsOne);
});
}
Loading