mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
d261411b4c
<!-- Thanks for filing a pull request! Reviewers are typically assigned within a week of filing a request. To learn more about code review, see our documentation on Tree Hygiene: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md --> This PR removes redundant useMaterial3: true as described in https://github.com/flutter/flutter/issues/162818 *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* - https://github.com/flutter/flutter/issues/162818 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --------- Co-authored-by: Qun Cheng <36861262+QuncCccccc@users.noreply.github.com>
277 lines
9.8 KiB
Dart
277 lines
9.8 KiB
Dart
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// This file is run as part of a reduced test set in CI on Mac and Windows
|
|
// machines.
|
|
@Tags(<String>['reduced-test-set'])
|
|
library;
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
// TODO(hansmuller): when https://github.com/flutter/flutter/issues/17700
|
|
// is fixed, these tests should be updated to use a real font (not Ahem).
|
|
|
|
void main() {
|
|
testWidgets('Material2 - RichText TextSpan styles with different locales', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData(useMaterial3: false),
|
|
supportedLocales: const <Locale>[Locale('en', 'US'), Locale('ja'), Locale('zh')],
|
|
home: Builder(
|
|
builder: (BuildContext context) {
|
|
const String character = '骨';
|
|
final TextStyle style = Theme.of(context).textTheme.displayMedium!;
|
|
return Scaffold(
|
|
body: Container(
|
|
padding: const EdgeInsets.all(48.0),
|
|
alignment: Alignment.center,
|
|
child: RepaintBoundary(
|
|
// Expected result can be seen here:
|
|
// https://user-images.githubusercontent.com/1377460/40503473-faad6f34-5f42-11e8-972b-d83b727c9d0e.png
|
|
child: RichText(
|
|
text: TextSpan(
|
|
children: <TextSpan>[
|
|
TextSpan(
|
|
text: character,
|
|
style: style.copyWith(locale: const Locale('ja')),
|
|
),
|
|
TextSpan(
|
|
text: character,
|
|
style: style.copyWith(locale: const Locale('zh')),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
);
|
|
|
|
await expectLater(
|
|
find.byType(RichText),
|
|
matchesGoldenFile('m2_localized_fonts.rich_text.styled_text_span.png'),
|
|
);
|
|
});
|
|
|
|
testWidgets('Material3 - RichText TextSpan styles with different locales', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
supportedLocales: const <Locale>[Locale('en', 'US'), Locale('ja'), Locale('zh')],
|
|
home: Builder(
|
|
builder: (BuildContext context) {
|
|
const String character = '骨';
|
|
final TextStyle style = Theme.of(context).textTheme.displayMedium!;
|
|
return Scaffold(
|
|
body: Container(
|
|
padding: const EdgeInsets.all(48.0),
|
|
alignment: Alignment.center,
|
|
child: RepaintBoundary(
|
|
// Expected result can be seen here:
|
|
// https://user-images.githubusercontent.com/1377460/40503473-faad6f34-5f42-11e8-972b-d83b727c9d0e.png
|
|
child: RichText(
|
|
text: TextSpan(
|
|
children: <TextSpan>[
|
|
TextSpan(
|
|
text: character,
|
|
style: style.copyWith(locale: const Locale('ja')),
|
|
),
|
|
TextSpan(
|
|
text: character,
|
|
style: style.copyWith(locale: const Locale('zh')),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
);
|
|
|
|
await expectLater(
|
|
find.byType(RichText),
|
|
matchesGoldenFile('m3_localized_fonts.rich_text.styled_text_span.png'),
|
|
);
|
|
});
|
|
|
|
testWidgets('Material2 - Text with locale-specific glyphs, ambient locale', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData(useMaterial3: false),
|
|
supportedLocales: const <Locale>[Locale('en', 'US'), Locale('ja'), Locale('zh')],
|
|
home: Builder(
|
|
builder: (BuildContext context) {
|
|
const String character = '骨';
|
|
final TextStyle style = Theme.of(context).textTheme.displayMedium!;
|
|
return Scaffold(
|
|
body: Container(
|
|
padding: const EdgeInsets.all(48.0),
|
|
alignment: Alignment.center,
|
|
child: RepaintBoundary(
|
|
// Expected result can be seen here:
|
|
// https://user-images.githubusercontent.com/1377460/40503473-faad6f34-5f42-11e8-972b-d83b727c9d0e.png
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
children: <Widget>[
|
|
Localizations.override(
|
|
context: context,
|
|
locale: const Locale('ja'),
|
|
child: Text(character, style: style),
|
|
),
|
|
Localizations.override(
|
|
context: context,
|
|
locale: const Locale('zh'),
|
|
child: Text(character, style: style),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
);
|
|
|
|
await expectLater(
|
|
find.byType(Row),
|
|
matchesGoldenFile('localized_fonts.text_ambient_locale.chars.png'),
|
|
);
|
|
});
|
|
|
|
testWidgets('Material3 - Text with locale-specific glyphs, ambient locale', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
supportedLocales: const <Locale>[Locale('en', 'US'), Locale('ja'), Locale('zh')],
|
|
home: Builder(
|
|
builder: (BuildContext context) {
|
|
const String character = '骨';
|
|
final TextStyle style = Theme.of(context).textTheme.displayMedium!;
|
|
return Scaffold(
|
|
body: Container(
|
|
padding: const EdgeInsets.all(48.0),
|
|
alignment: Alignment.center,
|
|
child: RepaintBoundary(
|
|
// Expected result can be seen here:
|
|
// https://user-images.githubusercontent.com/1377460/40503473-faad6f34-5f42-11e8-972b-d83b727c9d0e.png
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
children: <Widget>[
|
|
Localizations.override(
|
|
context: context,
|
|
locale: const Locale('ja'),
|
|
child: Text(character, style: style),
|
|
),
|
|
Localizations.override(
|
|
context: context,
|
|
locale: const Locale('zh'),
|
|
child: Text(character, style: style),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
);
|
|
|
|
await expectLater(
|
|
find.byType(Row),
|
|
matchesGoldenFile('m3_localized_fonts.text_ambient_locale.chars.png'),
|
|
);
|
|
});
|
|
|
|
testWidgets('Material2 - Text with locale-specific glyphs, explicit locale', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData(useMaterial3: false),
|
|
supportedLocales: const <Locale>[Locale('en', 'US'), Locale('ja'), Locale('zh')],
|
|
home: Builder(
|
|
builder: (BuildContext context) {
|
|
const String character = '骨';
|
|
final TextStyle style = Theme.of(context).textTheme.displayMedium!;
|
|
return Scaffold(
|
|
body: Container(
|
|
padding: const EdgeInsets.all(48.0),
|
|
alignment: Alignment.center,
|
|
child: RepaintBoundary(
|
|
// Expected result can be seen here:
|
|
// https://user-images.githubusercontent.com/1377460/40503473-faad6f34-5f42-11e8-972b-d83b727c9d0e.png
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
children: <Widget>[
|
|
Text(character, style: style, locale: const Locale('ja')),
|
|
Text(character, style: style, locale: const Locale('zh')),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
);
|
|
|
|
await expectLater(
|
|
find.byType(Row),
|
|
matchesGoldenFile('m2_localized_fonts.text_explicit_locale.chars.png'),
|
|
);
|
|
});
|
|
|
|
testWidgets('Material3 - Text with locale-specific glyphs, explicit locale', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
supportedLocales: const <Locale>[Locale('en', 'US'), Locale('ja'), Locale('zh')],
|
|
home: Builder(
|
|
builder: (BuildContext context) {
|
|
const String character = '骨';
|
|
final TextStyle style = Theme.of(context).textTheme.displayMedium!;
|
|
return Scaffold(
|
|
body: Container(
|
|
padding: const EdgeInsets.all(48.0),
|
|
alignment: Alignment.center,
|
|
child: RepaintBoundary(
|
|
// Expected result can be seen here:
|
|
// https://user-images.githubusercontent.com/1377460/40503473-faad6f34-5f42-11e8-972b-d83b727c9d0e.png
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
children: <Widget>[
|
|
Text(character, style: style, locale: const Locale('ja')),
|
|
Text(character, style: style, locale: const Locale('zh')),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
);
|
|
|
|
await expectLater(
|
|
find.byType(Row),
|
|
matchesGoldenFile('m3_localized_fonts.text_explicit_locale.chars.png'),
|
|
);
|
|
});
|
|
}
|