From 09cf84d9b6a7fa8b975cdf2d22ae4f7b50230b22 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Wed, 25 Nov 2015 23:15:17 -0800
Subject: [PATCH] Move RenderTogglable to material.dart

Fixes #219
---
 packages/flutter/lib/material.dart                        | 1 +
 packages/flutter/lib/rendering.dart                       | 1 -
 packages/flutter/lib/src/material/checkbox.dart           | 1 +
 packages/flutter/lib/src/material/switch.dart             | 1 +
 .../lib/src/{rendering => material}/toggleable.dart       | 8 +-------
 packages/flutter/lib/src/rendering/basic_types.dart       | 2 ++
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename packages/flutter/lib/src/{rendering => material}/toggleable.dart (94%)

diff --git a/packages/flutter/lib/material.dart b/packages/flutter/lib/material.dart
index 9639d39ea3..132906daa2 100644
--- a/packages/flutter/lib/material.dart
+++ b/packages/flutter/lib/material.dart
@@ -54,6 +54,7 @@ export 'src/material/theme_data.dart';
 export 'src/material/time_picker.dart';
 export 'src/material/time_picker_dialog.dart';
 export 'src/material/title.dart';
+export 'src/material/toggleable.dart';
 export 'src/material/tool_bar.dart';
 export 'src/material/typography.dart';
 
diff --git a/packages/flutter/lib/rendering.dart b/packages/flutter/lib/rendering.dart
index 589b4e5a05..08ae476b27 100644
--- a/packages/flutter/lib/rendering.dart
+++ b/packages/flutter/lib/rendering.dart
@@ -27,7 +27,6 @@ export 'src/rendering/proxy_box.dart';
 export 'src/rendering/shifted_box.dart';
 export 'src/rendering/stack.dart';
 export 'src/rendering/statistics_box.dart';
-export 'src/rendering/toggleable.dart';
 export 'src/rendering/view.dart';
 export 'src/rendering/viewport.dart';
 
diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart
index 9e576e7c7a..350d17e035 100644
--- a/packages/flutter/lib/src/material/checkbox.dart
+++ b/packages/flutter/lib/src/material/checkbox.dart
@@ -9,6 +9,7 @@ import 'package:flutter/widgets.dart';
 
 import 'colors.dart';
 import 'theme.dart';
+import 'toggleable.dart';
 
 const double _kMidpoint = 0.5;
 const double _kEdgeSize = 18.0;
diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart
index d2c61c0e34..4ae3202d76 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -12,6 +12,7 @@ import 'package:flutter/widgets.dart';
 import 'radial_reaction.dart';
 import 'shadows.dart';
 import 'theme.dart';
+import 'toggleable.dart';
 
 const Color _kThumbOffColor = const Color(0xFFFAFAFA);
 const Color _kTrackOffColor = const Color(0x42000000);
diff --git a/packages/flutter/lib/src/rendering/toggleable.dart b/packages/flutter/lib/src/material/toggleable.dart
similarity index 94%
rename from packages/flutter/lib/src/rendering/toggleable.dart
rename to packages/flutter/lib/src/material/toggleable.dart
index 5c9d22d8c7..d8a395f69e 100644
--- a/packages/flutter/lib/src/rendering/toggleable.dart
+++ b/packages/flutter/lib/src/material/toggleable.dart
@@ -4,13 +4,7 @@
 
 import 'package:flutter/animation.dart';
 import 'package:flutter/gestures.dart';
-
-import 'binding.dart';
-import 'box.dart';
-import 'object.dart';
-import 'proxy_box.dart';
-
-typedef void ValueChanged<T>(T value);
+import 'package:flutter/rendering.dart';
 
 const Duration _kToggleDuration = const Duration(milliseconds: 200);
 
diff --git a/packages/flutter/lib/src/rendering/basic_types.dart b/packages/flutter/lib/src/rendering/basic_types.dart
index b9725784cc..7dfca4088e 100644
--- a/packages/flutter/lib/src/rendering/basic_types.dart
+++ b/packages/flutter/lib/src/rendering/basic_types.dart
@@ -14,3 +14,5 @@ export 'dart:ui' show
   Size,
   TransferMode,
   VoidCallback;
+
+typedef void ValueChanged<T>(T value);