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

Revert "Remove mixin so we can roll Google3 (#22819)" (#22926)

Browse Source 
This reverts commit c689c97d0579d2a215034359a3cbcdc61173d2ab.

The Dart analyzer in Google3 has been upgraded so we won't need this.
This commit is contained in:
liyuqian 2018-10-16 11:02:55 -07:00 committed by GitHub
parent c12b99f282
commit 3c9e9b3410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ class FlatButton extends MaterialButton {
///
/// This class only exists to give FlatButtons created with [FlatButton.icon]
/// a distinct class for the sake of [ButtonTheme]. It can not be instantiated.
class _FlatButtonWithIcon extends FlatButton implements MaterialButtonWithIconMixin {
class _FlatButtonWithIcon extends FlatButton with MaterialButtonWithIconMixin {
_FlatButtonWithIcon({
Key key,
@required VoidCallback onPressed,

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

@ -282,6 +282,4 @@ class MaterialButton extends StatelessWidget {
///
/// This mixin only exists to give the "label and icon" button widgets a distinct
/// type for the sake of [ButtonTheme].
abstract class MaterialButtonWithIconMixin {
MaterialButtonWithIconMixin._();
}
mixin MaterialButtonWithIconMixin { }

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

@ -185,7 +185,7 @@ class OutlineButton extends MaterialButton {
//
// This class only exists to give RaisedButtons created with [RaisedButton.icon]
// a distinct class for the sake of [ButtonTheme]. It can not be instantiated.
class _OutlineButtonWithIcon extends OutlineButton implements MaterialButtonWithIconMixin {
class _OutlineButtonWithIcon extends OutlineButton with MaterialButtonWithIconMixin {
_OutlineButtonWithIcon({
Key key,
@required VoidCallback onPressed,

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

@ -171,7 +171,7 @@ class RaisedButton extends MaterialButton {
///
/// This class only exists to give RaisedButtons created with [RaisedButton.icon]
/// a distinct class for the sake of [ButtonTheme]. It can not be instantiated.
class _RaisedButtonWithIcon extends RaisedButton implements MaterialButtonWithIconMixin {
class _RaisedButtonWithIcon extends RaisedButton with MaterialButtonWithIconMixin {
_RaisedButtonWithIcon({
Key key,
@required VoidCallback onPressed,