Commit ebfada8

committed

fix easing sample

1 parent 3d29496 commit ebfada8Copy full SHA for ebfada8

File tree

2 files changed

+23

-34

lines changed

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics
- chapter6_graphics
  - Tutorial6_39_1GraphicsLayer1.kt
- chapter9_animation
  - Easing.kt

2 files changed

+23

-34

lines changed

`‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter6_graphics/Tutorial6_39_1GraphicsLayer1.kt`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -313,18 +313,6 @@ fun GraphicsLayerToParticles() {`
`313`	`313`	`println("alive particle size: $aliveParticle, progress: $progress")`
`314`	`314`	`}`
`315`	`315`	`)`
`316`		`-// animatable.snapTo(1f)`
`317`		`-// graphicsLayer.toImageBitmap().let {`
`318`		`-// particleList.clear()`
`319`		`-// particleList.addAll(`
`320`		`-// createParticles(`
`321`		`-// imageBitmap = it.asAndroidBitmap()`
`322`		`-// .copy(Bitmap.Config.ARGB_8888, false)`
`323`		`-// .asImageBitmap(),`
`324`		`-// particleSize = particleSize.toInt()`
`325`		`-// )`
`326`		`-// )`
`327`		`-// }`
`328`	`316`	`}`
`329`	`317`	`}`
`330`	`318`	`.size(widthDp)`
`@@ -456,4 +444,3 @@ fun createParticles(imageBitmap: ImageBitmap, particleSize: Int): List<TestParti`
`456`	`444`
`457`	`445`	`return particleList`
`458`	`446`	`}`
`459`		`-`

`‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter9_animation/Easing.kt`

Lines changed: 23 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,16 +82,11 @@ private fun Easingsample() {`
`82`	`82`
`83`	`83`	`val x = (width * currentTime / 1000f).coerceAtMost(1000f)`
`84`	`84`
`85`		`-// val y = height * (1 - progress)`
`86`		`- val y = height * progress`
	`85`	`+ val y = height * (1 - progress)`
`87`	`86`
`88`	`87`	`(animatable.velocity as? Float)?.let {`
`89`	`88`	`totalVelocity += it`
`90`	`89`	`}`
`91`		`- println(`
`92`		`- "Time: $currentTime, progress: $progress, x: $x, y: $y, " +`
`93`		`- "velocity: ${animatable.velocity}, totalVelocity: $totalVelocity"`
`94`		`- )`
`95`	`90`
`96`	`91`	`if (path.isEmpty.not()) {`
`97`	`92`	`path.lineTo(x, y)`
`@@ -117,7 +112,7 @@ private fun Easingsample() {`
`117`	`112`	`targetValue = 1f,`
`118`	`113`	`animationSpec = tween(`
`119`	`114`	`durationMillis = 1000,`
`120`		`- easing = LinearEasing`
	`115`	`+ easing = LinearOutSlowInEasing`
`121`	`116`	`)`
`122`	`117`	`)`
`123`	`118`
`@@ -131,14 +126,18 @@ private fun Easingsample() {`
`131`	`126`	`}`
`132`	`127`	`}`
`133`	`128`
	`129`	`+data class PathWithAnimatable(val path: Path, val animatable: Animatable<Float, AnimationVector1D>)`
`134`	`130`
`135`	`131`	`@Preview`
`136`	`132`	`@Composable`
`137`	`133`	`private fun EasingTest2() {`
`138`	`134`
`139`		`- val animatableList = remember {`
	`135`	`+ val data = remember {`
`140`	`136`	`List(5) {`
`141`		`- Animatable(0f)`
	`137`	`+ PathWithAnimatable(`
	`138`	`+ Path(),`
	`139`	`+ Animatable(0f)`
	`140`	`+ )`
`142`	`141`	`}`
`143`	`142`	`}`
`144`	`143`
`@@ -151,17 +150,19 @@ private fun EasingTest2() {`
`151`	`150`	`Column {`
`152`	`151`	`Box(modifier = Modifier.fillMaxWidth().aspectRatio(1f)) {`
`153`	`152`
`154`		`- animatableList.forEachIndexed { index, animatable ->`
	`153`	`+ data.forEachIndexed { index, data ->`
`155`	`154`	`val color = when (index) {`
`156`	`155`	`0 -> Color.Red`
`157`		`- 1 -> Color.Yellow`
	`156`	`+ 1 -> Color.Blue`
`158`	`157`	`2 -> Color.Green`
`159`	`158`	`3 -> Color.Magenta`
`160`	`159`	`else -> Color.Black`
`161`	`160`	`}`
`162`	`161`
`163`	`162`	`EasingTestBox(`
`164`		`- animatable = animatable,`
	`163`	`+ modifier = Modifier.padding(16.dp),`
	`164`	`+ animatable = data.animatable,`
	`165`	`+ path = data.path,`
`165`	`166`	`color = color,`
`166`	`167`	`startTime = startTime`
`167`	`168`	`)`
`@@ -173,7 +174,7 @@ private fun EasingTest2() {`
`173`	`174`	`onClick = {`
`174`	`175`
`175`	`176`	`startTime = System.currentTimeMillis()`
`176`		`- animatableList.forEachIndexed { index, animatable ->`
	`177`	`+ data.forEachIndexed { index, data ->`
`177`	`178`
`178`	`179`	`val animationSpec = when (index) {`
`179`	`180`	`0 -> tween(`
`@@ -201,12 +202,16 @@ private fun EasingTest2() {`
`201`	`202`	`else -> spring()`
`202`	`203`	`}`
`203`	`204`	`coroutineScope.launch {`
	`205`	`+`
	`206`	`+ val path = data.path`
	`207`	`+ path.reset()`
	`208`	`+ val animatable = data.animatable`
	`209`	`+`
`204`	`210`	`animatable.snapTo(0f)`
`205`	`211`	`animatable.animateTo(`
`206`		`- targetValue = 0f,`
	`212`	`+ targetValue = 1f,`
`207`	`213`	`animationSpec = animationSpec`
`208`	`214`	`)`
`209`		`-`
`210`	`215`	`}`
`211`	`216`	`}`
`212`	`217`	`}`
`@@ -220,17 +225,14 @@ private fun EasingTest2() {`
`220`	`225`
`221`	`226`	`@Composable`
`222`	`227`	`private fun EasingTestBox(`
	`228`	`+ modifier: Modifier = Modifier,`
	`229`	`+ path: Path,`
`223`	`230`	`animatable: Animatable<Float, AnimationVector1D>,`
`224`	`231`	`startTime: Long,`
`225`	`232`	`color: Color,`
`226`	`233`	`) {`
`227`		`-`
`228`		`- val path = remember {`
`229`		`- Path()`
`230`		`- }`
`231`		`-`
`232`	`234`	`Canvas(`
`233`		`- modifier = Modifier.fillMaxWidth().aspectRatio(1f).border(1.dp, Color.Blue)`
	`235`	`+ modifier = modifier.fillMaxWidth().aspectRatio(1f).border(1.dp, Color.Blue)`
`234`	`236`	`) {`
`235`	`237`	`val progress = animatable.value`
`236`	`238`	`val width = size.width`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ebfada8

File tree

2 files changed

2 files changed

`‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter6_graphics/Tutorial6_39_1GraphicsLayer1.kt`

`‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter9_animation/Easing.kt`

0 commit comments