firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move maxBy into the MaterialArc file (#5905)

Browse Source 
As per our style guide, if you can't explain something, refactor it. I
studied this function for a while and still can't explain it, so...
This commit is contained in:
Ian Hickson
2016-09-15 23:32:51 -07:00
committed by GitHub
parent 10e4f52080
commit 0873f3e186
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/flutter/lib/src/foundation/basic_types.dart
View File

@@ -243,21 +243,3 @@ class _LazyListIterator<E> implements Iterator<E> {
return true;
}
}
// COLLECTION UTILITIES
typedef dynamic KeyFunc<T>(T input);
/// Select the element for which the key function returns the maximum value.
dynamic/*=T*/ maxBy/*<T>*/(Iterable<dynamic/*=T*/> input, KeyFunc/*<T>*/ keyFunc) {
dynamic/*=T*/ maxValue;
dynamic maxKey;
for (dynamic/*=T*/ value in input) {
dynamic key = keyFunc(value);
if (maxKey == null || key > maxKey) {
maxValue = value;
maxKey = key;
}
}
return maxValue;
}

19
packages/flutter/lib/src/material/arc.dart
View File

@@ -5,7 +5,6 @@
import 'dart:math' as math;
import 'dart:ui' show hashValues, lerpDouble;
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:meta/meta.dart';
@@ -160,6 +159,22 @@ const List<_Diagonal> _allDiagonals = const <_Diagonal>[
const _Diagonal(_CornerId.bottomLeft, _CornerId.topRight),
];
typedef dynamic _KeyFunc<T>(T input);
// Select the element for which the key function returns the maximum value.
dynamic/*=T*/ _maxBy/*<T>*/(Iterable<dynamic/*=T*/> input, _KeyFunc/*<T>*/ keyFunc) {
dynamic/*=T*/ maxValue;
dynamic maxKey;
for (dynamic/*=T*/ value in input) {
dynamic key = keyFunc(value);
if (maxKey == null || key > maxKey) {
maxValue = value;
maxKey = key;
}
}
return maxValue;
}
/// A [Tween] that animates a [Rect] from [begin] to [end].
///
/// The rectangle corners whose diagonal is closest to the overall direction of
@@ -184,7 +199,7 @@ class MaterialRectArcTween extends RectTween {
assert(begin != null);
assert(end != null);
final Offset centersVector = end.center - begin.center;
_diagonal = maxBy(_allDiagonals, (_Diagonal d) => _diagonalSupport(centersVector, d));
_diagonal = _maxBy/*<_Diagonal>*/(_allDiagonals, (_Diagonal d) => _diagonalSupport(centersVector, d));
_beginArc = new MaterialPointArcTween(
begin: _cornerFor(begin, _diagonal.beginId),
end: _cornerFor(end, _diagonal.beginId)