Skip to content

Ramin/animate_to_current_tick #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jul 23, 2020
Merged

Ramin/animate_to_current_tick #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
01be2d1
Animating to current tick when arrow button is clicked
Jul 1, 2020
be2535a
Animation duration relative to distance so it animate by a similar pa…
Jul 1, 2020
ea5f764
Using a Tween Animation instead
Jul 1, 2020
ba8e205
idea/codeStyle in gitignore
Jul 1, 2020
6d886db
Using only AnimationController again and have animation duration rela…
Jul 2, 2020
1b0c179
Removed relative duration.
Jul 2, 2020
7c32144
Hiding scrollToNow button while already animating
Jul 2, 2020
9e42462
Adding the animation time to its upperbound
Jul 2, 2020
50b9652
A separate getter to check arrow button be visible
Jul 2, 2020
f98490c
Minor refactor
Jul 2, 2020
c6078a4
Merge remote-tracking branch 'upstream/dev' into ramin/animate_to_cur…
Jul 16, 2020
7939a57
Merge remote-tracking branch 'upstream/dev' into ramin/animate_to_cur…
Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ captures/
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
.idea/codeStyles

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
Expand Down
45 changes: 37 additions & 8 deletions lib/src/chart.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,16 @@ class _ChartState extends State<Chart> with TickerProviderStateMixin {
AnimationController _loadingAnimationController;
AnimationController _topBoundQuoteAnimationController;
AnimationController _bottomBoundQuoteAnimationController;
AnimationController _rightEpochAnimationController;
Animation _currentTickAnimation;
Animation _currentTickBlinkAnimation;

bool get _shouldAutoPan => rightBoundEpoch > nowEpoch;

bool get _arrowButtonBeVisible =>
!_shouldAutoPan &&
!(_rightEpochAnimationController?.isAnimating ?? false);

double get _topBoundQuote => _topBoundQuoteAnimationController.value;

double get _bottomBoundQuote => _bottomBoundQuoteAnimationController.value;
Expand Down Expand Up @@ -129,19 +134,20 @@ class _ChartState extends State<Chart> with TickerProviderStateMixin {

if (oldGranularity != newGranularity) {
msPerPx = _getDefaultScale(newGranularity);
_scrollToNow();
rightBoundEpoch = nowEpoch + _pxToMs(maxCurrentTickOffset);
} else {
_onNewTick();
}
}

@override
void dispose() {
_currentTickAnimationController.dispose();
_currentTickBlinkingController.dispose();
_loadingAnimationController.dispose();
_topBoundQuoteAnimationController.dispose();
_bottomBoundQuoteAnimationController.dispose();
_rightEpochAnimationController?.dispose();
_currentTickAnimationController?.dispose();
_currentTickBlinkingController?.dispose();
_loadingAnimationController?.dispose();
_topBoundQuoteAnimationController?.dispose();
_bottomBoundQuoteAnimationController?.dispose();
super.dispose();
}

Expand Down Expand Up @@ -170,6 +176,16 @@ class _ChartState extends State<Chart> with TickerProviderStateMixin {
_setupCurrentTickAnimation();
_setupBlinkingAnimation();
_setupBoundsAnimation();
_setupRightEpochAnimation();
}

void _setupRightEpochAnimation() {
_rightEpochAnimationController = AnimationController.unbounded(
vsync: this,
value: rightBoundEpoch.toDouble(),
)..addListener(() {
rightBoundEpoch = _rightEpochAnimationController.value.toInt();
});
}

void _setupCurrentTickAnimation() {
Expand Down Expand Up @@ -333,7 +349,7 @@ class _ChartState extends State<Chart> with TickerProviderStateMixin {
);
}),
),
if (!_shouldAutoPan)
if (_arrowButtonBeVisible)
Positioned(
bottom: 30 + timeLabelsAreaHeight,
right: 30 + quoteLabelsAreaWidth,
Expand Down Expand Up @@ -447,7 +463,20 @@ class _ChartState extends State<Chart> with TickerProviderStateMixin {
}

void _scrollToNow() {
rightBoundEpoch = nowEpoch + _pxToMs(maxCurrentTickOffset);
final animationMsDuration = 600;
final lowerBound = rightBoundEpoch.toDouble();
final upperBound = nowEpoch +
_pxToMs(maxCurrentTickOffset).toDouble() +
animationMsDuration;

if (upperBound > lowerBound) {
_rightEpochAnimationController.value = lowerBound;
_rightEpochAnimationController.animateTo(
upperBound,
curve: Curves.easeOut,
duration: Duration(milliseconds: animationMsDuration),
);
}
}

void _onScaleAndPanEnd(ScaleEndDetails details) {
Expand Down