firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove circular imports of the material.dart library

Browse Source
This commit is contained in:
Adam Barth 2015-10-09 10:38:02 -07:00
parent db3b9e8052
commit 3053e876d0
14 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/flutter/lib/src/material/date_picker.dart
View File

@ -6,13 +6,14 @@ import 'dart:async';
import 'package:intl/date_symbols.dart';
import 'package:intl/intl.dart';
import 'package:sky/material.dart';
import 'package:sky/painting.dart';
import 'package:sky/services.dart';
import 'package:sky/widgets.dart';
import 'colors.dart';
import 'ink_well.dart';
import 'theme.dart';
import 'typography.dart';
typedef void DatePickerValueChanged(DateTime dateTime);

4
packages/flutter/lib/src/material/dialog.dart
View File

@ -6,11 +6,11 @@ import 'dart:async';
import 'package:sky/animation.dart';
import 'package:sky/gestures.dart';
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'material.dart';
import 'colors.dart';
import 'material_button.dart';
import 'material.dart';
import 'theme.dart';
typedef Widget DialogBuilder(NavigatorState navigator);

3
packages/flutter/lib/src/material/drawer.dart
View File

@ -3,9 +3,10 @@
// found in the LICENSE file.
import 'package:sky/animation.dart';
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'colors.dart';
import 'shadows.dart';
import 'theme.dart';
// TODO(eseidel): Draw width should vary based on device size:

2
packages/flutter/lib/src/material/drawer_header.dart
View File

@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'constants.dart';
import 'theme.dart';
// TODO(jackson): This class should usually render the user's

2
packages/flutter/lib/src/material/drawer_item.dart
View File

@ -5,10 +5,10 @@
import 'dart:sky' as sky;
import 'package:sky/gestures.dart';
import 'package:sky/material.dart';
import 'package:sky/painting.dart';
import 'package:sky/widgets.dart';
import 'colors.dart';
import 'icon.dart';
import 'ink_well.dart';
import 'theme.dart';

2
packages/flutter/lib/src/material/flat_button.dart
View File

@ -3,9 +3,9 @@
// found in the LICENSE file.
import 'package:sky/gestures.dart';
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'colors.dart';
import 'material_button.dart';
import 'theme.dart';

3
packages/flutter/lib/src/material/material.dart
View File

@ -4,9 +4,10 @@
import 'package:sky/animation.dart';
import 'package:sky/painting.dart';
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'constants.dart';
import 'shadows.dart';
import 'theme.dart';
enum MaterialType { canvas, card, circle, button }

1
packages/flutter/lib/src/material/material_app.dart
View File

@ -4,7 +4,6 @@
import 'dart:sky' as sky;
import 'package:sky/material.dart';
import 'package:sky/painting.dart';
import 'package:sky/services.dart';
import 'package:sky/widgets.dart';

2
packages/flutter/lib/src/material/material_button.dart
View File

@ -3,9 +3,9 @@
// found in the LICENSE file.
import 'package:sky/gestures.dart';
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'colors.dart';
import 'ink_well.dart';
import 'material.dart';
import 'theme.dart';

2
packages/flutter/lib/src/material/popup_menu.dart
View File

@ -6,12 +6,12 @@ import 'dart:async';
import 'dart:sky' as sky;
import 'package:sky/animation.dart';
import 'package:sky/material.dart';
import 'package:sky/painting.dart';
import 'package:sky/widgets.dart';
import 'ink_well.dart';
import 'popup_menu_item.dart';
import 'shadows.dart';
import 'theme.dart';
const Duration _kMenuDuration = const Duration(milliseconds: 300);

2
packages/flutter/lib/src/material/raised_button.dart
View File

@ -3,9 +3,9 @@
// found in the LICENSE file.
import 'package:sky/gestures.dart';
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'colors.dart';
import 'material_button.dart';
import 'theme.dart';

3
packages/flutter/lib/src/material/scaffold.dart
View File

@ -4,10 +4,11 @@
import 'dart:sky' as sky;
import 'package:sky/material.dart';
import 'package:sky/rendering.dart';
import 'package:sky/widgets.dart';
import 'constants.dart';
class Scaffold extends StatelessComponent {
Scaffold({
Key key,

3
packages/flutter/lib/src/material/snack_bar.dart
View File

@ -4,12 +4,13 @@
import 'package:sky/animation.dart';
import 'package:sky/gestures.dart';
import 'package:sky/material.dart';
import 'package:sky/painting.dart';
import 'package:sky/widgets.dart';
import 'constants.dart';
import 'material.dart';
import 'theme.dart';
import 'typography.dart';
const double _kSideMargins = 24.0;
const double _kVerticalPadding = 14.0;

4
packages/flutter/lib/src/material/tool_bar.dart
View File

@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:sky/material.dart';
import 'package:sky/painting.dart';
import 'package:sky/widgets.dart';
import 'constants.dart';
import 'icon.dart';
import 'shadows.dart';
import 'theme.dart';
import 'typography.dart';
class ToolBar extends StatelessComponent {
ToolBar({