Skip to content

Update Material 3 Demo App #1530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuncCccccc merged 20 commits into from
Dec 20, 2022
Merged

Update Material 3 Demo App #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
39285b5
Reorganized the main screen code
QuncCccccc Dec 7, 2022
89c7369
Added animation for the transition between navBar and navRail
QuncCccccc Dec 7, 2022
3cfb13d
Updated components and layout
QuncCccccc Dec 13, 2022
37c7caf
Added large screen layout
QuncCccccc Dec 13, 2022
d88a08d
Added tooltips to components
QuncCccccc Dec 15, 2022
68db8c2
Updated tests
QuncCccccc Dec 15, 2022
a1bea8d
Fixed a transition issue
QuncCccccc Dec 15, 2022
ac14be7
Ran dart format command
QuncCccccc Dec 15, 2022
d450581
Updated tests
QuncCccccc Dec 15, 2022
f6f12f5
Ran dart format command to pass github test
QuncCccccc Dec 15, 2022
2650ee1
Remove shrinkwrap
Piinks Dec 16, 2022
32b0dc9
++
Piinks Dec 16, 2022
9045ee8
Replaced Expanded widget with ConstrainedBox for the color panel to s…
QuncCccccc Dec 16, 2022
f6c6777
Reorganize code for largeSize tailing actions and the normal trailing…
QuncCccccc Dec 16, 2022
cb436f7
Change headers on elevation page
QuncCccccc Dec 16, 2022
b7d697f
Move tooltip above the icon buttons on NavRail
QuncCccccc Dec 17, 2022
5bdf340
Make IconButton on card clickable
QuncCccccc Dec 17, 2022
e5569f1
Remove layout between groups
QuncCccccc Dec 17, 2022
07fe86e
Ran dart format command
QuncCccccc Dec 19, 2022
c43a0d8
Fix failing tests
QuncCccccc Dec 20, 2022
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
1,490 changes: 1,147 additions & 343 deletions experimental/material_3_demo/lib/component_screen.dart
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 36 additions & 28 deletions experimental/material_3_demo/lib/elevation_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,45 @@ class ElevationScreen extends StatelessWidget {
Color shadowColor = Theme.of(context).colorScheme.shadow;
Color surfaceTint = Theme.of(context).colorScheme.primary;
return Expanded(
child: ListView(
children: [
Padding(
padding: const EdgeInsets.fromLTRB(16.0, 20, 16.0, 0),
child: Text(
'Surface Tint only',
style: Theme.of(context).textTheme.titleLarge,
child: CustomScrollView(
slivers: [
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.fromLTRB(16.0, 20, 16.0, 0),
child: Text(
'Surface Tint Color Only',
style: Theme.of(context).textTheme.titleLarge,
),
),
),
ElevationGrid(surfaceTintColor: surfaceTint),
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 0),
child: Text(
'Surface Tint and Shadow',
style: Theme.of(context).textTheme.titleLarge,
),
SliverList(
delegate: SliverChildListDelegate(<Widget>[
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 0),
child: Text(
'Surface Tint Color and Shadow Color',
style: Theme.of(context).textTheme.titleLarge,
),
),
]),
),
ElevationGrid(
shadowColor: shadowColor,
surfaceTintColor: surfaceTint,
),
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 0),
child: Text(
'Shadow only',
style: Theme.of(context).textTheme.titleLarge,
),
SliverList(
delegate: SliverChildListDelegate(<Widget>[
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 0),
child: Text(
'Shadow Color Only',
style: Theme.of(context).textTheme.titleLarge,
),
),
]),
),
ElevationGrid(shadowColor: shadowColor),
],
Expand Down Expand Up @@ -72,18 +82,16 @@ class ElevationGrid extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Padding(
return SliverPadding(
padding: const EdgeInsets.all(8),
child: LayoutBuilder(builder: (context, constraints) {
if (constraints.maxWidth < narrowScreenWidthThreshold) {
return GridView.count(
shrinkWrap: true,
sliver: SliverLayoutBuilder(builder: (context, constraints) {
if (constraints.crossAxisExtent < narrowScreenWidthThreshold) {
return SliverGrid.count(
crossAxisCount: 3,
children: elevationCards(shadowColor, surfaceTintColor),
);
} else {
return GridView.count(
shrinkWrap: true,
return SliverGrid.count(
crossAxisCount: 6,
children: elevationCards(shadowColor, surfaceTintColor),
);
Expand Down
Loading