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

Flutter 1.17 updates (#432)

Browse Source 
* Material text theme updates & flutter pub upgrade (#411)

* Beta channel updates (#412)

* fix deprecated usages in provider_shopper - beta channel

* fix deprecated usages in animations - beta channel

* fix deprecated usages in provider_counter - beta

* Updates additional samples for beta release (#416)

* use headline6 instead of title

* fix another title -> headline6

Co-authored-by: Brett Morgan <brett.morgan@gmail.com>
Co-authored-by: Andrew Brogdon <RedBrogdon@users.noreply.github.com>
This commit is contained in:
John Ryan
2020-05-06 14:09:15 -07:00
committed by GitHub
parent 31f6eff4a6
commit 14b9a8c4c4
45 changed files with 391 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsonexample/lib/tab_pages.dart
View File

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

36
jsonexample/lib/widgets.dart
View File

@@ -13,9 +13,10 @@ class SimpleObjectView extends StatelessWidget {
@override
Widget build(BuildContext context) {
final localTheme = Theme.of(context).textTheme;
final boldStyle = localTheme.body1.copyWith(fontWeight: FontWeight.w600);
final boldStyle =
localTheme.bodyText2.copyWith(fontWeight: FontWeight.w600);
if (simpleObject == null) return Text('NULL', style: localTheme.body1);
if (simpleObject == null) return Text('NULL', style: localTheme.bodyText2);
return Table(
columnWidths: const {
@@ -33,7 +34,7 @@ class SimpleObjectView extends StatelessWidget {
simpleObject.aString != null
? '"${simpleObject.aString}"'
: 'NULL',
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -42,7 +43,7 @@ class SimpleObjectView extends StatelessWidget {
Text('anInt:', style: boldStyle),
Text(
simpleObject.anInt?.toString() ?? 'NULL',
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -50,7 +51,7 @@ class SimpleObjectView extends StatelessWidget {
Text('aDouble:', style: boldStyle),
Text(
simpleObject.aDouble?.toString() ?? 'NULL',
style: localTheme.body1,
style: localTheme.bodyText2,
),
]),
TableRow(
@@ -60,7 +61,7 @@ class SimpleObjectView extends StatelessWidget {
prettyPrintList(
simpleObject.aListOfStrings as Iterable<dynamic>,
),
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -69,7 +70,7 @@ class SimpleObjectView extends StatelessWidget {
Text('aListOfInts:', style: boldStyle),
Text(
prettyPrintList(simpleObject.aListOfInts as Iterable<dynamic>),
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -81,7 +82,7 @@ class SimpleObjectView extends StatelessWidget {
),
Text(
prettyPrintList(simpleObject.aListOfDoubles as Iterable<dynamic>),
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -103,7 +104,7 @@ class SimpleObjectViewList extends StatelessWidget {
widgets.addAll([
Text(
'SimpleObject $i:',
style: Theme.of(context).textTheme.subhead,
style: Theme.of(context).textTheme.subtitle1,
),
const SizedBox(height: 4.0),
SimpleObjectView(simpleObjects[i]),
@@ -156,7 +157,8 @@ class ComplexObjectView extends StatelessWidget {
@override
Widget build(BuildContext context) {
final localTheme = Theme.of(context).textTheme;
final boldStyle = localTheme.body1.copyWith(fontWeight: FontWeight.w600);
final boldStyle =
localTheme.bodyText2.copyWith(fontWeight: FontWeight.w600);
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -174,21 +176,21 @@ class ComplexObjectView extends StatelessWidget {
complexObject.aString != null
? '"${complexObject.aString}"'
: 'NULL',
style: localTheme.body1),
style: localTheme.bodyText2),
],
),
TableRow(
children: [
Text('anInt:', style: boldStyle),
Text(complexObject.anInt?.toString() ?? 'NULL',
style: localTheme.body1),
style: localTheme.bodyText2),
],
),
TableRow(
children: [
Text('aDouble:', style: boldStyle),
Text(complexObject.aDouble?.toString() ?? 'NULL',
style: localTheme.body1),
style: localTheme.bodyText2),
],
),
TableRow(
@@ -215,7 +217,7 @@ class ComplexObjectView extends StatelessWidget {
Text(
prettyPrintList(
complexObject.aListOfStrings as Iterable<dynamic>),
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -225,7 +227,7 @@ class ComplexObjectView extends StatelessWidget {
Text(
prettyPrintList(
complexObject.aListOfInts as Iterable<dynamic>),
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -238,7 +240,7 @@ class ComplexObjectView extends StatelessWidget {
Text(
prettyPrintList(
complexObject.aListOfDoubles as Iterable<dynamic>),
style: localTheme.body1,
style: localTheme.bodyText2,
),
],
),
@@ -276,7 +278,7 @@ class ComplexObjectViewList extends StatelessWidget {
widgets.addAll([
Text(
'Complex Object $i:',
style: Theme.of(context).textTheme.subhead,
style: Theme.of(context).textTheme.subtitle1,
),
const SizedBox(height: 4.0),
ComplexObjectView(complexObjects[i]),

82
jsonexample/pubspec.lock
View File

@@ -7,42 +7,42 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
version: "2.1.0"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "0.39.4"
version: "0.39.6"
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.11"
version: "2.0.13"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.2"
version: "1.6.0"
async:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
version: "2.4.1"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
version: "2.0.0"
build:
dependency: transitive
description:
@@ -56,35 +56,35 @@ packages:
name: build_config
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.1+1"
version: "0.4.2"
build_daemon:
dependency: transitive
description:
name: build_daemon
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
version: "2.1.4"
build_resolvers:
dependency: transitive
description:
name: build_resolvers
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.3.4"
build_runner:
dependency: "direct dev"
description:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.3"
version: "1.8.1"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
url: "https://pub.dartlang.org"
source: hosted
version: "4.3.0"
version: "5.0.0"
built_collection:
dependency: "direct main"
description:
@@ -98,21 +98,21 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "7.0.6"
version: "7.0.9"
built_value_generator:
dependency: "direct dev"
description:
name: built_value_generator
url: "https://pub.dartlang.org"
source: hosted
version: "7.0.6"
version: "7.0.9"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.2"
version: "1.1.3"
checked_yaml:
dependency: transitive
description:
@@ -133,7 +133,7 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.11"
version: "1.14.12"
convert:
dependency: transitive
description:
@@ -147,7 +147,7 @@ packages:
name: crypto
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
version: "2.1.4"
csslib:
dependency: transitive
description:
@@ -161,7 +161,7 @@ packages:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.3"
version: "1.3.4"
fixnum:
dependency: transitive
description:
@@ -200,41 +200,34 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.14.0+3"
http:
dependency: transitive
description:
name: http
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.0+4"
http_multi_server:
dependency: transitive
description:
name: http_multi_server
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.2.0"
http_parser:
dependency: transitive
description:
name: http_parser
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.3"
version: "3.1.4"
image:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.4"
version: "2.1.12"
io:
dependency: transitive
description:
name: io
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.3"
version: "0.3.4"
js:
dependency: transitive
description:
@@ -255,14 +248,14 @@ packages:
name: json_serializable
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.5"
version: "3.3.0"
logging:
dependency: transitive
description:
name: logging
url: "https://pub.dartlang.org"
source: hosted
version: "0.11.3+2"
version: "0.11.4"
matcher:
dependency: transitive
description:
@@ -304,14 +297,7 @@ packages:
name: package_config
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
package_resolver:
dependency: transitive
description:
name: package_resolver
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.10"
version: "1.9.3"
path:
dependency: transitive
description:
@@ -325,7 +311,7 @@ packages:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0+1"
version: "1.9.0"
petitparser:
dependency: transitive
description:
@@ -346,7 +332,7 @@ packages:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.2"
version: "1.4.4"
pubspec_parse:
dependency: transitive
description:
@@ -360,7 +346,7 @@ packages:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.1.3"
shelf:
dependency: transitive
description:
@@ -386,14 +372,14 @@ packages:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.4+7"
version: "0.9.5"
source_span:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.5"
version: "1.7.0"
stack_trace:
dependency: transitive
description:
@@ -414,7 +400,7 @@ packages:
name: stream_transform
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
string_scanner:
dependency: transitive
description:
@@ -435,7 +421,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.11"
version: "0.2.15"
timing:
dependency: transitive
description:
@@ -463,7 +449,7 @@ packages:
name: watcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.7+13"
version: "0.9.7+14"
web_socket_channel:
dependency: transitive
description:
@@ -477,7 +463,7 @@ packages:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "3.5.0"
version: "3.6.1"
yaml:
dependency: transitive
description:
@@ -486,4 +472,4 @@ packages:
source: hosted
version: "2.2.0"
sdks:
dart: ">=2.6.0 <3.0.0"
dart: ">=2.7.0 <3.0.0"