Skip to content

Commit db55a59

Browse files
authored
[material_ui] Migrate M3 SearchView template to use new gen_defaults (flutter#13272)
Work toward flutter#187899. Fixes flutter#188431. This PR migrates the M3 `SearchView` defaults template to use the new gen_defaults in material_ui. The generated defaults remain unchanged. ## Pre-Review Checklist
1 parent 4e6f88a commit db55a59

6 files changed

Lines changed: 85 additions & 125 deletions

File tree

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/search_view_defaults.g.dart renamed to packages/material_ui/lib/src/generated/search_view_defaults_m3.g.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// Do not edit by hand. The code is generated from data in the Material
6+
// Design token database by the script:
7+
// packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart.
8+
part of '../search_anchor.dart';
9+
510
class _SearchViewDefaultsM3 extends SearchViewThemeData {
611
_SearchViewDefaultsM3(this.context, {required this.isFullScreen});
712

‎packages/material_ui/lib/src/search_anchor.dart‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import 'text_theme.dart';
3636
import 'theme.dart';
3737

3838
part 'generated/search_bar_defaults_m3.g.dart';
39+
part 'generated/search_view_defaults_m3.g.dart';
3940

4041
const int _kOpenViewMilliseconds = 600;
4142
const Duration _kOpenViewDuration = Duration(milliseconds: _kOpenViewMilliseconds);
@@ -1975,59 +1976,3 @@ class _SearchBarState extends State<SearchBar> {
19751976
);
19761977
}
19771978
}
1978-
1979-
// BEGIN GENERATED TOKEN PROPERTIES - SearchView
1980-
1981-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
1982-
// "END GENERATED" comments are generated from data in the Material
1983-
// Design token database by the script:
1984-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
1985-
1986-
// dart format off
1987-
class _SearchViewDefaultsM3 extends SearchViewThemeData {
1988-
_SearchViewDefaultsM3(this.context, {required this.isFullScreen});
1989-
1990-
final BuildContext context;
1991-
final bool isFullScreen;
1992-
late final ColorScheme _colors = Theme.of(context).colorScheme;
1993-
late final TextTheme _textTheme = Theme.of(context).textTheme;
1994-
1995-
static double fullScreenBarHeight = 72.0;
1996-
1997-
@override
1998-
Color? get backgroundColor => _colors.surfaceContainerHigh;
1999-
2000-
@override
2001-
double? get elevation => 6.0;
2002-
2003-
@override
2004-
Color? get surfaceTintColor => Colors.transparent;
2005-
2006-
// No default side
2007-
2008-
@override
2009-
OutlinedBorder? get shape => isFullScreen
2010-
? const RoundedRectangleBorder()
2011-
: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(28.0)));
2012-
2013-
@override
2014-
TextStyle? get headerTextStyle => _textTheme.bodyLarge?.copyWith(color: _colors.onSurface);
2015-
2016-
@override
2017-
TextStyle? get headerHintStyle => _textTheme.bodyLarge?.copyWith(color: _colors.onSurfaceVariant);
2018-
2019-
@override
2020-
BoxConstraints get constraints => const BoxConstraints(minWidth: 360.0, minHeight: 240.0);
2021-
2022-
@override
2023-
EdgeInsetsGeometry? get barPadding => const EdgeInsets.symmetric(horizontal: 8.0);
2024-
2025-
@override
2026-
bool get shrinkWrap => false;
2027-
2028-
@override
2029-
Color? get dividerColor => _colors.outline;
2030-
}
2031-
// dart format on
2032-
2033-
// END GENERATED TOKEN PROPERTIES - SearchView

