Made elements on component screen stay compact on wider screen, take 2 (#1267)

* Revert "Revert "Made elements on component screen stay compact on wider screen (#1258)" (#1266)"

This reverts commit 53c83adc71.

* ran flutter format for the changed files

* fixed test

Co-authored-by: Qun Cheng <quncheng@google.com>
pull/1273/head
Qun Cheng 3 years ago committed by GitHub
parent 53c83adc71
commit 52ef797b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -11,6 +11,10 @@ class ComponentScreen extends StatelessWidget {
return Expanded( return Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10), padding: const EdgeInsets.symmetric(horizontal: 10),
child: Align(
alignment: Alignment.topCenter,
child: SizedBox(
width: _maxWidthConstraint,
child: ListView( child: ListView(
shrinkWrap: true, shrinkWrap: true,
children: [ children: [
@ -33,6 +37,8 @@ class ComponentScreen extends StatelessWidget {
], ],
), ),
), ),
),
),
); );
} }
} }
@ -40,6 +46,7 @@ class ComponentScreen extends StatelessWidget {
const _rowDivider = SizedBox(width: 10); const _rowDivider = SizedBox(width: 10);
const _colDivider = SizedBox(height: 10); const _colDivider = SizedBox(height: 10);
const double _cardWidth = 115; const double _cardWidth = 115;
const double _maxWidthConstraint = 400;
void Function()? handlePressed( void Function()? handlePressed(
BuildContext context, bool isDisabled, String buttonName) { BuildContext context, bool isDisabled, String buttonName) {
@ -255,8 +262,7 @@ class Cards extends StatelessWidget {
alignment: Alignment.topRight, alignment: Alignment.topRight,
child: Icon(Icons.more_vert), child: Icon(Icons.more_vert),
), ),
_colDivider, SizedBox(height: 35),
_colDivider,
Align( Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Text("Elevated"), child: Text("Elevated"),
@ -279,8 +285,7 @@ class Cards extends StatelessWidget {
alignment: Alignment.topRight, alignment: Alignment.topRight,
child: Icon(Icons.more_vert), child: Icon(Icons.more_vert),
), ),
_colDivider, SizedBox(height: 35),
_colDivider,
Align( Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Text("Filled"), child: Text("Filled"),
@ -308,8 +313,7 @@ class Cards extends StatelessWidget {
alignment: Alignment.topRight, alignment: Alignment.topRight,
child: Icon(Icons.more_vert), child: Icon(Icons.more_vert),
), ),
_colDivider, SizedBox(height: 35),
_colDivider,
Align( Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Text("Outlined"), child: Text("Outlined"),

@ -179,7 +179,8 @@ class _Material3DemoState extends State<Material3Demo> {
body: SafeArea( body: SafeArea(
bottom: false, bottom: false,
top: false, top: false,
child: Row(children: <Widget>[ child: Row(
children: <Widget>[
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 5), padding: const EdgeInsets.symmetric(horizontal: 5),
child: NavigationRailSection( child: NavigationRailSection(
@ -187,7 +188,8 @@ class _Material3DemoState extends State<Material3Demo> {
selectedIndex: screenIndex)), selectedIndex: screenIndex)),
const VerticalDivider(thickness: 1, width: 1), const VerticalDivider(thickness: 1, width: 1),
createScreenFor(screenIndex, true), createScreenFor(screenIndex, true),
]), ],
),
), ),
); );
} }

@ -27,6 +27,11 @@ void main() {
expect(find.text("Icon"), findsNWidgets(5)); expect(find.text("Icon"), findsNWidgets(5));
// FABs // FABs
Finder floatingActionButton = find.text("Create");
await tester.scrollUntilVisible(
floatingActionButton,
500.0,
);
expect( expect(
find.widgetWithIcon(FloatingActionButton, Icons.add), findsNWidgets(4)); find.widgetWithIcon(FloatingActionButton, Icons.add), findsNWidgets(4));
expect(find.widgetWithText(FloatingActionButton, "Create"), findsOneWidget); expect(find.widgetWithText(FloatingActionButton, "Create"), findsOneWidget);

Loading…
Cancel
Save