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

Fix issues.

Browse Source
This commit is contained in:
asiva 2018-02-07 17:46:16 -08:00 committed by Siva
parent e122d5d1d5
commit bdc6f10293
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/widgets/automatic_keep_alive.dart
View File

@ -299,7 +299,7 @@ class KeepAliveHandle extends ChangeNotifier {
/// ///
/// * [AutomaticKeepAlive], which listens to messages from this mixin. /// * [AutomaticKeepAlive], which listens to messages from this mixin.
/// * [KeepAliveNotification], the notifications sent by this mixin. /// * [KeepAliveNotification], the notifications sent by this mixin.
abstract class AutomaticKeepAliveClientMixin extends State<T> { abstract class AutomaticKeepAliveClientMixin extends State<StatefulWidget> {
// This class is intended to be used as a mixin, and should not be // This class is intended to be used as a mixin, and should not be
// extended directly. // extended directly.
factory AutomaticKeepAliveClientMixin._() => null; factory AutomaticKeepAliveClientMixin._() => null;

5
packages/flutter/lib/src/widgets/ticker_provider.dart
View File

@ -155,12 +155,7 @@ abstract class SingleTickerProviderStateMixin extends State<T> implements Ticker
/// If you only have a single [Ticker] (for example only a single /// If you only have a single [Ticker] (for example only a single
/// [AnimationController]) for the lifetime of your [State], then using a /// [AnimationController]) for the lifetime of your [State], then using a
/// [SingleTickerProviderStateMixin] is more efficient. This is the common case. /// [SingleTickerProviderStateMixin] is more efficient. This is the common case.
<<<<<<< HEAD
@optionalTypeArgs
abstract class TickerProviderStateMixin<T extends StatefulWidget> extends State<T> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
=======
abstract class TickerProviderStateMixin extends State<dynamic> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232 abstract class TickerProviderStateMixin extends State<dynamic> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
>>>>>>> parent of 1c236d524... Fixes in flutter framework code to address the mixin issue raised
// This class is intended to be used as a mixin, and should not be // This class is intended to be used as a mixin, and should not be
// extended directly. // extended directly.
factory TickerProviderStateMixin._() => null; factory TickerProviderStateMixin._() => null;