Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2026-04-04 18:51:05 +00:00
Code Issues Releases Wiki Activity

Update for Material changes & run rebuild scripts (#1412)

Browse Source
This commit is contained in:
Brett Morgan
2022-09-01 11:01:17 +10:00
committed by GitHub
parent 83f7059d83
commit 9d8aa333ee
167 changed files with 928 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsonexample/lib/tab_pages.dart
View File

@@ -41,7 +41,7 @@ class BasicsPage extends StatelessWidget {
Widget build(BuildContext context) {
final localTheme = Theme.of(context).textTheme;
final boldStyle =
localTheme.bodyText2!.copyWith(fontWeight: FontWeight.w600);
localTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w600);
final dynamicListOfInts = json.decode(JsonStrings.listOfInts) as List;
final strongListOfInts = List<int>.from(dynamicListOfInts);
@@ -76,7 +76,7 @@ class BasicsPage extends StatelessWidget {
),
Text(
prettyPrintList(strongListOfInts),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -88,7 +88,7 @@ class BasicsPage extends StatelessWidget {
),
Text(
prettyPrintList(strongListOfStrings),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -100,7 +100,7 @@ class BasicsPage extends StatelessWidget {
),
Text(
prettyPrintList(strongListOfDoubles),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -112,7 +112,7 @@ class BasicsPage extends StatelessWidget {
),
Text(
prettyPrintList(strongListOfDynamics),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -136,7 +136,7 @@ class BasicsPage extends StatelessWidget {
},
children: createMapRows(
strongMapOfDynamics,
localTheme.bodyText2!,
localTheme.bodyMedium!,
boldStyle,
),
),

34
jsonexample/lib/widgets.dart
View File

@@ -14,9 +14,9 @@ class SimpleObjectView extends StatelessWidget {
Widget build(BuildContext context) {
final localTheme = Theme.of(context).textTheme;
final boldStyle =
localTheme.bodyText2!.copyWith(fontWeight: FontWeight.w600);
localTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w600);
if (simpleObject == null) return Text('NULL', style: localTheme.bodyText2);
if (simpleObject == null) return Text('NULL', style: localTheme.bodyMedium);
return Table(
columnWidths: const {
@@ -34,7 +34,7 @@ class SimpleObjectView extends StatelessWidget {
simpleObject.aString != null
? '"${simpleObject.aString}"'
: 'NULL',
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -43,7 +43,7 @@ class SimpleObjectView extends StatelessWidget {
Text('anInt:', style: boldStyle),
Text(
simpleObject.anInt?.toString() ?? 'NULL',
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -51,7 +51,7 @@ class SimpleObjectView extends StatelessWidget {
Text('aDouble:', style: boldStyle),
Text(
simpleObject.aDouble?.toString() ?? 'NULL',
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
]),
TableRow(
@@ -61,7 +61,7 @@ class SimpleObjectView extends StatelessWidget {
prettyPrintList(
simpleObject.aListOfStrings as Iterable<dynamic>?,
),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -70,7 +70,7 @@ class SimpleObjectView extends StatelessWidget {
Text('aListOfInts:', style: boldStyle),
Text(
prettyPrintList(simpleObject.aListOfInts as Iterable<dynamic>?),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -83,7 +83,7 @@ class SimpleObjectView extends StatelessWidget {
Text(
prettyPrintList(
simpleObject.aListOfDoubles as Iterable<dynamic>?),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -105,7 +105,7 @@ class SimpleObjectViewList extends StatelessWidget {
widgets.addAll([
Text(
'SimpleObject $i:',
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
const SizedBox(height: 4.0),
SimpleObjectView(simpleObject: simpleObjects[i]),
@@ -159,7 +159,7 @@ class ComplexObjectView extends StatelessWidget {
Widget build(BuildContext context) {
final localTheme = Theme.of(context).textTheme;
final boldStyle =
localTheme.bodyText2!.copyWith(fontWeight: FontWeight.w600);
localTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w600);
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -177,21 +177,21 @@ class ComplexObjectView extends StatelessWidget {
complexObject.aString != null
? '"${complexObject.aString}"'
: 'NULL',
style: localTheme.bodyText2),
style: localTheme.bodyMedium),
],
),
TableRow(
children: [
Text('anInt:', style: boldStyle),
Text(complexObject.anInt?.toString() ?? 'NULL',
style: localTheme.bodyText2),
style: localTheme.bodyMedium),
],
),
TableRow(
children: [
Text('aDouble:', style: boldStyle),
Text(complexObject.aDouble?.toString() ?? 'NULL',
style: localTheme.bodyText2),
style: localTheme.bodyMedium),
],
),
TableRow(
@@ -218,7 +218,7 @@ class ComplexObjectView extends StatelessWidget {
Text(
prettyPrintList(
complexObject.aListOfStrings as Iterable<dynamic>?),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -228,7 +228,7 @@ class ComplexObjectView extends StatelessWidget {
Text(
prettyPrintList(
complexObject.aListOfInts as Iterable<dynamic>?),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -241,7 +241,7 @@ class ComplexObjectView extends StatelessWidget {
Text(
prettyPrintList(
complexObject.aListOfDoubles as Iterable<dynamic>?),
style: localTheme.bodyText2,
style: localTheme.bodyMedium,
),
],
),
@@ -279,7 +279,7 @@ class ComplexObjectViewList extends StatelessWidget {
widgets.addAll([
Text(
'Complex Object $i:',
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
const SizedBox(height: 4.0),
ComplexObjectView(complexObject: complexObjects[i]),