dzeio/charts
1
0
Fork 0
mirror of https://github.com/dzeiocom/charts.git synced 2025-07-23 13:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Animation run when the chart get in view (#39)

Browse Source
This commit is contained in:
Florian Bouillon
2023-02-14 17:09:47 +01:00
committed by GitHub
parent dd023f96cc
commit 1a812acb9e
33 changed files with 163 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
library/src/main/java/com/dzeio/charts/ChartView.kt
View File

@ -2,15 +2,18 @@ package com.dzeio.charts
import android.annotation.SuppressLint
import android.content.Context
import android.content.res.Resources
import android.graphics.Canvas
import android.graphics.Color
import android.graphics.Paint
import android.graphics.Rect
import android.graphics.RectF
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.View
import com.dzeio.charts.axis.XAxis
import com.dzeio.charts.axis.YAxis
import com.dzeio.charts.components.Animation
import com.dzeio.charts.components.Annotation
import com.dzeio.charts.components.ChartScroll
import com.dzeio.charts.series.SerieInterface
@ -38,6 +41,39 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
override var padding: Float = 8f
private var runUpdates = true
init {
viewTreeObserver.addOnScrollChangedListener {
val actualPosition = Rect()
val isGlobalVisible = getGlobalVisibleRect(actualPosition)
val screen = Rect(
0,
0,
Resources.getSystem().displayMetrics.widthPixels,
Resources.getSystem().displayMetrics.heightPixels
)
val displayed = isShown && isGlobalVisible && Rect.intersects(actualPosition, screen)
if (!displayed) {
if (!runUpdates) {
return@addOnScrollChangedListener
}
for (serie in series) {
serie.resetAnimation()
refresh()
runUpdates = false
}
} else if (!runUpdates) {
runUpdates = true
refresh()
} else if (annotator.entry != null && annotator.hideOnScroll) {
annotator.entry = null
refresh()
}
}
}
private val scroller = ChartScroll(this).apply {
var lastMovementX = 0.0
var lastMovementY = 0f
@ -111,6 +147,9 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
}
override fun refresh() {
if (!runUpdates) {
return
}
// run Axis logics
xAxis.refresh()
yAxis.refresh()
@ -126,37 +165,46 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
// post(animator)
}
override fun onDraw(canvas: Canvas) {
private var lastRun = runUpdates
override fun onDraw(canvas: Canvas) {
// don't draw anything if everything is empty
if (series.isEmpty() || series.maxOf { it.entries.size } == 0) {
if (!runUpdates && lastRun == runUpdates && series.isEmpty() || series.maxOf { it.entries.size } == 0) {
super.onDraw(canvas)
return
}
if (debug) {
// draw corners
canvas.drawRect(rect.apply {
set(
padding / 2,
padding / 2,
width.toFloat() - padding / 2,
height.toFloat() - padding / 2
)
}, debugStrokePaint)
canvas.drawRect(
rect.apply {
set(
padding / 2,
padding / 2,
width.toFloat() - padding / 2,
height.toFloat() - padding / 2
)
},
debugStrokePaint
)
}
var bottom = xAxis.getHeight() ?: 0f
// right distance from the yAxis
val rightDistance = yAxis.onDraw(canvas, rect.apply {
set(padding, padding, width.toFloat() - padding, height.toFloat() - bottom - padding)
})
val rightDistance = yAxis.onDraw(
canvas,
rect.apply {
set(padding, padding, width.toFloat() - padding, height.toFloat() - bottom - padding)
}
)
bottom = xAxis.onDraw(canvas, rect.apply {
set(padding, 0f, width.toFloat() - rightDistance - padding, height.toFloat() - padding)
})
bottom = xAxis.onDraw(
canvas,
rect.apply {
set(padding, 0f, width.toFloat() - rightDistance - padding, height.toFloat() - padding)
}
)
// chart draw rectangle
seriesRect.apply {
@ -187,7 +235,9 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
annotator.onDraw(canvas, seriesRect)
postDelayed({ this.invalidate() }, animator.getDelay().toLong())
if (needRedraw && runUpdates) {
postDelayed({ this.invalidate() }, animator.getDelay().toLong())
}
super.onDraw(canvas)
}

1
library/src/main/java/com/dzeio/charts/ChartViewInterface.kt
View File

@ -2,6 +2,7 @@ package com.dzeio.charts
import com.dzeio.charts.axis.XAxisInterface
import com.dzeio.charts.axis.YAxisInterface
import com.dzeio.charts.components.Animation
import com.dzeio.charts.components.Annotation
import com.dzeio.charts.series.SerieInterface

2
library/src/main/java/com/dzeio/charts/Animation.kt → library/src/main/java/com/dzeio/charts/components/Animation.kt
View File

@ -1,4 +1,4 @@
package com.dzeio.charts
package com.dzeio.charts.components
import kotlin.math.abs

4
library/src/main/java/com/dzeio/charts/series/BarSerie.kt
View File

@ -175,4 +175,8 @@ class BarSerie(
override fun refresh() {
// TODO("Not yet implemented")
}
override fun resetAnimation() {
entriesCurrentY.clear()
}
}

4
library/src/main/java/com/dzeio/charts/series/LineSerie.kt
View File

@ -177,4 +177,8 @@ class LineSerie(
override fun refresh() {
// TODO("Not yet implemented")
}
override fun resetAnimation() {
entriesCurrentY.clear()
}
}

2
library/src/main/java/com/dzeio/charts/series/SerieInterface.kt
View File

@ -45,4 +45,6 @@ sealed interface SerieInterface {
* this is where the pre-logic is handled to make [onDraw] quicker
*/
fun refresh()
fun resetAnimation()
}