diff --git a/web/charts/pubspec.lock b/web/charts/pubspec.lock index 0fbd548dd..146893cc6 100644 --- a/web/charts/pubspec.lock +++ b/web/charts/pubspec.lock @@ -47,7 +47,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" path: dependency: transitive description: diff --git a/web/dad_jokes/pubspec.lock b/web/dad_jokes/pubspec.lock index 701136a36..cc77630c2 100644 --- a/web/dad_jokes/pubspec.lock +++ b/web/dad_jokes/pubspec.lock @@ -47,7 +47,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" path: dependency: transitive description: diff --git a/web/filipino_cuisine/pubspec.lock b/web/filipino_cuisine/pubspec.lock index 9fef22528..8278cf1e6 100644 --- a/web/filipino_cuisine/pubspec.lock +++ b/web/filipino_cuisine/pubspec.lock @@ -61,7 +61,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" path: dependency: transitive description: diff --git a/web/gallery/README.md b/web/gallery/README.md index dd7014f05..3f9b48af5 100644 --- a/web/gallery/README.md +++ b/web/gallery/README.md @@ -1,28 +1,32 @@ # Flutter gallery -This is a copy of the [Flutter gallery] hosted at -[flutter.github.io/samples][hosted url]. +A demo app for Flutter's material design and cupertino widgets, as +well as many other features of the Flutter SDK. -## Updating +## Building -To update, copy the contents of the gallery directory, and remove the following -files and directories: +You can follow these instructions to build the gallery app +and install it onto your device. -```bash -rm BUILD.gn -rm -rf tool/ -rm -rf test/ -rm -rf android/ -rm -rf ios/ -``` +### Prerequisites -If you changed the `pubspec.yaml` file, make sure to use Google Sans instead of -San Francisco (which is not available on the web) by copy-pasting the `fonts` -section from Google Sans: -- Use "GoogleSans" for ".SF Pro Text". -- Use "GoogleSansDisplay" for ".SF Pro Display" -- Use "GoogleSans" for ".SF UI Text" -- Use "GoogleSansDisplay" for ".SF UI Display". +If you are new to Flutter, please first follow +the [Flutter Setup](https://flutter.dev/setup/) guide. -[Flutter gallery]: https://github.com/flutter/flutter/tree/master/examples/flutter_gallery -[hosted url]: https://flutter.github.io/samples/gallery/#/ +### Building and installing the Flutter app + +* `cd $FLUTTER_ROOT/examples/flutter_gallery` +* `flutter pub get` +* `flutter run --release` + +The `flutter run --release` command both builds and installs the Flutter app. + +## Prerelease checklist + +* Verify that the About box's license page scrolls and reveals its long +long stream of license texts. + +## Icon + +Android launcher icons were generated using Android Asset Studio: +https://romannurik.github.io/AndroidAssetStudio/icons-launcher.html#foreground.type=image&foreground.space.trim=1&foreground.space.pad=0.1&foreColor=607d8b%2C0&crop=0&backgroundShape=square&backColor=fafafa%2C100&effects=none diff --git a/web/gallery/lib/demo/cupertino/cupertino_navigation_demo.dart b/web/gallery/lib/demo/cupertino/cupertino_navigation_demo.dart index 5730c43ad..a45f7e1f6 100644 --- a/web/gallery/lib/demo/cupertino/cupertino_navigation_demo.dart +++ b/web/gallery/lib/demo/cupertino/cupertino_navigation_demo.dart @@ -143,6 +143,7 @@ class CupertinoDemoTab1 extends StatelessWidget { @override Widget build(BuildContext context) { return CupertinoPageScaffold( + backgroundColor: CupertinoColors.systemGroupedBackground, child: CustomScrollView( semanticChildCount: _kChildCount, slivers: [ @@ -199,56 +200,59 @@ class Tab1RowItem extends StatelessWidget { ), )); }, - child: SafeArea( - top: false, - bottom: false, - child: Padding( - padding: const EdgeInsets.only(left: 16.0, top: 8.0, bottom: 8.0, right: 8.0), - child: Row( - children: [ - Container( - height: 60.0, - width: 60.0, - decoration: BoxDecoration( - color: color, - borderRadius: BorderRadius.circular(8.0), - ), - ), - Expanded( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 12.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(colorName), - const Padding(padding: EdgeInsets.only(top: 8.0)), - const Text( - 'Buy this cool color', - style: TextStyle( - color: Color(0xFF8E8E93), - fontSize: 13.0, - fontWeight: FontWeight.w300, - ), - ), - ], + child: Container( + color: CupertinoDynamicColor.resolve(CupertinoColors.systemBackground, context), + child: SafeArea( + top: false, + bottom: false, + child: Padding( + padding: const EdgeInsets.only(left: 16.0, top: 8.0, bottom: 8.0, right: 8.0), + child: Row( + children: [ + Container( + height: 60.0, + width: 60.0, + decoration: BoxDecoration( + color: color, + borderRadius: BorderRadius.circular(8.0), ), ), - ), - CupertinoButton( - padding: EdgeInsets.zero, - child: const Icon(CupertinoIcons.plus_circled, - semanticLabel: 'Add', + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 12.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(colorName), + const Padding(padding: EdgeInsets.only(top: 8.0)), + Text( + 'Buy this cool color', + style: TextStyle( + color: CupertinoDynamicColor.resolve(CupertinoColors.secondaryLabel, context), + fontSize: 13.0, + fontWeight: FontWeight.w300, + ), + ), + ], + ), + ), ), - onPressed: () { }, - ), - CupertinoButton( - padding: EdgeInsets.zero, - child: const Icon(CupertinoIcons.share, - semanticLabel: 'Share', + CupertinoButton( + padding: EdgeInsets.zero, + child: const Icon(CupertinoIcons.plus_circled, + semanticLabel: 'Add', + ), + onPressed: () { }, ), - onPressed: () { }, - ), - ], + CupertinoButton( + padding: EdgeInsets.zero, + child: const Icon(CupertinoIcons.share, + semanticLabel: 'Share', + ), + onPressed: () { }, + ), + ], + ), ), ), ), @@ -263,7 +267,7 @@ class Tab1RowItem extends StatelessWidget { row, Container( height: 1.0, - color: const Color(0xFFD9D9D9), + color: CupertinoDynamicColor.resolve(CupertinoColors.separator, context), ), ], ); @@ -336,8 +340,8 @@ class Tab1ItemPageState extends State { const Padding(padding: EdgeInsets.only(top: 6.0)), Text( 'Item number ${widget.index}', - style: const TextStyle( - color: Color(0xFF8E8E93), + style: TextStyle( + color: CupertinoDynamicColor.resolve(CupertinoColors.secondaryLabel, context), fontSize: 16.0, fontWeight: FontWeight.w100, ), @@ -433,7 +437,10 @@ class CupertinoDemoTab2 extends StatelessWidget { child: CupertinoScrollbar( child: ListView( children: [ - Tab2Header(), + CupertinoUserInterfaceLevel( + data: CupertinoUserInterfaceLevelData.elevated, + child: Tab2Header(), + ), ...buildTab2Conversation(), ], ), @@ -456,18 +463,18 @@ class Tab2Header extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Container( - decoration: const BoxDecoration( - color: Color(0xFFE5E5E5), + decoration: BoxDecoration( + color: CupertinoDynamicColor.resolve(CupertinoColors.systemFill, context), ), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 18.0, vertical: 12.0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: const [ + children: [ Text( 'SUPPORT TICKET', style: TextStyle( - color: Color(0xFF646464), + color: CupertinoDynamicColor.resolve(CupertinoColors.secondaryLabel, context), letterSpacing: -0.9, fontSize: 14.0, fontWeight: FontWeight.w500, @@ -476,7 +483,7 @@ class Tab2Header extends StatelessWidget { Text( 'Show More', style: TextStyle( - color: Color(0xFF646464), + color: CupertinoDynamicColor.resolve(CupertinoColors.secondaryLabel, context), letterSpacing: -0.6, fontSize: 12.0, fontWeight: FontWeight.w500, @@ -487,8 +494,8 @@ class Tab2Header extends StatelessWidget { ), ), Container( - decoration: const BoxDecoration( - color: Color(0xFFF3F3F3), + decoration: BoxDecoration( + color: CupertinoDynamicColor.resolve(CupertinoColors.quaternarySystemFill, context), ), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 18.0, vertical: 12.0), @@ -576,21 +583,31 @@ class Tab2ConversationBubble extends StatelessWidget { @override Widget build(BuildContext context) { + Color backgroundColor; + Color foregroundColor; + + switch (color) { + case Tab2ConversationBubbleColor.gray: + backgroundColor = CupertinoDynamicColor.resolve(CupertinoColors.systemFill, context); + foregroundColor = CupertinoDynamicColor.resolve(CupertinoColors.label, context); + break; + case Tab2ConversationBubbleColor.blue: + backgroundColor = CupertinoTheme.of(context).primaryColor; + foregroundColor = CupertinoColors.white; + break; + } + return Container( decoration: BoxDecoration( borderRadius: const BorderRadius.all(Radius.circular(18.0)), - color: color == Tab2ConversationBubbleColor.blue - ? CupertinoColors.activeBlue - : CupertinoColors.lightBackgroundGray, + color: backgroundColor, ), margin: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 8.0), padding: const EdgeInsets.symmetric(horizontal: 14.0, vertical: 10.0), child: Text( text, style: TextStyle( - color: color == Tab2ConversationBubbleColor.blue - ? CupertinoColors.white - : CupertinoColors.black, + color: foregroundColor, letterSpacing: -0.4, fontSize: 15.0, fontWeight: FontWeight.w400, @@ -655,11 +672,14 @@ class Tab2ConversationRow extends StatelessWidget { crossAxisAlignment: isSelf ? CrossAxisAlignment.center : CrossAxisAlignment.end, children: [ if (avatar != null) avatar, - Tab2ConversationBubble( - text: text, - color: isSelf + CupertinoUserInterfaceLevel( + data: CupertinoUserInterfaceLevelData.elevated, + child: Tab2ConversationBubble( + text: text, + color: isSelf ? Tab2ConversationBubbleColor.blue : Tab2ConversationBubbleColor.gray, + ), ), ], ), @@ -709,55 +729,47 @@ class CupertinoDemoTab3 extends StatelessWidget { @override Widget build(BuildContext context) { return CupertinoPageScaffold( - navigationBar: CupertinoNavigationBar( - trailing: trailingButtons, - ), - child: DecoratedBox( - decoration: BoxDecoration( - color: CupertinoTheme.of(context).brightness == Brightness.light - ? CupertinoColors.extraLightBackgroundGray - : CupertinoColors.darkBackgroundGray, - ), - child: ListView( - children: [ - const Padding(padding: EdgeInsets.only(top: 32.0)), - GestureDetector( - onTap: () { - Navigator.of(context, rootNavigator: true).push( - CupertinoPageRoute( - fullscreenDialog: true, - builder: (BuildContext context) => Tab3Dialog(), - ), - ); - }, - child: Container( - decoration: BoxDecoration( - color: CupertinoTheme.of(context).scaffoldBackgroundColor, - border: const Border( - top: BorderSide(color: Color(0xFFBCBBC1), width: 0.0), - bottom: BorderSide(color: Color(0xFFBCBBC1), width: 0.0), - ), + navigationBar: CupertinoNavigationBar(trailing: trailingButtons), + backgroundColor: CupertinoColors.systemBackground, + child: ListView( + children: [ + const Padding(padding: EdgeInsets.only(top: 32.0)), + GestureDetector( + onTap: () { + Navigator.of(context, rootNavigator: true).push( + CupertinoPageRoute( + fullscreenDialog: true, + builder: (BuildContext context) => Tab3Dialog(), ), - height: 44.0, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0), - child: SafeArea( - top: false, - bottom: false, - child: Row( - children: [ - Text( - 'Sign in', - style: TextStyle(color: CupertinoTheme.of(context).primaryColor), - ), - ], - ), + ); + }, + child: Container( + decoration: BoxDecoration( + color: CupertinoTheme.of(context).scaffoldBackgroundColor, + border: const Border( + top: BorderSide(color: Color(0xFFBCBBC1), width: 0.0), + bottom: BorderSide(color: Color(0xFFBCBBC1), width: 0.0), + ), + ), + height: 44.0, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0), + child: SafeArea( + top: false, + bottom: false, + child: Row( + children: [ + Text( + 'Sign in', + style: TextStyle(color: CupertinoTheme.of(context).primaryColor), + ), + ], ), ), ), ), - ], - ), + ), + ], ), ); } diff --git a/web/gallery/lib/demo/cupertino/cupertino_picker_demo.dart b/web/gallery/lib/demo/cupertino/cupertino_picker_demo.dart index 3bcc00f1d..fb3d31213 100644 --- a/web/gallery/lib/demo/cupertino/cupertino_picker_demo.dart +++ b/web/gallery/lib/demo/cupertino/cupertino_picker_demo.dart @@ -17,21 +17,50 @@ class CupertinoPickerDemo extends StatefulWidget { _CupertinoPickerDemoState createState() => _CupertinoPickerDemoState(); } -class _CupertinoPickerDemoState extends State { - int _selectedColorIndex = 0; +class _BottomPicker extends StatelessWidget { + const _BottomPicker({ + Key key, + @required this.child, + }) : assert(child != null), + super(key: key); - Duration timer = const Duration(); + final Widget child; - // Value that is shown in the date picker in date mode. - DateTime date = DateTime.now(); + @override + Widget build(BuildContext context) { + return Container( + height: _kPickerSheetHeight, + padding: const EdgeInsets.only(top: 6.0), + color: CupertinoColors.systemBackground.resolveFrom(context), + child: DefaultTextStyle( + style: TextStyle( + color: CupertinoColors.label.resolveFrom(context), + fontSize: 22.0, + ), + child: GestureDetector( + // Blocks taps from propagating to the modal sheet and popping. + onTap: () { }, + child: SafeArea( + top: false, + child: child, + ), + ), + ), + ); + } +} - // Value that is shown in the date picker in time mode. - DateTime time = DateTime.now(); +class _Menu extends StatelessWidget { + const _Menu({ + Key key, + @required this.children, + }) : assert(children != null), + super(key: key); - // Value that is shown in the date picker in dateAndTime mode. - DateTime dateTime = DateTime.now(); + final List children; - Widget _buildMenu(List children) { + @override + Widget build(BuildContext context) { return Container( decoration: BoxDecoration( color: CupertinoTheme.of(context).scaffoldBackgroundColor, @@ -54,28 +83,21 @@ class _CupertinoPickerDemoState extends State { ), ); } +} - Widget _buildBottomPicker(Widget picker) { - return Container( - height: _kPickerSheetHeight, - padding: const EdgeInsets.only(top: 6.0), - color: CupertinoColors.white, - child: DefaultTextStyle( - style: const TextStyle( - color: CupertinoColors.black, - fontSize: 22.0, - ), - child: GestureDetector( - // Blocks taps from propagating to the modal sheet and popping. - onTap: () { }, - child: SafeArea( - top: false, - child: picker, - ), - ), - ), - ); - } +class _CupertinoPickerDemoState extends State { + int _selectedColorIndex = 0; + + Duration timer = const Duration(); + + // Value that is shown in the date picker in date mode. + DateTime date = DateTime.now(); + + // Value that is shown in the date picker in time mode. + DateTime time = DateTime.now(); + + // Value that is shown in the date picker in dateAndTime mode. + DateTime dateTime = DateTime.now(); Widget _buildColorPicker(BuildContext context) { final FixedExtentScrollController scrollController = @@ -86,11 +108,11 @@ class _CupertinoPickerDemoState extends State { await showCupertinoModalPopup( context: context, builder: (BuildContext context) { - return _buildBottomPicker( - CupertinoPicker( + return _BottomPicker( + child: CupertinoPicker( scrollController: scrollController, itemExtent: _kPickerItemHeight, - backgroundColor: CupertinoColors.white, + backgroundColor: CupertinoColors.systemBackground.resolveFrom(context), onSelectedItemChanged: (int index) { setState(() => _selectedColorIndex = index); }, @@ -104,14 +126,12 @@ class _CupertinoPickerDemoState extends State { }, ); }, - child: _buildMenu( - [ + child: _Menu( + children: [ const Text('Favorite Color'), Text( coolColorNames[_selectedColorIndex], - style: const TextStyle( - color: CupertinoColors.inactiveGray - ), + style: TextStyle(color: CupertinoDynamicColor.resolve(CupertinoColors.inactiveGray, context)), ), ], ), @@ -124,8 +144,9 @@ class _CupertinoPickerDemoState extends State { showCupertinoModalPopup( context: context, builder: (BuildContext context) { - return _buildBottomPicker( - CupertinoTimerPicker( + return _BottomPicker( + child: CupertinoTimerPicker( + backgroundColor: CupertinoColors.systemBackground.resolveFrom(context), initialTimerDuration: timer, onTimerDurationChanged: (Duration newTimer) { setState(() => timer = newTimer); @@ -135,14 +156,14 @@ class _CupertinoPickerDemoState extends State { }, ); }, - child: _buildMenu( - [ + child: _Menu( + children: [ const Text('Countdown Timer'), Text( '${timer.inHours}:' '${(timer.inMinutes % 60).toString().padLeft(2,'0')}:' '${(timer.inSeconds % 60).toString().padLeft(2,'0')}', - style: const TextStyle(color: CupertinoColors.inactiveGray), + style: TextStyle(color: CupertinoDynamicColor.resolve(CupertinoColors.inactiveGray, context)), ), ], ), @@ -155,8 +176,9 @@ class _CupertinoPickerDemoState extends State { showCupertinoModalPopup( context: context, builder: (BuildContext context) { - return _buildBottomPicker( - CupertinoDatePicker( + return _BottomPicker( + child: CupertinoDatePicker( + backgroundColor: CupertinoColors.systemBackground.resolveFrom(context), mode: CupertinoDatePickerMode.date, initialDateTime: date, onDateTimeChanged: (DateTime newDateTime) { @@ -167,12 +189,12 @@ class _CupertinoPickerDemoState extends State { }, ); }, - child: _buildMenu( - [ + child: _Menu( + children: [ const Text('Date'), Text( DateFormat.yMMMMd().format(date), - style: const TextStyle(color: CupertinoColors.inactiveGray), + style: TextStyle(color: CupertinoDynamicColor.resolve(CupertinoColors.inactiveGray, context)), ), ] ), @@ -185,8 +207,9 @@ class _CupertinoPickerDemoState extends State { showCupertinoModalPopup( context: context, builder: (BuildContext context) { - return _buildBottomPicker( - CupertinoDatePicker( + return _BottomPicker( + child: CupertinoDatePicker( + backgroundColor: CupertinoColors.systemBackground.resolveFrom(context), mode: CupertinoDatePickerMode.time, initialDateTime: time, onDateTimeChanged: (DateTime newDateTime) { @@ -197,12 +220,12 @@ class _CupertinoPickerDemoState extends State { }, ); }, - child: _buildMenu( - [ + child: _Menu( + children: [ const Text('Time'), Text( DateFormat.jm().format(time), - style: const TextStyle(color: CupertinoColors.inactiveGray), + style: TextStyle(color: CupertinoDynamicColor.resolve(CupertinoColors.inactiveGray, context)), ), ], ), @@ -215,8 +238,9 @@ class _CupertinoPickerDemoState extends State { showCupertinoModalPopup( context: context, builder: (BuildContext context) { - return _buildBottomPicker( - CupertinoDatePicker( + return _BottomPicker( + child: CupertinoDatePicker( + backgroundColor: CupertinoColors.systemBackground.resolveFrom(context), mode: CupertinoDatePickerMode.dateAndTime, initialDateTime: dateTime, onDateTimeChanged: (DateTime newDateTime) { @@ -227,12 +251,12 @@ class _CupertinoPickerDemoState extends State { }, ); }, - child: _buildMenu( - [ + child: _Menu( + children: [ const Text('Date and Time'), Text( DateFormat.yMMMd().add_jm().format(dateTime), - style: const TextStyle(color: CupertinoColors.inactiveGray), + style: TextStyle(color: CupertinoDynamicColor.resolve(CupertinoColors.inactiveGray, context)), ), ], ), @@ -252,22 +276,15 @@ class _CupertinoPickerDemoState extends State { ), child: DefaultTextStyle( style: CupertinoTheme.of(context).textTheme.textStyle, - child: DecoratedBox( - decoration: BoxDecoration( - color: CupertinoTheme.of(context).brightness == Brightness.light - ? CupertinoColors.extraLightBackgroundGray - : CupertinoColors.darkBackgroundGray, - ), - child: ListView( - children: [ - const Padding(padding: EdgeInsets.only(top: 32.0)), - _buildColorPicker(context), - _buildCountdownTimerPicker(context), - _buildDatePicker(context), - _buildTimePicker(context), - _buildDateAndTimePicker(context), - ], - ), + child: ListView( + children: [ + const Padding(padding: EdgeInsets.only(top: 32.0)), + _buildColorPicker(context), + _buildCountdownTimerPicker(context), + _buildDatePicker(context), + _buildTimePicker(context), + _buildDateAndTimePicker(context), + ], ), ), ); diff --git a/web/gallery/lib/demo/cupertino/cupertino_refresh_demo.dart b/web/gallery/lib/demo/cupertino/cupertino_refresh_demo.dart index 6fa26d03d..fb77ccae8 100644 --- a/web/gallery/lib/demo/cupertino/cupertino_refresh_demo.dart +++ b/web/gallery/lib/demo/cupertino/cupertino_refresh_demo.dart @@ -41,59 +41,53 @@ class _CupertinoRefreshControlDemoState extends State[ - CupertinoSliverNavigationBar( - largeTitle: const Text('Refresh'), - // We're specifying a back label here because the previous page - // is a Material page. CupertinoPageRoutes could auto-populate - // these back labels. - previousPageTitle: 'Cupertino', - trailing: CupertinoDemoDocumentationButton(CupertinoRefreshControlDemo.routeName), - ), - CupertinoSliverRefreshControl( - onRefresh: () { - return Future.delayed(const Duration(seconds: 2)) - ..then((_) { - if (mounted) { - setState(() => repopulateList()); - } - }); - }, - ), - SliverSafeArea( - top: false, // Top safe area is consumed by the navigation bar. - sliver: SliverList( - delegate: SliverChildBuilderDelegate( - (BuildContext context, int index) { - return _ListItem( - name: randomizedContacts[index][0], - place: randomizedContacts[index][1], - date: randomizedContacts[index][2], - called: randomizedContacts[index][3] == 'true', - ); - }, - childCount: 20, - ), + backgroundColor: CupertinoColors.systemGroupedBackground, + child: CustomScrollView( + // If left unspecified, the [CustomScrollView] appends an + // [AlwaysScrollableScrollPhysics]. Behind the scene, the ScrollableState + // will attach that [AlwaysScrollableScrollPhysics] to the output of + // [ScrollConfiguration.of] which will be a [ClampingScrollPhysics] + // on Android. + // To demonstrate the iOS behavior in this demo and to ensure that the list + // always scrolls, we specifically use a [BouncingScrollPhysics] combined + // with a [AlwaysScrollableScrollPhysics] + physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()), + slivers: [ + CupertinoSliverNavigationBar( + largeTitle: const Text('Refresh'), + // We're specifying a back label here because the previous page + // is a Material page. CupertinoPageRoutes could auto-populate + // these back labels. + previousPageTitle: 'Cupertino', + trailing: CupertinoDemoDocumentationButton(CupertinoRefreshControlDemo.routeName), + ), + CupertinoSliverRefreshControl( + onRefresh: () { + return Future.delayed(const Duration(seconds: 2)) + ..then((_) { + if (mounted) { + setState(() => repopulateList()); + } + }); + }, + ), + SliverSafeArea( + top: false, // Top safe area is consumed by the navigation bar. + sliver: SliverList( + delegate: SliverChildBuilderDelegate( + (BuildContext context, int index) { + return _ListItem( + name: randomizedContacts[index][0], + place: randomizedContacts[index][1], + date: randomizedContacts[index][2], + called: randomizedContacts[index][3] == 'true', + ); + }, + childCount: 20, ), ), - ], - ), + ), + ], ), ), ); @@ -163,7 +157,7 @@ class _ListItem extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: CupertinoTheme.of(context).scaffoldBackgroundColor, + color: CupertinoDynamicColor.resolve(CupertinoColors.systemBackground, context), height: 60.0, padding: const EdgeInsets.only(top: 9.0), child: Row( @@ -171,11 +165,11 @@ class _ListItem extends StatelessWidget { Container( width: 38.0, child: called - ? const Align( + ? Align( alignment: Alignment.topCenter, child: Icon( CupertinoIcons.phone_solid, - color: CupertinoColors.inactiveGray, + color: CupertinoColors.inactiveGray.resolveFrom(context), size: 18.0, ), ) @@ -209,10 +203,10 @@ class _ListItem extends StatelessWidget { place, maxLines: 1, overflow: TextOverflow.ellipsis, - style: const TextStyle( + style: TextStyle( fontSize: 15.0, letterSpacing: -0.24, - color: CupertinoColors.inactiveGray, + color: CupertinoColors.inactiveGray.resolveFrom(context), ), ), ], @@ -220,8 +214,8 @@ class _ListItem extends StatelessWidget { ), Text( date, - style: const TextStyle( - color: CupertinoColors.inactiveGray, + style: TextStyle( + color: CupertinoColors.inactiveGray.resolveFrom(context), fontSize: 15.0, letterSpacing: -0.41, ), diff --git a/web/gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart b/web/gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart index d63cae4dc..89b3251d6 100644 --- a/web/gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart +++ b/web/gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart @@ -46,7 +46,13 @@ class _CupertinoSegmentedControlDemoState extends State[ - const Padding( - padding: EdgeInsets.all(16.0), - ), + const Padding(padding: EdgeInsets.all(16.0)), SizedBox( width: 500.0, child: CupertinoSegmentedControl( children: children, - onValueChanged: (int newValue) { - setState(() { - sharedValue = newValue; - }); - }, - groupValue: sharedValue, + onValueChanged: onValueChanged, + groupValue: currentSegment, + ), + ), + SizedBox( + width: 500, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: CupertinoSlidingSegmentedControl( + children: children, + onValueChanged: onValueChanged, + groupValue: currentSegment, + ), ), ), Expanded( @@ -85,36 +96,43 @@ class _CupertinoSegmentedControlDemoState extends State[ + BoxShadow( + offset: Offset(0.0, 3.0), + blurRadius: 5.0, + spreadRadius: -1.0, + color: _kKeyUmbraOpacity, + ), + BoxShadow( + offset: Offset(0.0, 6.0), + blurRadius: 10.0, + spreadRadius: 0.0, + color: _kKeyPenumbraOpacity, + ), + BoxShadow( + offset: Offset(0.0, 1.0), + blurRadius: 18.0, + spreadRadius: 0.0, + color: _kAmbientShadowOpacity, + ), + ], + ), + child: icons[currentSegment], + ); + }, ), - decoration: BoxDecoration( - color: CupertinoTheme.of(context).scaffoldBackgroundColor, - borderRadius: BorderRadius.circular(3.0), - boxShadow: const [ - BoxShadow( - offset: Offset(0.0, 3.0), - blurRadius: 5.0, - spreadRadius: -1.0, - color: _kKeyUmbraOpacity, - ), - BoxShadow( - offset: Offset(0.0, 6.0), - blurRadius: 10.0, - spreadRadius: 0.0, - color: _kKeyPenumbraOpacity, - ), - BoxShadow( - offset: Offset(0.0, 1.0), - blurRadius: 18.0, - spreadRadius: 0.0, - color: _kAmbientShadowOpacity, - ), - ], - ), - child: icons[sharedValue], ), ), ), diff --git a/web/gallery/lib/demo/images_demo.dart b/web/gallery/lib/demo/images_demo.dart index 9863a2bc8..e2d02cd59 100644 --- a/web/gallery/lib/demo/images_demo.dart +++ b/web/gallery/lib/demo/images_demo.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'package:flutter/material.dart'; import '../gallery/demo.dart'; diff --git a/web/gallery/lib/demo/material/elevation_demo.dart b/web/gallery/lib/demo/material/elevation_demo.dart index 0198657bb..ec44b389e 100644 --- a/web/gallery/lib/demo/material/elevation_demo.dart +++ b/web/gallery/lib/demo/material/elevation_demo.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'package:flutter/material.dart'; import '../../gallery/demo.dart'; diff --git a/web/gallery/lib/demo/transformations/transformations_demo.dart b/web/gallery/lib/demo/transformations/transformations_demo.dart index 4a5bf9933..8c5a5d8c0 100644 --- a/web/gallery/lib/demo/transformations/transformations_demo.dart +++ b/web/gallery/lib/demo/transformations/transformations_demo.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'dart:ui' show Vertices; import 'package:flutter/material.dart'; import 'transformations_demo_board.dart'; diff --git a/web/gallery/lib/demo/transformations/transformations_demo_board.dart b/web/gallery/lib/demo/transformations/transformations_demo_board.dart index bf74076d4..8d830e527 100644 --- a/web/gallery/lib/demo/transformations/transformations_demo_board.dart +++ b/web/gallery/lib/demo/transformations/transformations_demo_board.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'dart:collection' show IterableMixin; import 'dart:math'; import 'dart:ui' show Vertices; diff --git a/web/gallery/lib/demo/transformations/transformations_demo_color_picker.dart b/web/gallery/lib/demo/transformations/transformations_demo_color_picker.dart index ebcaa0d3d..80e612d87 100644 --- a/web/gallery/lib/demo/transformations/transformations_demo_color_picker.dart +++ b/web/gallery/lib/demo/transformations/transformations_demo_color_picker.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'package:flutter/material.dart'; // A generic widget for a list of selectable colors. diff --git a/web/gallery/lib/demo/transformations/transformations_demo_edit_board_point.dart b/web/gallery/lib/demo/transformations/transformations_demo_edit_board_point.dart index 160054b05..b9803d865 100644 --- a/web/gallery/lib/demo/transformations/transformations_demo_edit_board_point.dart +++ b/web/gallery/lib/demo/transformations/transformations_demo_edit_board_point.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'package:flutter/material.dart'; import 'transformations_demo_board.dart'; import 'transformations_demo_color_picker.dart'; diff --git a/web/gallery/lib/demo/transformations/transformations_demo_gesture_transformable.dart b/web/gallery/lib/demo/transformations/transformations_demo_gesture_transformable.dart index c8bd21d1b..54f55e137 100644 --- a/web/gallery/lib/demo/transformations/transformations_demo_gesture_transformable.dart +++ b/web/gallery/lib/demo/transformations/transformations_demo_gesture_transformable.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'package:flutter/material.dart'; import 'package:vector_math/vector_math_64.dart' show Vector3; import 'transformations_demo_inertial_motion.dart'; diff --git a/web/gallery/lib/demo/transformations/transformations_demo_inertial_motion.dart b/web/gallery/lib/demo/transformations/transformations_demo_inertial_motion.dart index 8e45c00b2..389e46a4d 100644 --- a/web/gallery/lib/demo/transformations/transformations_demo_inertial_motion.dart +++ b/web/gallery/lib/demo/transformations/transformations_demo_inertial_motion.dart @@ -1,3 +1,7 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + import 'dart:math'; import 'package:flutter/material.dart'; import 'package:vector_math/vector_math.dart' show Vector2; diff --git a/web/gallery/lib/gallery/demos.dart b/web/gallery/lib/gallery/demos.dart index a212305b2..2756ae963 100644 --- a/web/gallery/lib/gallery/demos.dart +++ b/web/gallery/lib/gallery/demos.dart @@ -131,6 +131,14 @@ List _buildGalleryDemos() { routeName: TransformationsDemo.routeName, buildRoute: (BuildContext context) => const TransformationsDemo(), ), + GalleryDemo( + title: 'Pesto', + subtitle: 'Simple recipe browser', + icon: Icons.adjust, + category: _kDemos, + routeName: PestoDemo.routeName, + buildRoute: (BuildContext context) => const PestoDemo(), + ), // Style GalleryDemo( @@ -555,23 +563,6 @@ List _buildGalleryDemos() { buildRoute: (BuildContext context) => const VideoDemo(), ), ]; - - // Keep Pesto around for its regression test value. It is not included - // in (release builds) the performance tests. - assert(() { - galleryDemos.insert(0, - GalleryDemo( - title: 'Pesto', - subtitle: 'Simple recipe browser', - icon: Icons.adjust, - category: _kDemos, - routeName: PestoDemo.routeName, - buildRoute: (BuildContext context) => const PestoDemo(), - ), - ); - return true; - }()); - return galleryDemos; } diff --git a/web/gallery/pubspec.lock b/web/gallery/pubspec.lock index 7b326d3cd..e46537585 100644 --- a/web/gallery/pubspec.lock +++ b/web/gallery/pubspec.lock @@ -7,14 +7,14 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.36.4" + version: "0.38.5" archive: dependency: "direct dev" description: name: archive url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.0.11" args: dependency: "direct dev" description: @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.0" boolean_selector: dependency: "direct dev" description: @@ -56,7 +56,7 @@ packages: name: connectivity url: "https://pub.dartlang.org" source: hosted - version: "0.4.5+1" + version: "0.4.5+3" convert: dependency: "direct dev" description: @@ -64,6 +64,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.1" + coverage: + dependency: "direct dev" + description: + name: coverage + url: "https://pub.dartlang.org" + source: hosted + version: "0.13.3+1" crypto: dependency: "direct dev" description: @@ -91,7 +98,7 @@ packages: name: device_info url: "https://pub.dartlang.org" source: hosted - version: "0.4.1" + version: "0.4.1+1" file: dependency: "direct dev" description: @@ -139,7 +146,7 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.19" + version: "0.1.27" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -221,21 +228,28 @@ packages: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.19" + version: "0.3.27" + logging: + dependency: "direct dev" + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "0.11.3+2" matcher: dependency: "direct dev" description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.6" meta: dependency: "direct main" description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" mime: dependency: "direct dev" description: @@ -443,21 +457,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.6.3" + version: "1.9.4" test_api: dependency: "direct dev" description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.11" test_core: dependency: "direct dev" description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.15" typed_data: dependency: "direct main" description: @@ -471,7 +485,14 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "5.2.3" + version: "5.2.5" + url_launcher_platform_interface: + dependency: "direct main" + description: + name: url_launcher_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" vector_math: dependency: "direct main" description: @@ -486,6 +507,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.10.2+5" + vm_service: + dependency: "direct dev" + description: + name: vm_service + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" vm_service_client: dependency: "direct dev" description: diff --git a/web/gallery/pubspec.yaml b/web/gallery/pubspec.yaml index ad1427d71..0084b7650 100644 --- a/web/gallery/pubspec.yaml +++ b/web/gallery/pubspec.yaml @@ -8,11 +8,11 @@ dependencies: flutter: sdk: flutter collection: 1.14.11 - device_info: 0.4.1 + device_info: 0.4.1+1 intl: 0.16.0 - connectivity: 0.4.5+1 + connectivity: 0.4.5+3 string_scanner: 1.0.5 - url_launcher: 5.2.3 + url_launcher: 5.2.5 cupertino_icons: 0.1.2 video_player: 0.10.2+5 scoped_model: 1.0.1 @@ -22,11 +22,12 @@ dependencies: flutter_gallery_assets: 0.1.9+2 charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + meta: 1.1.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + url_launcher_platform_interface: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dev_dependencies: @@ -36,18 +37,19 @@ dev_dependencies: sdk: flutter flutter_goldens: sdk: flutter - test: 1.6.3 + test: 1.9.4 - analyzer: 0.36.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - archive: 2.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.38.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - async: 2.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + coverage: 0.13.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - front_end: 0.1.19 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + front_end: 0.1.27 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http: 0.12.0+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -57,8 +59,9 @@ dev_dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - kernel: 0.3.19 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + kernel: 0.3.27 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -81,8 +84,9 @@ dev_dependencies: source_maps: 0.10.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test_api: 0.2.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + test_core: 0.2.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + vm_service: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vm_service_client: 0.2.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -260,7 +264,7 @@ flutter: - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Italic.ttf - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf - # TODO (ryjohn): Find a way to get Cupertino fonts working + # Work around missing Cupertino fonts by using GoogleSans instead. - family: .SF Pro Text fonts: - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSans-BoldItalic.ttf @@ -330,5 +334,4 @@ flutter: - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Regular.ttf weight: 400 - -# PUBSPEC CHECKSUM: 76b5 +# PUBSPEC CHECKSUM: 1e1b diff --git a/web/github_dataviz/pubspec.lock b/web/github_dataviz/pubspec.lock index e61a36f5f..32b76e2a1 100644 --- a/web/github_dataviz/pubspec.lock +++ b/web/github_dataviz/pubspec.lock @@ -54,7 +54,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" path: dependency: transitive description: diff --git a/web/particle_background/pubspec.lock b/web/particle_background/pubspec.lock index 040daf466..7c07229f8 100644 --- a/web/particle_background/pubspec.lock +++ b/web/particle_background/pubspec.lock @@ -19,7 +19,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" sky_engine: dependency: transitive description: flutter diff --git a/web/slide_puzzle/pubspec.lock b/web/slide_puzzle/pubspec.lock index 904743100..5a7823128 100644 --- a/web/slide_puzzle/pubspec.lock +++ b/web/slide_puzzle/pubspec.lock @@ -14,7 +14,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.0.11" args: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.0" boolean_selector: dependency: transitive description: @@ -57,6 +57,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.1" + coverage: + dependency: transitive + description: + name: coverage + url: "https://pub.dartlang.org" + source: hosted + version: "0.13.3+1" crypto: dependency: transitive description: @@ -144,13 +151,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.6.1+1" - json_rpc_2: - dependency: transitive - description: - name: json_rpc_2 - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" kernel: dependency: transitive description: @@ -158,20 +158,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.19" + logging: + dependency: transitive + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "0.11.3+2" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.6" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" mime: dependency: transitive description: @@ -337,21 +344,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.6.3" + version: "1.9.4" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.11" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.15" typed_data: dependency: transitive description: @@ -366,13 +373,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" - vm_service_client: + vm_service: dependency: transitive description: - name: vm_service_client + name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "0.2.6+3" + version: "2.1.1" watcher: dependency: transitive description: diff --git a/web/spinning_square/pubspec.lock b/web/spinning_square/pubspec.lock index 040daf466..7c07229f8 100644 --- a/web/spinning_square/pubspec.lock +++ b/web/spinning_square/pubspec.lock @@ -19,7 +19,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" sky_engine: dependency: transitive description: flutter diff --git a/web/timeflow/pubspec.lock b/web/timeflow/pubspec.lock index 040daf466..7c07229f8 100644 --- a/web/timeflow/pubspec.lock +++ b/web/timeflow/pubspec.lock @@ -19,7 +19,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" sky_engine: dependency: transitive description: flutter diff --git a/web/vision_challenge/pubspec.lock b/web/vision_challenge/pubspec.lock index 657e7fce0..df899e03c 100644 --- a/web/vision_challenge/pubspec.lock +++ b/web/vision_challenge/pubspec.lock @@ -26,7 +26,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" redux: dependency: "direct main" description: