From aa3d1020b840274a821c573f1de6c1e1940b19a1 Mon Sep 17 00:00:00 2001 From: Maxwell Talbot Date: Wed, 28 Apr 2021 16:05:35 +0100 Subject: [PATCH] adds state machine example and ran a linter --- app/src/main/AndroidManifest.xml | 1 + .../runtime/example/AndroidPlayerActivity.kt | 23 ++++---- .../rive/runtime/example/LowLevelActivity.kt | 2 +- .../app/rive/runtime/example/MainActivity.kt | 6 ++ .../example/SimpleStateMachineActivity.kt | 45 +++++++++++++++ app/src/main/res/layout/example_selection.xml | 7 +++ app/src/main/res/layout/layout.xml | 15 +++-- app/src/main/res/layout/loop_mode.xml | 23 ++++---- .../main/res/layout/simple_state_machine.xml | 54 ++++++++++++++++++ app/src/main/res/raw/skills.riv | Bin 0 -> 79043 bytes kotlin/build.gradle | 2 +- 11 files changed, 145 insertions(+), 33 deletions(-) create mode 100644 app/src/main/java/app/rive/runtime/example/SimpleStateMachineActivity.kt create mode 100644 app/src/main/res/layout/simple_state_machine.xml create mode 100644 app/src/main/res/raw/skills.riv diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8c23d6bf8..206923a66 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,6 +26,7 @@ + diff --git a/app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt b/app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt index 735c2f8ad..de707e7ec 100644 --- a/app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt +++ b/app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt @@ -8,10 +8,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatButton import app.rive.runtime.kotlin.RiveAnimationView import app.rive.runtime.kotlin.RiveDrawable.Listener -import app.rive.runtime.kotlin.core.Direction -import app.rive.runtime.kotlin.core.LinearAnimationInstance -import app.rive.runtime.kotlin.core.Loop -import app.rive.runtime.kotlin.core.Rive +import app.rive.runtime.kotlin.core.* class AndroidPlayerActivity : AppCompatActivity() { var loop: Loop = Loop.NONE @@ -160,7 +157,7 @@ class AndroidPlayerActivity : AppCompatActivity() { fun setResourceSpinner() { - animationResources.let { resourceId -> + animationResources.let { _ -> var dropdown = findViewById(R.id.resources) var adapter = ArrayAdapter( this, @@ -193,27 +190,27 @@ class AndroidPlayerActivity : AppCompatActivity() { val that = this val events = findViewById(R.id.events) val listener = object : Listener { - override fun notifyPlay(animation: LinearAnimationInstance) { + override fun notifyPlay(animation: PlayableInstance) { val text = TextView(that) - text.setText("Play ${animation.animation.name}") + text.setText("Play ${(animation as LinearAnimationInstance).animation.name}") events.addView(text, 0) } - override fun notifyPause(animation: LinearAnimationInstance) { + override fun notifyPause(animation: PlayableInstance) { val text = TextView(that) - text.setText("Pause ${animation.animation.name}") + text.setText("Pause ${(animation as LinearAnimationInstance).animation.name}") events.addView(text, 0) } - override fun notifyStop(animation: LinearAnimationInstance) { + override fun notifyStop(animation: PlayableInstance) { val text = TextView(that) - text.setText("Stop ${animation.animation.name}") + text.setText("Stop ${(animation as LinearAnimationInstance).animation.name}") events.addView(text, 0) } - override fun notifyLoop(animation: LinearAnimationInstance) { + override fun notifyLoop(animation: PlayableInstance) { val text = TextView(that) - text.setText("Loop ${animation.animation.name}") + text.setText("Loop ${(animation as LinearAnimationInstance).animation.name}") events.addView(text, 0) } } diff --git a/app/src/main/java/app/rive/runtime/example/LowLevelActivity.kt b/app/src/main/java/app/rive/runtime/example/LowLevelActivity.kt index f7deaf282..6a95bf115 100644 --- a/app/src/main/java/app/rive/runtime/example/LowLevelActivity.kt +++ b/app/src/main/java/app/rive/runtime/example/LowLevelActivity.kt @@ -49,7 +49,7 @@ class LowLevelRiveView: View { private val artboard: Artboard private val instance: LinearAnimationInstance private var lastTime: Long = 0 - private lateinit var bounds: AABB + private var bounds: AABB constructor(renderer: Renderer, artboard: Artboard, context: Context) : super(context) { this.renderer = renderer diff --git a/app/src/main/java/app/rive/runtime/example/MainActivity.kt b/app/src/main/java/app/rive/runtime/example/MainActivity.kt index 318e64152..b65f5e4a3 100644 --- a/app/src/main/java/app/rive/runtime/example/MainActivity.kt +++ b/app/src/main/java/app/rive/runtime/example/MainActivity.kt @@ -60,5 +60,11 @@ class MainActivity : AppCompatActivity() { Intent(this, HttpActivity::class.java) ) } + + findViewById