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

Merge pull request #2068 from abarth/de_material

Browse Source 
Remove redundant material_ prefix
This commit is contained in:
Adam Barth 2016-02-21 12:58:13 -08:00
commit 505547ae95
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter/lib/material.dart
View File

@ -7,7 +7,9 @@
/// See https://www.google.com/design/spec/material-design/introduction.html /// See https://www.google.com/design/spec/material-design/introduction.html
library material; library material;
export 'src/material/app.dart';
export 'src/material/bottom_sheet.dart'; export 'src/material/bottom_sheet.dart';
export 'src/material/button.dart';
export 'src/material/card.dart'; export 'src/material/card.dart';
export 'src/material/checkbox.dart'; export 'src/material/checkbox.dart';
export 'src/material/chip.dart'; export 'src/material/chip.dart';
@ -33,11 +35,9 @@ export 'src/material/icon_theme.dart';
export 'src/material/icon_theme_data.dart'; export 'src/material/icon_theme_data.dart';
export 'src/material/ink_well.dart'; export 'src/material/ink_well.dart';
export 'src/material/input.dart'; export 'src/material/input.dart';
export 'src/material/list.dart';
export 'src/material/list_item.dart'; export 'src/material/list_item.dart';
export 'src/material/material.dart'; export 'src/material/material.dart';
export 'src/material/material_app.dart';
export 'src/material/material_button.dart';
export 'src/material/material_list.dart';
export 'src/material/page.dart'; export 'src/material/page.dart';
export 'src/material/popup_menu.dart'; export 'src/material/popup_menu.dart';
export 'src/material/progress_indicator.dart'; export 'src/material/progress_indicator.dart';

0
packages/flutter/lib/src/material/material_app.dart → packages/flutter/lib/src/material/app.dart
View File

0
packages/flutter/lib/src/material/material_button.dart → packages/flutter/lib/src/material/button.dart
View File

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

@ -6,8 +6,8 @@ import 'dart:async';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'button.dart';
import 'colors.dart'; import 'colors.dart';
import 'material_button.dart';
import 'material.dart'; import 'material.dart';
import 'theme.dart'; import 'theme.dart';

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

@ -4,7 +4,7 @@
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'material_button.dart'; import 'button.dart';
import 'theme.dart'; import 'theme.dart';
/// A material design "flat button". /// A material design "flat button".

0
packages/flutter/lib/src/material/material_list.dart → packages/flutter/lib/src/material/list.dart
View File

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

@ -4,8 +4,8 @@
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'button.dart';
import 'colors.dart'; import 'colors.dart';
import 'material_button.dart';
import 'theme.dart'; import 'theme.dart';
/// A material design "raised button". /// A material design "raised button".

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

@ -4,11 +4,11 @@
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'button.dart';
import 'flat_button.dart'; import 'flat_button.dart';
import 'material.dart'; import 'material.dart';
import 'material_button.dart';
import 'theme.dart';
import 'theme_data.dart'; import 'theme_data.dart';
import 'theme.dart';
import 'typography.dart'; import 'typography.dart';
// https://www.google.com/design/spec/components/snackbars-toasts.html#snackbars-toasts-specs // https://www.google.com/design/spec/components/snackbars-toasts.html#snackbars-toasts-specs

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

@ -6,8 +6,8 @@ import 'package:flutter/widgets.dart';
import 'colors.dart'; import 'colors.dart';
import 'icon.dart'; import 'icon.dart';
import 'list.dart';
import 'list_item.dart'; import 'list_item.dart';
import 'material_list.dart';
import 'theme.dart'; import 'theme.dart';
import 'theme_data.dart'; import 'theme_data.dart';