Roll Flutter from 17c1dbc47378 to d52e2de5bf16 (105 revisions)

.ci/flutter_master.version

@@ -1 +1 @@
-17c1dbc47378da46bb4472dd77a6b12158fec48e
+d52e2de5bf16249f3a44319ae2807169f9b0b13a

packages/flutter_markdown/example/lib/demos/basic_markdown_demo.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 
-import '../shared/dropdown_menu.dart';
+import '../shared/dropdown_menu.dart' as dropdown;
 import '../shared/markdown_demo_widget.dart';
 import '../shared/markdown_extensions.dart';
 
@@ -85,7 +85,7 @@ class _BasicMarkdownDemoState extends State<BasicMarkdownDemo> {
         if (snapshot.connectionState == ConnectionState.done) {
           return Column(
             children: <Widget>[
-              DropdownMenu<MarkdownExtensionSet>(
+              dropdown.DropdownMenu<MarkdownExtensionSet>(
                 items: _menuItems,
                 label: 'Extension Set:',
                 initialValue: _extensionSet,

packages/flutter_markdown/example/lib/demos/markdown_body_shrink_wrap_demo.dart

@@ -7,7 +7,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import '../shared/dropdown_menu.dart';
+import '../shared/dropdown_menu.dart' as dropdown;
 import '../shared/markdown_demo_widget.dart';
 
 // ignore_for_file: public_member_api_docs
@@ -67,7 +67,7 @@ class _MarkdownBodyShrinkWrapDemoState
   Widget build(BuildContext context) {
     return Column(
       children: <Widget>[
-        DropdownMenu<bool>(
+        dropdown.DropdownMenu<bool>(
           items: _shrinkWrapMenuItems,
           label: 'Shrink wrap:',
           initialValue: _shrinkWrap,

packages/flutter_markdown/example/lib/demos/wrap_alignment_demo.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:markdown/markdown.dart' as md;
-import '../shared/dropdown_menu.dart';
+import '../shared/dropdown_menu.dart' as dropdown;
 import '../shared/markdown_demo_widget.dart';
 import '../shared/markdown_extensions.dart';
 
@@ -79,7 +79,7 @@ class _WrapAlignmentDemoState extends State<WrapAlignmentDemo> {
         if (snapshot.connectionState == ConnectionState.done) {
           return Column(
             children: <Widget>[
-              DropdownMenu<WrapAlignment>(
+              dropdown.DropdownMenu<WrapAlignment>(
                 items: _wrapAlignmentMenuItems,
                 label: 'Wrap Alignment:',
                 initialValue: _wrapAlignment,
@@ -91,7 +91,7 @@ class _WrapAlignmentDemoState extends State<WrapAlignmentDemo> {
                   }
                 },
               ),
-              DropdownMenu<double>(
+              dropdown.DropdownMenu<double>(
                 items: _blockSpacingMenuItems,
                 label: 'Block Spacing:',
                 initialValue: _blockSpacing,