From 240df79361e689cf82456df07bedd98713a555dc Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Sat, 20 Feb 2016 22:12:15 -0800
Subject: [PATCH] Remove redundant material_ prefix

These files are already in the "material" folder. They don't need to be
prefixed with material again.

Fixes #702
---
 packages/flutter/lib/material.dart                          | 6 +++---
 .../lib/src/material/{material_app.dart => app.dart}        | 0
 .../lib/src/material/{material_button.dart => button.dart}  | 0
 packages/flutter/lib/src/material/dialog.dart               | 2 +-
 packages/flutter/lib/src/material/flat_button.dart          | 2 +-
 .../lib/src/material/{material_list.dart => list.dart}      | 0
 packages/flutter/lib/src/material/raised_button.dart        | 2 +-
 packages/flutter/lib/src/material/snack_bar.dart            | 4 ++--
 packages/flutter/lib/src/material/two_level_list.dart       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/flutter/lib/src/material/{material_app.dart => app.dart} (100%)
 rename packages/flutter/lib/src/material/{material_button.dart => button.dart} (100%)
 rename packages/flutter/lib/src/material/{material_list.dart => list.dart} (100%)

diff --git a/packages/flutter/lib/material.dart b/packages/flutter/lib/material.dart
index 3214a1899c..2fcfa457d9 100644
--- a/packages/flutter/lib/material.dart
+++ b/packages/flutter/lib/material.dart
@@ -7,7 +7,9 @@
 /// See https://www.google.com/design/spec/material-design/introduction.html
 library material;
 
+export 'src/material/app.dart';
 export 'src/material/bottom_sheet.dart';
+export 'src/material/button.dart';
 export 'src/material/card.dart';
 export 'src/material/checkbox.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/ink_well.dart';
 export 'src/material/input.dart';
+export 'src/material/list.dart';
 export 'src/material/list_item.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/popup_menu.dart';
 export 'src/material/progress_indicator.dart';
diff --git a/packages/flutter/lib/src/material/material_app.dart b/packages/flutter/lib/src/material/app.dart
similarity index 100%
rename from packages/flutter/lib/src/material/material_app.dart
rename to packages/flutter/lib/src/material/app.dart
diff --git a/packages/flutter/lib/src/material/material_button.dart b/packages/flutter/lib/src/material/button.dart
similarity index 100%
rename from packages/flutter/lib/src/material/material_button.dart
rename to packages/flutter/lib/src/material/button.dart
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
index dae65a598f..53bda7ddd3 100644
--- a/packages/flutter/lib/src/material/dialog.dart
+++ b/packages/flutter/lib/src/material/dialog.dart
@@ -6,8 +6,8 @@ import 'dart:async';
 
 import 'package:flutter/widgets.dart';
 
+import 'button.dart';
 import 'colors.dart';
-import 'material_button.dart';
 import 'material.dart';
 import 'theme.dart';
 
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index 5a6a7cc34b..d4695250ea 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter/widgets.dart';
 
-import 'material_button.dart';
+import 'button.dart';
 import 'theme.dart';
 
 /// A material design "flat button".
diff --git a/packages/flutter/lib/src/material/material_list.dart b/packages/flutter/lib/src/material/list.dart
similarity index 100%
rename from packages/flutter/lib/src/material/material_list.dart
rename to packages/flutter/lib/src/material/list.dart
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index e54fac7781..11a9dcc9a2 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -4,8 +4,8 @@
 
 import 'package:flutter/widgets.dart';
 
+import 'button.dart';
 import 'colors.dart';
-import 'material_button.dart';
 import 'theme.dart';
 
 /// A material design "raised button".
diff --git a/packages/flutter/lib/src/material/snack_bar.dart b/packages/flutter/lib/src/material/snack_bar.dart
index e06d38a1f2..9261cdca73 100644
--- a/packages/flutter/lib/src/material/snack_bar.dart
+++ b/packages/flutter/lib/src/material/snack_bar.dart
@@ -4,11 +4,11 @@
 
 import 'package:flutter/widgets.dart';
 
+import 'button.dart';
 import 'flat_button.dart';
 import 'material.dart';
-import 'material_button.dart';
-import 'theme.dart';
 import 'theme_data.dart';
+import 'theme.dart';
 import 'typography.dart';
 
 // https://www.google.com/design/spec/components/snackbars-toasts.html#snackbars-toasts-specs
diff --git a/packages/flutter/lib/src/material/two_level_list.dart b/packages/flutter/lib/src/material/two_level_list.dart
index 0746b44107..3a4a4cfd8b 100644
--- a/packages/flutter/lib/src/material/two_level_list.dart
+++ b/packages/flutter/lib/src/material/two_level_list.dart
@@ -6,8 +6,8 @@ import 'package:flutter/widgets.dart';
 
 import 'colors.dart';
 import 'icon.dart';
+import 'list.dart';
 import 'list_item.dart';
-import 'material_list.dart';
 import 'theme.dart';
 import 'theme_data.dart';