‎packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import '../templates/progress_indicator_template.dart';
4646
// import '../templates/radio_template.dart';
4747
import '../templates/range_slider_template.dart';
4848
import '../templates/search_bar_template.dart';
49-
// import '../templates/search_view_template.dart';
49+
import '../templates/search_view_template.dart';
5050
// import '../templates/segmented_button_template.dart';
5151
// import '../templates/slider_template.dart';
5252
import '../templates/snackbar_template.dart';
@@ -109,7 +109,7 @@ Future<void> main(List<String> args) async {
109109
// const RadioTemplateM3().generateFile(verbose: verbose);
110110
const RangeSliderTemplateM3().generateFile(verbose: verbose);
111111
const SearchBarTemplateM3().generateFile(verbose: verbose);
112-
// const SearchViewTemplateM3().generateFile(verbose: verbose);
112+
const SearchViewTemplateM3().generateFile(verbose: verbose);
113113
// const SegmentedButtonTemplateM3().generateFile(verbose: verbose);
114114
// const SliderTemplateM3().generateFile(verbose: verbose);
115115
const SnackbarTemplateM3().generateFile(verbose: verbose);
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
// Copyright 2013 The Flutter Authors
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import '../data/search_view.dart';
6+
import 'template.dart';
7+
8+
class SearchViewTemplateM3 extends TokenTemplateM3 {
9+
const SearchViewTemplateM3();
10+
11+
@override
12+
String get name => 'Search View';
13+
14+
@override
15+
String get parentFilePath => 'search_anchor.dart';
16+
17+
@override
18+
String generateContents(String className) =>
19+
'''
20+
class $className extends SearchViewThemeData {
21+
$className(this.context, {required this.isFullScreen});
22+
23+
final BuildContext context;
24+
final bool isFullScreen;
25+
late final ColorScheme _colors = Theme.of(context).colorScheme;
26+
late final TextTheme _textTheme = Theme.of(context).textTheme;
27+
28+
static double fullScreenBarHeight = ${TokenSearchView.fullScreenHeaderContainerHeight};
29+
30+
@override
31+
Color? get backgroundColor => ${color(TokenSearchView.containerColor)};
32+
33+
@override
34+
double? get elevation => ${TokenSearchView.containerElevation};
35+
36+
@override
37+
Color? get surfaceTintColor => Colors.transparent;
38+
39+
// No default side
40+
41+
@override
42+
OutlinedBorder? get shape => isFullScreen
43+
? ${shape(TokenSearchView.fullScreenContainerShape)}
44+
: ${shape(TokenSearchView.dockedContainerShape)};
45+
46+
@override
47+
TextStyle? get headerTextStyle => ${textStyle(TokenSearchView.headerInputTextType, '_textTheme')}?.copyWith(color: ${color(TokenSearchView.headerInputTextColor)});
48+
49+
@override
50+
TextStyle? get headerHintStyle => ${textStyle(TokenSearchView.headerSupportingTextType, '_textTheme')}?.copyWith(color: ${color(TokenSearchView.headerSupportingTextColor)});
51+
52+
@override
53+
BoxConstraints get constraints => const BoxConstraints(minWidth: 360.0, minHeight: 240.0);
54+
55+
@override
56+
EdgeInsetsGeometry? get barPadding => const EdgeInsets.symmetric(horizontal: 8.0);
57+
58+
@override
59+
bool get shrinkWrap => false;
60+
61+
@override
62+
Color? get dividerColor => ${color(TokenSearchView.dividerColor)};
63+
}
64+
''';
65+
}

‎packages/material_ui/tool/gen_defaults/temporarily_excluded/templates/search_view_template.dart‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎packages/material_ui/tool/gen_defaults/test/gen_defaults_test.dart‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import '../templates/progress_indicator_template.dart';
4242
// import '../templates/radio_template.dart';
4343
import '../templates/range_slider_template.dart';
4444
import '../templates/search_bar_template.dart';
45-
// import '../templates/search_view_template.dart';
45+
import '../templates/search_view_template.dart';
4646
// import '../templates/segmented_button_template.dart';
4747
// import '../templates/slider_template.dart';
4848
import '../templates/snackbar_template.dart';
@@ -822,8 +822,17 @@ void main() {
822822
});
823823

824824
test('SearchViewTemplateM3 emits M3 SearchView defaults from tokens', () {
825-
// Intentionally empty, will be implemented during migration. See:
826-
// https://github.com/flutter/flutter/issues/187899
825+
final String contents = _generateContents(const SearchViewTemplateM3());
826+
expect(contents, contains('class _SearchViewDefaultsM3 extends SearchViewThemeData'));
827+
expect(contents, contains('Color? get backgroundColor => _colors.surfaceContainerHigh'));
828+
expect(contents, contains('static double fullScreenBarHeight = 72.0'));
829+
expect(
830+
contents,
831+
contains(
832+
'TextStyle? get headerHintStyle => _textTheme.bodyLarge?.copyWith(color: _colors.onSurfaceVariant)',
833+
),
834+
);
835+
expect(contents, contains('Color? get dividerColor => _colors.outline'));
827836
});
828837

829838
test('SegmentedButtonTemplateM3 emits M3 SegmentedButton defaults from tokens', () {

0 commit comments

Comments
 (0)