Add support for Material 3 Divider and VerticalDivider (#112655)
This commit is contained in:
parent
0fe6d60300
commit
2bf83dd860
@ -24,6 +24,7 @@ import 'package:gen_defaults/button_template.dart';
|
|||||||
import 'package:gen_defaults/card_template.dart';
|
import 'package:gen_defaults/card_template.dart';
|
||||||
import 'package:gen_defaults/checkbox_template.dart';
|
import 'package:gen_defaults/checkbox_template.dart';
|
||||||
import 'package:gen_defaults/dialog_template.dart';
|
import 'package:gen_defaults/dialog_template.dart';
|
||||||
|
import 'package:gen_defaults/divider_template.dart';
|
||||||
import 'package:gen_defaults/fab_template.dart';
|
import 'package:gen_defaults/fab_template.dart';
|
||||||
import 'package:gen_defaults/filter_chip_template.dart';
|
import 'package:gen_defaults/filter_chip_template.dart';
|
||||||
import 'package:gen_defaults/icon_button_template.dart';
|
import 'package:gen_defaults/icon_button_template.dart';
|
||||||
@ -65,6 +66,7 @@ Future<void> main(List<String> args) async {
|
|||||||
'date_picker_docked.json',
|
'date_picker_docked.json',
|
||||||
'date_picker_modal.json',
|
'date_picker_modal.json',
|
||||||
'dialog.json',
|
'dialog.json',
|
||||||
|
'divider.json',
|
||||||
'dialog_fullscreen.json',
|
'dialog_fullscreen.json',
|
||||||
'elevation.json',
|
'elevation.json',
|
||||||
'fab_extended_primary.json',
|
'fab_extended_primary.json',
|
||||||
@ -122,6 +124,7 @@ Future<void> main(List<String> args) async {
|
|||||||
CheckboxTemplate('Checkbox', '$materialLib/checkbox.dart', tokens).updateFile();
|
CheckboxTemplate('Checkbox', '$materialLib/checkbox.dart', tokens).updateFile();
|
||||||
DialogFullscreenTemplate('DialogFullscreen', '$materialLib/dialog.dart', tokens).updateFile();
|
DialogFullscreenTemplate('DialogFullscreen', '$materialLib/dialog.dart', tokens).updateFile();
|
||||||
DialogTemplate('Dialog', '$materialLib/dialog.dart', tokens).updateFile();
|
DialogTemplate('Dialog', '$materialLib/dialog.dart', tokens).updateFile();
|
||||||
|
DividerTemplate('Divider', '$materialLib/divider.dart', tokens).updateFile();
|
||||||
FABTemplate('FAB', '$materialLib/floating_action_button.dart', tokens).updateFile();
|
FABTemplate('FAB', '$materialLib/floating_action_button.dart', tokens).updateFile();
|
||||||
FilterChipTemplate('ChoiceChip', '$materialLib/choice_chip.dart', tokens).updateFile();
|
FilterChipTemplate('ChoiceChip', '$materialLib/choice_chip.dart', tokens).updateFile();
|
||||||
FilterChipTemplate('FilterChip', '$materialLib/filter_chip.dart', tokens).updateFile();
|
FilterChipTemplate('FilterChip', '$materialLib/filter_chip.dart', tokens).updateFile();
|
||||||
|
25
dev/tools/gen_defaults/lib/divider_template.dart
Normal file
25
dev/tools/gen_defaults/lib/divider_template.dart
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
import 'template.dart';
|
||||||
|
|
||||||
|
class DividerTemplate extends TokenTemplate {
|
||||||
|
const DividerTemplate(super.blockName, super.fileName, super.tokens);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String generate() => '''
|
||||||
|
class _${blockName}DefaultsM3 extends DividerThemeData {
|
||||||
|
const _${blockName}DefaultsM3(this.context) : super(
|
||||||
|
space: 16,
|
||||||
|
thickness: ${tokens["md.comp.divider.thickness"]},
|
||||||
|
indent: 0,
|
||||||
|
endIndent: 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
final BuildContext context;
|
||||||
|
|
||||||
|
@override Color? get color => ${componentColor("md.comp.divider")};
|
||||||
|
}
|
||||||
|
''';
|
||||||
|
}
|
@ -11,22 +11,19 @@ void main() => runApp(const MyApp());
|
|||||||
class MyApp extends StatelessWidget {
|
class MyApp extends StatelessWidget {
|
||||||
const MyApp({super.key});
|
const MyApp({super.key});
|
||||||
|
|
||||||
static const String _title = 'Flutter Code Sample';
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
title: _title,
|
|
||||||
home: Scaffold(
|
home: Scaffold(
|
||||||
appBar: AppBar(title: const Text(_title)),
|
appBar: AppBar(title: const Text('Divider Sample')),
|
||||||
body: const MyStatelessWidget(),
|
body: const DividerExample(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class MyStatelessWidget extends StatelessWidget {
|
class DividerExample extends StatelessWidget {
|
||||||
const MyStatelessWidget({super.key});
|
const DividerExample({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
52
examples/api/lib/material/divider/divider.1.dart
Normal file
52
examples/api/lib/material/divider/divider.1.dart
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
/// Flutter code sample for [Divider].
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
void main() => runApp(const MyApp());
|
||||||
|
|
||||||
|
class MyApp extends StatelessWidget {
|
||||||
|
const MyApp({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return MaterialApp(
|
||||||
|
theme: ThemeData(colorSchemeSeed: const Color(0xff6750a4), useMaterial3: true),
|
||||||
|
home: Scaffold(
|
||||||
|
appBar: AppBar(title: const Text('Divider Sample')),
|
||||||
|
body: const DividerExample(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class DividerExample extends StatelessWidget {
|
||||||
|
const DividerExample({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Column(
|
||||||
|
children: const <Widget>[
|
||||||
|
Expanded(
|
||||||
|
child: Card(
|
||||||
|
child: SizedBox.expand(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Divider(),
|
||||||
|
Expanded(
|
||||||
|
child: Card(
|
||||||
|
child: SizedBox.expand(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -11,22 +11,19 @@ void main() => runApp(const MyApp());
|
|||||||
class MyApp extends StatelessWidget {
|
class MyApp extends StatelessWidget {
|
||||||
const MyApp({super.key});
|
const MyApp({super.key});
|
||||||
|
|
||||||
static const String _title = 'Flutter Code Sample';
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
title: _title,
|
|
||||||
home: Scaffold(
|
home: Scaffold(
|
||||||
appBar: AppBar(title: const Text(_title)),
|
appBar: AppBar(title: const Text('VerticalDivider Sample')),
|
||||||
body: const MyStatelessWidget(),
|
body: const DividerExample(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class MyStatelessWidget extends StatelessWidget {
|
class DividerExample extends StatelessWidget {
|
||||||
const MyStatelessWidget({super.key});
|
const DividerExample({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
52
examples/api/lib/material/divider/vertical_divider.1.dart
Normal file
52
examples/api/lib/material/divider/vertical_divider.1.dart
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
/// Flutter code sample for [Divider].
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
void main() => runApp(const MyApp());
|
||||||
|
|
||||||
|
class MyApp extends StatelessWidget {
|
||||||
|
const MyApp({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return MaterialApp(
|
||||||
|
theme: ThemeData(colorSchemeSeed: const Color(0xff6750a4), useMaterial3: true),
|
||||||
|
home: Scaffold(
|
||||||
|
appBar: AppBar(title: const Text('Divider Sample')),
|
||||||
|
body: const DividerExample(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class DividerExample extends StatelessWidget {
|
||||||
|
const DividerExample({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Row(
|
||||||
|
children: const <Widget>[
|
||||||
|
Expanded(
|
||||||
|
child: Card(
|
||||||
|
child: SizedBox.expand(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
VerticalDivider(),
|
||||||
|
Expanded(
|
||||||
|
child: Card(
|
||||||
|
child: SizedBox.expand(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
28
examples/api/test/material/divider/divider.0_test.dart
Normal file
28
examples/api/test/material/divider/divider.0_test.dart
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_api_samples/material/divider/divider.0.dart' as example;
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
testWidgets('Horizontal Divider', (WidgetTester tester) async {
|
||||||
|
await tester.pumpWidget(
|
||||||
|
const MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: example.MyApp(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(find.byType(Divider), findsOneWidget);
|
||||||
|
|
||||||
|
// Divider is positioned horizintally.
|
||||||
|
final Offset container = tester.getBottomLeft(find.byType(Container).first);
|
||||||
|
expect(container.dy, tester.getTopLeft(find.byType(Divider)).dy);
|
||||||
|
|
||||||
|
final Offset subheader = tester.getTopLeft(find.text('Subheader'));
|
||||||
|
expect(subheader.dy, tester.getBottomLeft(find.byType(Divider)).dy);
|
||||||
|
});
|
||||||
|
}
|
28
examples/api/test/material/divider/divider.1_test.dart
Normal file
28
examples/api/test/material/divider/divider.1_test.dart
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_api_samples/material/divider/divider.1.dart' as example;
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
testWidgets('Horizontal Divider', (WidgetTester tester) async {
|
||||||
|
await tester.pumpWidget(
|
||||||
|
const MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: example.MyApp(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(find.byType(Divider), findsOneWidget);
|
||||||
|
|
||||||
|
// Divider is positioned horizontally.
|
||||||
|
Offset card = tester.getBottomLeft(find.byType(Card).first);
|
||||||
|
expect(card.dy, tester.getTopLeft(find.byType(Divider)).dy);
|
||||||
|
|
||||||
|
card = tester.getTopLeft(find.byType(Card).last);
|
||||||
|
expect(card.dy, tester.getBottomLeft(find.byType(Divider)).dy);
|
||||||
|
});
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_api_samples/material/divider/vertical_divider.0.dart' as example;
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
testWidgets('Vertical Divider', (WidgetTester tester) async {
|
||||||
|
await tester.pumpWidget(
|
||||||
|
const MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: example.MyApp(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(find.byType(VerticalDivider), findsOneWidget);
|
||||||
|
|
||||||
|
// Divider is positioned horizintally.
|
||||||
|
Offset expanded = tester.getTopRight(find.byType(Expanded).first);
|
||||||
|
expect(expanded.dx, tester.getTopLeft(find.byType(VerticalDivider)).dx);
|
||||||
|
|
||||||
|
expanded = tester.getTopLeft(find.byType(Expanded).last);
|
||||||
|
expect(expanded.dx, tester.getTopRight(find.byType(VerticalDivider)).dx);
|
||||||
|
});
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_api_samples/material/divider/vertical_divider.1.dart' as example;
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
testWidgets('Vertical Divider', (WidgetTester tester) async {
|
||||||
|
await tester.pumpWidget(
|
||||||
|
const MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: example.MyApp(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(find.byType(VerticalDivider), findsOneWidget);
|
||||||
|
|
||||||
|
// Divider is positioned vertically.
|
||||||
|
Offset card = tester.getTopRight(find.byType(Card).first);
|
||||||
|
expect(card.dx, tester.getTopLeft(find.byType(VerticalDivider)).dx);
|
||||||
|
|
||||||
|
card = tester.getTopLeft(find.byType(Card).last);
|
||||||
|
expect(card.dx, tester.getTopRight(find.byType(VerticalDivider)).dx);
|
||||||
|
});
|
||||||
|
}
|
@ -34,6 +34,13 @@ import 'theme.dart';
|
|||||||
/// ** See code in examples/api/lib/material/divider/divider.0.dart **
|
/// ** See code in examples/api/lib/material/divider/divider.0.dart **
|
||||||
/// {@end-tool}
|
/// {@end-tool}
|
||||||
///
|
///
|
||||||
|
/// {@tool dartpad}
|
||||||
|
/// This sample shows the creation of [Divider] widget, as described in:
|
||||||
|
/// https://m3.material.io/components/divider/overview
|
||||||
|
///
|
||||||
|
/// ** See code in examples/api/lib/material/divider/divider.1.dart **
|
||||||
|
/// {@end-tool}
|
||||||
|
///
|
||||||
/// See also:
|
/// See also:
|
||||||
///
|
///
|
||||||
/// * [PopupMenuDivider], which is the equivalent but for popup menus.
|
/// * [PopupMenuDivider], which is the equivalent but for popup menus.
|
||||||
@ -106,7 +113,9 @@ class Divider extends StatelessWidget {
|
|||||||
/// Computes the [BorderSide] that represents a divider.
|
/// Computes the [BorderSide] that represents a divider.
|
||||||
///
|
///
|
||||||
/// If [color] is null, then [DividerThemeData.color] is used. If that is also
|
/// If [color] is null, then [DividerThemeData.color] is used. If that is also
|
||||||
/// null, then [ThemeData.dividerColor] is used.
|
/// null, then if [ThemeData.useMaterial3] is true then it defaults to
|
||||||
|
/// [ThemeData.colorScheme]'s [ColorScheme.outlineVariant]. Otherwise
|
||||||
|
/// [ThemeData.dividerColor] is used.
|
||||||
///
|
///
|
||||||
/// If [width] is null, then [DividerThemeData.thickness] is used. If that is
|
/// If [width] is null, then [DividerThemeData.thickness] is used. If that is
|
||||||
/// also null, then this defaults to 0.0 (a hairline border).
|
/// also null, then this defaults to 0.0 (a hairline border).
|
||||||
@ -133,11 +142,12 @@ class Divider extends StatelessWidget {
|
|||||||
/// ```
|
/// ```
|
||||||
/// {@end-tool}
|
/// {@end-tool}
|
||||||
static BorderSide createBorderSide(BuildContext? context, { Color? color, double? width }) {
|
static BorderSide createBorderSide(BuildContext? context, { Color? color, double? width }) {
|
||||||
final Color? effectiveColor = color
|
final DividerThemeData? dividerTheme = context != null ? DividerTheme.of(context) : null;
|
||||||
?? (context != null ? (DividerTheme.of(context).color ?? Theme.of(context).dividerColor) : null);
|
final DividerThemeData? defaults = context != null
|
||||||
final double effectiveWidth = width
|
? Theme.of(context).useMaterial3 ? _DividerDefaultsM3(context) : _DividerDefaultsM2(context)
|
||||||
?? (context != null ? DividerTheme.of(context).thickness : null)
|
: null;
|
||||||
?? 0.0;
|
final Color? effectiveColor = color ?? dividerTheme?.color ?? defaults?.color;
|
||||||
|
final double effectiveWidth = width ?? dividerTheme?.thickness ?? defaults?.thickness ?? 0.0;
|
||||||
|
|
||||||
// Prevent assertion since it is possible that context is null and no color
|
// Prevent assertion since it is possible that context is null and no color
|
||||||
// is specified.
|
// is specified.
|
||||||
@ -154,11 +164,13 @@ class Divider extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
final ThemeData theme = Theme.of(context);
|
||||||
final DividerThemeData dividerTheme = DividerTheme.of(context);
|
final DividerThemeData dividerTheme = DividerTheme.of(context);
|
||||||
final double height = this.height ?? dividerTheme.space ?? 16.0;
|
final DividerThemeData defaults = theme.useMaterial3 ? _DividerDefaultsM3(context) : _DividerDefaultsM2(context);
|
||||||
final double thickness = this.thickness ?? dividerTheme.thickness ?? 0.0;
|
final double height = this.height ?? dividerTheme.space ?? defaults.space!;
|
||||||
final double indent = this.indent ?? dividerTheme.indent ?? 0.0;
|
final double thickness = this.thickness ?? dividerTheme.thickness ?? defaults.thickness!;
|
||||||
final double endIndent = this.endIndent ?? dividerTheme.endIndent ?? 0.0;
|
final double indent = this.indent ?? dividerTheme.indent ?? defaults.indent!;
|
||||||
|
final double endIndent = this.endIndent ?? dividerTheme.endIndent ?? defaults.endIndent!;
|
||||||
|
|
||||||
return SizedBox(
|
return SizedBox(
|
||||||
height: height,
|
height: height,
|
||||||
@ -195,6 +207,13 @@ class Divider extends StatelessWidget {
|
|||||||
/// ** See code in examples/api/lib/material/divider/vertical_divider.0.dart **
|
/// ** See code in examples/api/lib/material/divider/vertical_divider.0.dart **
|
||||||
/// {@end-tool}
|
/// {@end-tool}
|
||||||
///
|
///
|
||||||
|
/// {@tool dartpad}
|
||||||
|
/// This sample shows the creation of [VerticalDivider] widget, as described in:
|
||||||
|
/// https://m3.material.io/components/divider/overview
|
||||||
|
///
|
||||||
|
/// ** See code in examples/api/lib/material/divider/vertical_divider.1.dart **
|
||||||
|
/// {@end-tool}
|
||||||
|
///
|
||||||
/// See also:
|
/// See also:
|
||||||
///
|
///
|
||||||
/// * [ListView.separated], which can be used to generate vertical dividers.
|
/// * [ListView.separated], which can be used to generate vertical dividers.
|
||||||
@ -264,11 +283,13 @@ class VerticalDivider extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
final ThemeData theme = Theme.of(context);
|
||||||
final DividerThemeData dividerTheme = DividerTheme.of(context);
|
final DividerThemeData dividerTheme = DividerTheme.of(context);
|
||||||
final double width = this.width ?? dividerTheme.space ?? 16.0;
|
final DividerThemeData defaults = theme.useMaterial3 ? _DividerDefaultsM3(context) : _DividerDefaultsM2(context);
|
||||||
final double thickness = this.thickness ?? dividerTheme.thickness ?? 0.0;
|
final double width = this.width ?? dividerTheme.space ?? defaults.space!;
|
||||||
final double indent = this.indent ?? dividerTheme.indent ?? 0.0;
|
final double thickness = this.thickness ?? dividerTheme.thickness ?? defaults.thickness!;
|
||||||
final double endIndent = this.endIndent ?? dividerTheme.endIndent ?? 0.0;
|
final double indent = this.indent ?? dividerTheme.indent ?? defaults.indent!;
|
||||||
|
final double endIndent = this.endIndent ?? dividerTheme.endIndent ?? defaults.endIndent!;
|
||||||
|
|
||||||
return SizedBox(
|
return SizedBox(
|
||||||
width: width,
|
width: width,
|
||||||
@ -286,3 +307,40 @@ class VerticalDivider extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class _DividerDefaultsM2 extends DividerThemeData {
|
||||||
|
const _DividerDefaultsM2(this.context) : super(
|
||||||
|
space: 16,
|
||||||
|
thickness: 0,
|
||||||
|
indent: 0,
|
||||||
|
endIndent: 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
final BuildContext context;
|
||||||
|
|
||||||
|
@override Color? get color => Theme.of(context).dividerColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
// BEGIN GENERATED TOKEN PROPERTIES - Divider
|
||||||
|
|
||||||
|
// Do not edit by hand. The code between the "BEGIN GENERATED" and
|
||||||
|
// "END GENERATED" comments are generated from data in the Material
|
||||||
|
// Design token database by the script:
|
||||||
|
// dev/tools/gen_defaults/bin/gen_defaults.dart.
|
||||||
|
|
||||||
|
// Token database version: v0_132
|
||||||
|
|
||||||
|
class _DividerDefaultsM3 extends DividerThemeData {
|
||||||
|
const _DividerDefaultsM3(this.context) : super(
|
||||||
|
space: 16,
|
||||||
|
thickness: 1.0,
|
||||||
|
indent: 0,
|
||||||
|
endIndent: 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
final BuildContext context;
|
||||||
|
|
||||||
|
@override Color? get color => Theme.of(context).colorScheme.outlineVariant;
|
||||||
|
}
|
||||||
|
|
||||||
|
// END GENERATED TOKEN PROPERTIES - Divider
|
||||||
|
@ -59,8 +59,9 @@ void main() {
|
|||||||
|
|
||||||
group('Horizontal Divider', () {
|
group('Horizontal Divider', () {
|
||||||
testWidgets('Passing no DividerThemeData returns defaults', (WidgetTester tester) async {
|
testWidgets('Passing no DividerThemeData returns defaults', (WidgetTester tester) async {
|
||||||
await tester.pumpWidget(const MaterialApp(
|
await tester.pumpWidget(MaterialApp(
|
||||||
home: Scaffold(
|
theme: ThemeData(useMaterial3: true),
|
||||||
|
home: const Scaffold(
|
||||||
body: Divider(),
|
body: Divider(),
|
||||||
),
|
),
|
||||||
));
|
));
|
||||||
@ -70,10 +71,10 @@ void main() {
|
|||||||
|
|
||||||
final Container container = tester.widget(find.byType(Container));
|
final Container container = tester.widget(find.byType(Container));
|
||||||
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
||||||
expect(decoration.border!.bottom.width, 0.0);
|
expect(decoration.border!.bottom.width, 1.0);
|
||||||
|
|
||||||
final ThemeData theme = ThemeData();
|
final ThemeData theme = ThemeData();
|
||||||
expect(decoration.border!.bottom.color, theme.dividerColor);
|
expect(decoration.border!.bottom.color, theme.colorScheme.outlineVariant);
|
||||||
|
|
||||||
final Rect dividerRect = tester.getRect(find.byType(Divider));
|
final Rect dividerRect = tester.getRect(find.byType(Divider));
|
||||||
final Rect lineRect = tester.getRect(find.byType(DecoratedBox));
|
final Rect lineRect = tester.getRect(find.byType(DecoratedBox));
|
||||||
@ -84,7 +85,7 @@ void main() {
|
|||||||
testWidgets('Uses values from DividerThemeData', (WidgetTester tester) async {
|
testWidgets('Uses values from DividerThemeData', (WidgetTester tester) async {
|
||||||
final DividerThemeData dividerTheme = _dividerTheme();
|
final DividerThemeData dividerTheme = _dividerTheme();
|
||||||
await tester.pumpWidget(MaterialApp(
|
await tester.pumpWidget(MaterialApp(
|
||||||
theme: ThemeData(dividerTheme: dividerTheme),
|
theme: ThemeData(useMaterial3: true, dividerTheme: dividerTheme),
|
||||||
home: const Scaffold(
|
home: const Scaffold(
|
||||||
body: Divider(),
|
body: Divider(),
|
||||||
),
|
),
|
||||||
@ -104,6 +105,24 @@ void main() {
|
|||||||
expect(lineRect.right, dividerRect.right - dividerTheme.endIndent!);
|
expect(lineRect.right, dividerRect.right - dividerTheme.endIndent!);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
testWidgets('DividerTheme overrides defaults', (WidgetTester tester) async {
|
||||||
|
final DividerThemeData dividerTheme = _dividerTheme();
|
||||||
|
await tester.pumpWidget(MaterialApp(
|
||||||
|
theme: ThemeData(useMaterial3: true),
|
||||||
|
home: Scaffold(
|
||||||
|
body: DividerTheme(
|
||||||
|
data: dividerTheme,
|
||||||
|
child: const Divider(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
final Container container = tester.widget(find.byType(Container));
|
||||||
|
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
||||||
|
expect(decoration.border!.bottom.width, dividerTheme.thickness);
|
||||||
|
expect(decoration.border!.bottom.color, dividerTheme.color);
|
||||||
|
});
|
||||||
|
|
||||||
testWidgets('Widget properties take priority over theme', (WidgetTester tester) async {
|
testWidgets('Widget properties take priority over theme', (WidgetTester tester) async {
|
||||||
const Color color = Colors.purple;
|
const Color color = Colors.purple;
|
||||||
const double height = 10.0;
|
const double height = 10.0;
|
||||||
@ -142,8 +161,9 @@ void main() {
|
|||||||
|
|
||||||
group('Vertical Divider', () {
|
group('Vertical Divider', () {
|
||||||
testWidgets('Passing no DividerThemeData returns defaults', (WidgetTester tester) async {
|
testWidgets('Passing no DividerThemeData returns defaults', (WidgetTester tester) async {
|
||||||
await tester.pumpWidget(const MaterialApp(
|
await tester.pumpWidget(MaterialApp(
|
||||||
home: Scaffold(
|
theme: ThemeData(useMaterial3: true),
|
||||||
|
home: const Scaffold(
|
||||||
body: VerticalDivider(),
|
body: VerticalDivider(),
|
||||||
),
|
),
|
||||||
));
|
));
|
||||||
@ -154,10 +174,10 @@ void main() {
|
|||||||
final Container container = tester.widget(find.byType(Container));
|
final Container container = tester.widget(find.byType(Container));
|
||||||
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
||||||
final Border border = decoration.border! as Border;
|
final Border border = decoration.border! as Border;
|
||||||
expect(border.left.width, 0.0);
|
expect(border.left.width, 1.0);
|
||||||
|
|
||||||
final ThemeData theme = ThemeData();
|
final ThemeData theme = ThemeData();
|
||||||
expect(border.left.color, theme.dividerColor);
|
expect(border.left.color, theme.colorScheme.outlineVariant);
|
||||||
|
|
||||||
final Rect dividerRect = tester.getRect(find.byType(VerticalDivider));
|
final Rect dividerRect = tester.getRect(find.byType(VerticalDivider));
|
||||||
final Rect lineRect = tester.getRect(find.byType(DecoratedBox));
|
final Rect lineRect = tester.getRect(find.byType(DecoratedBox));
|
||||||
@ -189,6 +209,25 @@ void main() {
|
|||||||
expect(lineRect.bottom, dividerRect.bottom - dividerTheme.endIndent!);
|
expect(lineRect.bottom, dividerRect.bottom - dividerTheme.endIndent!);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
testWidgets('DividerTheme overrides defaults', (WidgetTester tester) async {
|
||||||
|
final DividerThemeData dividerTheme = _dividerTheme();
|
||||||
|
await tester.pumpWidget(MaterialApp(
|
||||||
|
theme: ThemeData(useMaterial3: true),
|
||||||
|
home: Scaffold(
|
||||||
|
body: DividerTheme(
|
||||||
|
data: dividerTheme,
|
||||||
|
child: const VerticalDivider(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
final Container container = tester.widget(find.byType(Container));
|
||||||
|
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
||||||
|
final Border border = decoration.border! as Border;
|
||||||
|
expect(border.left.width, dividerTheme.thickness);
|
||||||
|
expect(border.left.color, dividerTheme.color);
|
||||||
|
});
|
||||||
|
|
||||||
testWidgets('Widget properties take priority over theme', (WidgetTester tester) async {
|
testWidgets('Widget properties take priority over theme', (WidgetTester tester) async {
|
||||||
const Color color = Colors.purple;
|
const Color color = Colors.purple;
|
||||||
const double width = 10.0;
|
const double width = 10.0;
|
||||||
@ -225,6 +264,79 @@ void main() {
|
|||||||
expect(lineRect.bottom, dividerRect.bottom - endIndent);
|
expect(lineRect.bottom, dividerRect.bottom - endIndent);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
group('Material 2', () {
|
||||||
|
// Tests that are only relevant for Material 2. Once ThemeData.useMaterial3
|
||||||
|
// is turned on by default, these tests can be removed.
|
||||||
|
|
||||||
|
group('Horizontal Divider', () {
|
||||||
|
testWidgets('Passing no DividerThemeData returns defaults', (WidgetTester tester) async {
|
||||||
|
await tester.pumpWidget(const MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: Divider(),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
final RenderBox box = tester.firstRenderObject(find.byType(Divider));
|
||||||
|
expect(box.size.height, 16.0);
|
||||||
|
|
||||||
|
final Container container = tester.widget(find.byType(Container));
|
||||||
|
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
||||||
|
expect(decoration.border!.bottom.width, 0.0);
|
||||||
|
|
||||||
|
final ThemeData theme = ThemeData();
|
||||||
|
expect(decoration.border!.bottom.color, theme.dividerColor);
|
||||||
|
|
||||||
|
final Rect dividerRect = tester.getRect(find.byType(Divider));
|
||||||
|
final Rect lineRect = tester.getRect(find.byType(DecoratedBox));
|
||||||
|
expect(lineRect.left, dividerRect.left);
|
||||||
|
expect(lineRect.right, dividerRect.right);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('DividerTheme overrides defaults', (WidgetTester tester) async {
|
||||||
|
final DividerThemeData theme = _dividerTheme();
|
||||||
|
await tester.pumpWidget(MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: DividerTheme(
|
||||||
|
data: theme,
|
||||||
|
child: const Divider(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
final Container container = tester.widget(find.byType(Container));
|
||||||
|
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
||||||
|
expect(decoration.border!.bottom.width, theme.thickness);
|
||||||
|
expect(decoration.border!.bottom.color, theme.color);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
group('Vertical Divider', () {
|
||||||
|
testWidgets('Passing no DividerThemeData returns defaults', (WidgetTester tester) async {
|
||||||
|
await tester.pumpWidget(const MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: VerticalDivider(),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
final RenderBox box = tester.firstRenderObject(find.byType(VerticalDivider));
|
||||||
|
expect(box.size.width, 16.0);
|
||||||
|
|
||||||
|
final Container container = tester.widget(find.byType(Container));
|
||||||
|
final BoxDecoration decoration = container.decoration! as BoxDecoration;
|
||||||
|
final Border border = decoration.border! as Border;
|
||||||
|
expect(border.left.width, 0.0);
|
||||||
|
|
||||||
|
final ThemeData theme = ThemeData();
|
||||||
|
expect(border.left.color, theme.dividerColor);
|
||||||
|
|
||||||
|
final Rect dividerRect = tester.getRect(find.byType(VerticalDivider));
|
||||||
|
final Rect lineRect = tester.getRect(find.byType(DecoratedBox));
|
||||||
|
expect(lineRect.top, dividerRect.top);
|
||||||
|
expect(lineRect.bottom, dividerRect.bottom);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
DividerThemeData _dividerTheme() {
|
DividerThemeData _dividerTheme() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user