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
diff --git a/app/src/main/res/layout/layout.xml b/app/src/main/res/layout/layout.xml
index d11617082..bd6a7099e 100644
--- a/app/src/main/res/layout/layout.xml
+++ b/app/src/main/res/layout/layout.xml
@@ -9,7 +9,9 @@
+ android:orientation="vertical"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+ android:text="Fit:" />
+
+
+
+ android:text="Alignment:" />
+
+
-
-
-
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/raw/skills.riv b/app/src/main/res/raw/skills.riv
new file mode 100644
index 000000000..e9dfc359d
Binary files /dev/null and b/app/src/main/res/raw/skills.riv differ
diff --git a/kotlin/build.gradle b/kotlin/build.gradle
index d2d6eb72f..a609fc77a 100644
--- a/kotlin/build.gradle
+++ b/kotlin/build.gradle
@@ -66,7 +66,7 @@ task buildJNI(type: Exec) {
ext {
PUBLISH_GROUP_ID = 'app.rive'
- PUBLISH_VERSION = '0.0.2'
+ PUBLISH_VERSION = '0.0.3'
PUBLISH_ARTIFACT_ID = 'rive-android'
}