Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 22:09:06 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
Qun Cheng
2022-05-12 17:28:32 -07:00
committed by GitHub
parent 53c83adc71
commit 52ef797b9a
3 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
material_3_demo/lib/component_screen.dart
View File

@@ -11,26 +11,32 @@ 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: ListView( child: Align(
shrinkWrap: true, alignment: Alignment.topCenter,
children: [ child: SizedBox(
_colDivider, width: _maxWidthConstraint,
_colDivider, child: ListView(
const Buttons(), shrinkWrap: true,
_colDivider, children: [
const FloatingActionButtons(), _colDivider,
_colDivider, _colDivider,
const Cards(), const Buttons(),
_colDivider, _colDivider,
const Dialogs(), const FloatingActionButtons(),
_colDivider, _colDivider,
showNavBottomBar const Cards(),
? const NavigationBars( _colDivider,
selectedIndex: 0, const Dialogs(),
isExampleBar: true, _colDivider,
) showNavBottomBar
: Container(), ? const NavigationBars(
], selectedIndex: 0,
isExampleBar: true,
)
: Container(),
],
),
),
), ),
), ),
); );
@@ -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"),

20
material_3_demo/lib/main.dart
View File

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

5
material_3_demo/test/component_screen_test.dart
View File

@@ -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);