From 49ce971e5bac24dd65c20df5cede1099e670ad32 Mon Sep 17 00:00:00 2001 From: "David (DTA) Oleander" Date: Wed, 15 Jul 2026 13:59:32 -0400 Subject: [PATCH 01/14] Update kotlin --- app/build.gradle | 9 +- compatibilitytest/build.gradle | 49 ----- .../src/main/AndroidManifest.xml | 27 --- .../compatibilitytest/BitMapExtractor.kt | 68 ------- .../runtime/compatibilitytest/Extensions.kt | 33 ---- .../runtime/compatibilitytest/MainActivity.kt | 115 ------------ .../drawable-v24/ic_launcher_foreground.xml | 30 ---- .../res/drawable/ic_launcher_background.xml | 170 ------------------ .../src/main/res/layout/main.xml | 41 ----- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 - .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes compatibilitytest/src/main/res/raw/dwarf.riv | 3 - .../src/main/res/raw/fallback_fonts.riv | 3 - compatibilitytest/src/main/res/raw/images.riv | 3 - compatibilitytest/src/main/res/raw/rope.riv | 3 - compatibilitytest/src/main/res/raw/text.riv | 3 - compatibilitytest/src/main/res/raw/vector.riv | 3 - .../src/main/res/values-night/themes.xml | 16 -- .../src/main/res/values/colors.xml | 10 -- .../src/main/res/values/strings.xml | 3 - .../src/main/res/values/themes.xml | 16 -- gradle/libs.versions.toml | 21 +-- kotlin/build.gradle | 18 +- settings.gradle | 1 - 34 files changed, 19 insertions(+), 636 deletions(-) delete mode 100644 compatibilitytest/build.gradle delete mode 100644 compatibilitytest/src/main/AndroidManifest.xml delete mode 100644 compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/BitMapExtractor.kt delete mode 100644 compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/Extensions.kt delete mode 100644 compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/MainActivity.kt delete mode 100644 compatibilitytest/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 compatibilitytest/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 compatibilitytest/src/main/res/layout/main.xml delete mode 100644 compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 compatibilitytest/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 compatibilitytest/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp delete mode 100644 compatibilitytest/src/main/res/raw/dwarf.riv delete mode 100644 compatibilitytest/src/main/res/raw/fallback_fonts.riv delete mode 100644 compatibilitytest/src/main/res/raw/images.riv delete mode 100644 compatibilitytest/src/main/res/raw/rope.riv delete mode 100644 compatibilitytest/src/main/res/raw/text.riv delete mode 100644 compatibilitytest/src/main/res/raw/vector.riv delete mode 100644 compatibilitytest/src/main/res/values-night/themes.xml delete mode 100644 compatibilitytest/src/main/res/values/colors.xml delete mode 100644 compatibilitytest/src/main/res/values/strings.xml delete mode 100644 compatibilitytest/src/main/res/values/themes.xml diff --git a/app/build.gradle b/app/build.gradle index 8f666ab21..c0ba745cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) } android { @@ -10,7 +11,7 @@ android { defaultConfig { applicationId "app.rive.runtime.example" - minSdkVersion 21 + minSdkVersion 23 targetSdk = 36 versionCode 1 versionName "1.0" @@ -61,11 +62,6 @@ android { viewBinding = true compose = true } - composeOptions { - // Chosen to match Kotlin version - // https://developer.android.com/jetpack/androidx/releases/compose-kotlin - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } packagingOptions { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" @@ -86,6 +82,7 @@ dependencies { implementation(libs.android.volley) implementation(libs.androidx.activity.compose) implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.material.icons.core) implementation(libs.androidx.compose.ui.tooling.preview.android) implementation(libs.androidx.fragment.ktx) implementation(libs.androidx.lifecycle.runtime.compose) diff --git a/compatibilitytest/build.gradle b/compatibilitytest/build.gradle deleted file mode 100644 index 777636614..000000000 --- a/compatibilitytest/build.gradle +++ /dev/null @@ -1,49 +0,0 @@ -plugins { - alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) -} - -android { - namespace = "app.rive.runtime.compatibilitytest" - compileSdk = 36 - ndkVersion = "27.2.12479018" - - defaultConfig { - applicationId "app.rive.runtime.compatibilitytest" - minSdk = 21 - targetSdk = 36 - versionCode = 1 - versionName = "1.1" - } - - buildTypes { - debug { - debuggable = true - minifyEnabled = false - shrinkResources = false - } - release { - debuggable = true - minifyEnabled = false - shrinkResources = false - signingConfig = signingConfigs.debug - } - } - - def javaVersion = JavaVersion.VERSION_11 - compileOptions { - sourceCompatibility javaVersion - targetCompatibility javaVersion - } - kotlinOptions { - jvmTarget = javaVersion.toString() - } -} - -dependencies { - implementation(libs.androidx.appcompat) - implementation(libs.androidx.constraintlayout) - implementation(libs.androidx.core.ktx) - implementation(libs.google.material) - implementation project(path: ":kotlin") -} diff --git a/compatibilitytest/src/main/AndroidManifest.xml b/compatibilitytest/src/main/AndroidManifest.xml deleted file mode 100644 index a0dfafd25..000000000 --- a/compatibilitytest/src/main/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/BitMapExtractor.kt b/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/BitMapExtractor.kt deleted file mode 100644 index 10b3d57a2..000000000 --- a/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/BitMapExtractor.kt +++ /dev/null @@ -1,68 +0,0 @@ -package app.rive.runtime.compatibilitytest - -import android.content.ContentValues -import android.graphics.Bitmap -import android.os.Build -import android.os.Environment -import android.os.Handler -import android.os.Looper -import android.provider.MediaStore -import android.util.Log -import androidx.appcompat.app.AppCompatActivity -import app.rive.runtime.kotlin.RiveAnimationView -import java.io.File -import java.io.FileOutputStream -import java.io.OutputStream - -// TODO: -// I'd like to trigger this after we finished rendering, is it possible to do that? in the meantime we are simply time based. -class BitMapExtractor { - - fun extractView( - activity: AppCompatActivity, - view: RiveAnimationView, - name: String, - delayMillis: Long = 2000 - ) { - - Handler(Looper.getMainLooper()).postDelayed({ - - val bitmap: Bitmap? = view.bitmap - - val fos: OutputStream? - - // (Permission denied) has come in, might need to do some more content - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - val resolver = activity.contentResolver - val contentValues = ContentValues() - contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, "$name.png") - contentValues.put(MediaStore.MediaColumns.MIME_TYPE, "image/png") - contentValues.put( - MediaStore.MediaColumns.RELATIVE_PATH, - Environment.DIRECTORY_PICTURES - ) - val imageUri = - resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues) - fos = resolver.openOutputStream(imageUri!!) - } else { - val imagesDir = - Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) - if (!imagesDir.exists()) { - imagesDir.mkdirs() - } - val image = File(imagesDir, "$name.png") - fos = FileOutputStream(image) - } - - bitmap?.compress( - Bitmap.CompressFormat.PNG, - 100, - fos!! - ) - fos!!.close() - Log.d("BitmapExtractor", "Written image to $name") - }, delayMillis) - } -} - -val extractor = BitMapExtractor() \ No newline at end of file diff --git a/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/Extensions.kt b/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/Extensions.kt deleted file mode 100644 index bfd14b5e6..000000000 --- a/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/Extensions.kt +++ /dev/null @@ -1,33 +0,0 @@ -package app.rive.runtime.compatibilitytest - -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.controllers.RiveFileController -import app.rive.runtime.kotlin.core.RendererType -import app.rive.runtime.kotlin.renderers.Renderer -import app.rive.runtime.kotlin.renderers.RiveArtboardRenderer - -class OnDrawRenderer( - private val onDraw: (() -> Unit)?, - controller: RiveFileController, - rendererType: RendererType -) : - RiveArtboardRenderer(trace = false, controller = controller, rendererType = rendererType) { - override fun draw() { - super.draw() - onDraw?.invoke() // Frame drawn - } -} - -class CallbackRiveAnimationView( - builder: Builder -) : RiveAnimationView(builder) { - var drawCallback: (() -> Unit)? = null - - override fun createRenderer(): Renderer { - return OnDrawRenderer( - onDraw = drawCallback, - controller = controller, - rendererType = rendererAttributes.rendererType, - ) - } -} diff --git a/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/MainActivity.kt b/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/MainActivity.kt deleted file mode 100644 index 017797982..000000000 --- a/compatibilitytest/src/main/kotlin/app/rive/runtime/compatibilitytest/MainActivity.kt +++ /dev/null @@ -1,115 +0,0 @@ -package app.rive.runtime.compatibilitytest - -import android.content.pm.PackageManager -import android.os.Bundle -import android.util.Log -import android.view.ViewGroup -import android.widget.Button -import android.widget.LinearLayout -import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity -import androidx.core.app.ActivityCompat -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.core.Fit -import app.rive.runtime.kotlin.core.RendererType -import app.rive.runtime.kotlin.core.Rive - -typealias RiveSetupFunction = (riveView: RiveAnimationView) -> Unit - -data class AnimationTest( - val name: String, - val resource: Int, - val width: Int, - val height: Int, - // Optional function to perform actions on the view before draw. - val setup: RiveSetupFunction? = null, -) - -data class RendererSetup(val name: String, val type: RendererType) - -val tests = listOf( - AnimationTest("mesh", R.raw.dwarf, 860, 540), - AnimationTest("text", R.raw.text, 860, 540), - AnimationTest("vector", R.raw.vector, 860, 540), - AnimationTest("fallback fonts", R.raw.fallback_fonts, 860, 540) { - it.setTextRunValue("Name", "txt") - }, -) -val rendererSetups = listOf( - RendererSetup("canvas", RendererType.Canvas), - RendererSetup("rive", RendererType.Rive) -) - -// Storage Permissions -private const val REQUEST_EXTERNAL_STORAGE = 1 -private val PERMISSIONS_STORAGE = arrayOf( - android.Manifest.permission.READ_EXTERNAL_STORAGE, - android.Manifest.permission.WRITE_EXTERNAL_STORAGE -) - -class MainActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - Rive.init(applicationContext) - setContentView(R.layout.main) - - val buttonLayout = findViewById(R.id.buttonContainer) - rendererSetups.forEach { setup -> - val label = TextView(this) - label.text = "Check - ${setup.name}" - buttonLayout.addView(label) - - tests.forEach { test -> - addButton(buttonLayout, setup, test) - } - } - - val permission = - ActivityCompat.checkSelfPermission( - this, - android.Manifest.permission.WRITE_EXTERNAL_STORAGE - ) - - if (permission != PackageManager.PERMISSION_GRANTED) { - // We don't have permission so prompt the user - ActivityCompat.requestPermissions( - this, - PERMISSIONS_STORAGE, - REQUEST_EXTERNAL_STORAGE - ) - } - } - - private fun addButton(buttonLayout: LinearLayout, setup: RendererSetup, test: AnimationTest) { - val that = this - val button = Button(this) - button.text = "${setup.name} - ${test.name}" - button.setOnClickListener { - that.setView(setup, test) - } - buttonLayout.addView(button) - } - - private fun setView(setup: RendererSetup, test: AnimationTest) { - - val builder = RiveAnimationView.Builder(context = applicationContext).apply { - this.setFit(Fit.CONTAIN) - this.setRendererType(setup.type) - this.setAutoplay(false) - this.setResource(test.resource) - } - - val view = CallbackRiveAnimationView(builder) - view.drawCallback = { - Log.d("BitmapExtractor", "Draw callback called for ${test.name}") - extractor.extractView(this, view, "${setup.name}_${test.name}") - } - view.layoutParams = ViewGroup.LayoutParams(test.width, test.height) - val displayLayout = findViewById(R.id.viewContainer) - displayLayout.removeAllViews() - displayLayout.addView(view) - // Setup the text after it's been added and init'd - test.setup?.invoke(view) - } -} diff --git a/compatibilitytest/src/main/res/drawable-v24/ic_launcher_foreground.xml b/compatibilitytest/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d114..000000000 --- a/compatibilitytest/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/compatibilitytest/src/main/res/drawable/ic_launcher_background.xml b/compatibilitytest/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cb..000000000 --- a/compatibilitytest/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/compatibilitytest/src/main/res/layout/main.xml b/compatibilitytest/src/main/res/layout/main.xml deleted file mode 100644 index 7e042e364..000000000 --- a/compatibilitytest/src/main/res/layout/main.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - diff --git a/compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/compatibilitytest/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/compatibilitytest/src/main/res/mipmap-hdpi/ic_launcher.webp b/compatibilitytest/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/compatibilitytest/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/compatibilitytest/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/compatibilitytest/src/main/res/mipmap-mdpi/ic_launcher.webp b/compatibilitytest/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/compatibilitytest/src/main/res/mipmap-xhdpi/ic_launcher.webp b/compatibilitytest/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/compatibilitytest/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/compatibilitytest/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/compatibilitytest/src/main/res/raw/dwarf.riv b/compatibilitytest/src/main/res/raw/dwarf.riv deleted file mode 100644 index c582d2cf0..000000000 --- a/compatibilitytest/src/main/res/raw/dwarf.riv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2db5010a59c5923f3055b4fab19866741a9cb6bd6dc7a6ab05acd591bcae5cf8 -size 1168114 diff --git a/compatibilitytest/src/main/res/raw/fallback_fonts.riv b/compatibilitytest/src/main/res/raw/fallback_fonts.riv deleted file mode 100644 index 5960437d7..000000000 --- a/compatibilitytest/src/main/res/raw/fallback_fonts.riv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bb7ff37986f6b3f4643d1bbc9e1d4f84c484525c4f204b2d611386bef32b624 -size 2773 diff --git a/compatibilitytest/src/main/res/raw/images.riv b/compatibilitytest/src/main/res/raw/images.riv deleted file mode 100644 index 59dc99c3e..000000000 --- a/compatibilitytest/src/main/res/raw/images.riv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb6b0107b29c4437dc1af8c5cb0a2b9c76bca0f1bad47ab7216fc27c255297f2 -size 880774 diff --git a/compatibilitytest/src/main/res/raw/rope.riv b/compatibilitytest/src/main/res/raw/rope.riv deleted file mode 100644 index c20ff0725..000000000 --- a/compatibilitytest/src/main/res/raw/rope.riv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:444c35b287350cfb698af977335931fd4621d74a11b27c9c3505c7207cd69aeb -size 113151 diff --git a/compatibilitytest/src/main/res/raw/text.riv b/compatibilitytest/src/main/res/raw/text.riv deleted file mode 100644 index 8a90db565..000000000 --- a/compatibilitytest/src/main/res/raw/text.riv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9390a1448be9dd6b0eff0fd79093ad6270d9c2ebbb69e6b97e9b2fc4ccaad01f -size 259725 diff --git a/compatibilitytest/src/main/res/raw/vector.riv b/compatibilitytest/src/main/res/raw/vector.riv deleted file mode 100644 index 3a03fdfc0..000000000 --- a/compatibilitytest/src/main/res/raw/vector.riv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5b0fbbdc92d9d92c1004092b1254be461bd63e91980f6bd9d0403f1ff4b5c00 -size 12990 diff --git a/compatibilitytest/src/main/res/values-night/themes.xml b/compatibilitytest/src/main/res/values-night/themes.xml deleted file mode 100644 index e0d288565..000000000 --- a/compatibilitytest/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/compatibilitytest/src/main/res/values/colors.xml b/compatibilitytest/src/main/res/values/colors.xml deleted file mode 100644 index ca1931bca..000000000 --- a/compatibilitytest/src/main/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - diff --git a/compatibilitytest/src/main/res/values/strings.xml b/compatibilitytest/src/main/res/values/strings.xml deleted file mode 100644 index dee386992..000000000 --- a/compatibilitytest/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - CompatibilityTest - diff --git a/compatibilitytest/src/main/res/values/themes.xml b/compatibilitytest/src/main/res/values/themes.xml deleted file mode 100644 index cc20bf2ad..000000000 --- a/compatibilitytest/src/main/res/values/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a11f2249..26e1bb98d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,39 +1,25 @@ [versions] androidGradlePlugin = "8.13.2" androidxBenchmarkMacro = "1.2.4" -# Normally this is included by androidx.compose.ui:ui-test-android in the Compose BOM. -# However, by running on the older 2023 BOM, we are now out of date with SDK 36 changes. -# Include this manually until we bump the BOM, which in turn will be when we move to Kotlin 2. androidxTestEspresso = "3.7.0" androidxTestExtJunitKtx = "1.3.0" androidxTestRunner = "1.7.0" androidxTestUiAutomator = "2.3.0" appcompat = "1.7.1" -# noinspection GradleDependency The last Compose BOM version that supports Kotlin 1.9.x -composeBom = "2023.10.00" -# See the table here for matching Kotlin version with Compose Compiler version -# https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility -composeCompiler = "1.5.15" +composeBom = "2026.06.01" constraintlayout = "2.2.1" coreKtx = "1.17.0" dokka = "2.1.0" dropshots = "0.5.1" fragmentKtx = "1.8.9" gradleGitVersion = "4.2.0" -# noinspection NewerVersionAvailable Last version that supports Kotlin 1.9.x kotest = "5.9.1" -# Sticking with Kotlin 1.9.x for now for maximum compatibility. -# Not all projects use 2.x+ yet, and forcing an upgrade can increase client DEX sizes. -# noinspection NewerVersionAvailable -kotlin = "1.9.25" -# noinspection NewerVersionAvailable Last version that supports Kotlin 1.9.x +kotlin = "2.3.21" kotlinxCoroutinesTest = "1.8.1" leakCanary = "2.14" lifecycle = "2.9.4" material = "1.13.0" -# noinspection NewerVersionAvailable Last version that supports Kotlin 1.9.x mockk = "1.14.2" -# noinspection NewerVersionAvailable Last version that supports Kotlin 1.9.x rebugger = "1.0.0-rc03" relinker = "1.4.5" startup = "1.2.0" @@ -48,6 +34,8 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" } androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } +# material-icons is no longer part of the Compose BOM; 1.7.8 is its final standalone release +androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core", version = "1.7.8" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-android = { module = "androidx.compose.ui:ui-android" } @@ -86,5 +74,6 @@ android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" } dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } git-version = { id = "com.palantir.git-version", version.ref = "gradleGitVersion" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktechPublish" } dropshots = { id = "com.dropbox.dropshots", version.ref = "dropshots" } diff --git a/kotlin/build.gradle b/kotlin/build.gradle index 37698ea66..ab130d46f 100644 --- a/kotlin/build.gradle +++ b/kotlin/build.gradle @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) alias(libs.plugins.allopen) alias(libs.plugins.dokka) alias(libs.plugins.dropshots) @@ -17,10 +18,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } - testOptions { unitTests.all { it.useJUnitPlatform() @@ -35,7 +32,7 @@ android { def asanEnabled = project.hasProperty("asan") defaultConfig { - minSdkVersion 21 + minSdkVersion 23 targetSdk = 36 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -161,9 +158,16 @@ tasks.named('clean', Delete) { ) } -def details = versionDetails() def PUBLISH_GROUP_ID = "app.rive" -def PUBLISH_VERSION = details.lastTag +// versionDetails() requires a .git directory, which is absent in some development +// setups (e.g. Jujutsu workspaces). Publishing is impossible there anyway, so fall +// back to a placeholder version rather than failing configuration. +def PUBLISH_VERSION +try { + PUBLISH_VERSION = versionDetails().lastTag +} catch (Exception ignored) { + PUBLISH_VERSION = "0.0.0-SNAPSHOT" +} def PUBLISH_ARTIFACT_ID = "rive-android" mavenPublishing { diff --git a/settings.gradle b/settings.gradle index 4324a9135..6b890a0e0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,5 +20,4 @@ dependencyResolutionManagement { rootProject.name = "rive-android" include ':kotlin' include ':app' -include ':compatibilitytest' include ':benchmark' From c6d12a03116a34535efecf92b87a81041c7828e9 Mon Sep 17 00:00:00 2001 From: "David (DTA) Oleander" Date: Wed, 15 Jul 2026 14:22:21 -0400 Subject: [PATCH 02/14] Remove View-based API --- app/build.gradle | 20 +- .../example/RiveActivityLifecycleTest.kt | 215 -- .../rive/runtime/example/RiveBuilderTest.kt | 392 ---- .../app/rive/runtime/example/TestUtils.kt | 99 - app/src/main/AndroidManifest.xml | 125 +- .../runtime/example/AndroidPlayerActivity.kt | 430 ---- .../runtime/example/AssetLoaderActivity.kt | 93 - .../runtime/example/AssetLoaderFragment.kt | 240 -- .../rive/runtime/example/AssetsActivity.kt | 13 - .../runtime/example/AudioAssetActivity.kt | 69 - .../example/BindArtboardWithDataActivity.kt | 43 - .../app/rive/runtime/example/BlendActivity.kt | 12 - .../rive/runtime/example/ButtonActivity.kt | 20 - .../runtime/example/DynamicTextActivity.kt | 55 - .../rive/runtime/example/EventsActivity.kt | 121 - .../app/rive/runtime/example/FontFallback.kt | 76 - .../app/rive/runtime/example/FrameActivity.kt | 69 - .../app/rive/runtime/example/HttpActivity.kt | 66 - .../runtime/example/ImageBindingActivity.kt | 468 ---- .../example/InteractiveSamplesActivity.kt | 51 - .../rive/runtime/example/LayoutActivity.kt | 116 - .../runtime/example/LegacyComposeActivity.kt | 53 - .../example/LegacyDataBindingActivity.kt | 109 - .../example/LegacyScriptingActivity.kt | 23 - .../rive/runtime/example/LoopModeActivity.kt | 90 - .../rive/runtime/example/LowLevelActivity.kt | 100 - .../app/rive/runtime/example/MainActivity.kt | 37 +- .../rive/runtime/example/MeshesActivity.kt | 12 - .../rive/runtime/example/MetricsActivity.kt | 53 - .../runtime/example/MultiTouchActivity.kt | 228 -- .../example/MultipleArtboardsActivity.kt | 12 - .../runtime/example/NestedInputActivity.kt | 49 - .../runtime/example/NestedTextRunActivity.kt | 83 - .../rive/runtime/example/RecyclerActivity.kt | 150 -- .../runtime/example/RiveFontLoadActivity.kt | 33 - .../app/rive/runtime/example/RiveFragment.kt | 62 - .../runtime/example/RiveFragmentActivity.kt | 34 - .../rive/runtime/example/RiveViewActivity.kt | 45 - .../rive/runtime/example/SimpleActivity.kt | 17 - .../example/SimpleStateMachineActivity.kt | 38 - .../runtime/example/StressTestActivity.kt | 165 -- .../app/rive/runtime/example/TestActivity.kt | 31 - .../example/TouchPassthroughActivity.kt | 94 - .../rive/runtime/example/ViewPagerActivity.kt | 118 - .../rive/runtime/example/ViewStubActivity.kt | 54 - .../example/compose/RewardsBottomPanel.kt | 4 +- .../rive/runtime/example/utils/RiveButton.kt | 46 - .../main/res/layout/activity_asset_loader.xml | 24 - .../main/res/layout/activity_audio_asset.xml | 21 - .../layout/activity_audio_external_asset.xml | 9 - .../res/layout/activity_font_fallback.xml | 26 - app/src/main/res/layout/activity_frame.xml | 16 - app/src/main/res/layout/activity_http.xml | 13 - .../res/layout/activity_image_binding.xml | 37 - .../main/res/layout/activity_low_level.xml | 7 - app/src/main/res/layout/activity_meshes.xml | 20 - app/src/main/res/layout/activity_metrics.xml | 32 - app/src/main/res/layout/activity_recycler.xml | 11 - .../res/layout/activity_recycler_item.xml | 17 - .../res/layout/activity_rive_fragment.xml | 29 - .../main/res/layout/activity_stress_test.xml | 30 - .../main/res/layout/activity_view_stub.xml | 42 - app/src/main/res/layout/android_player.xml | 163 -- app/src/main/res/layout/assets.xml | 15 - app/src/main/res/layout/blend.xml | 19 - app/src/main/res/layout/button.xml | 46 - app/src/main/res/layout/dynamic_text.xml | 28 - app/src/main/res/layout/events.xml | 112 - .../main/res/layout/fragment_asset_button.xml | 10 - .../main/res/layout/fragment_asset_loader.xml | 19 - app/src/main/res/layout/fragment_rive.xml | 12 - app/src/main/res/layout/fragment_text.xml | 13 - .../main/res/layout/interactive_samples.xml | 61 - app/src/main/res/layout/layout.xml | 216 -- app/src/main/res/layout/loop_mode.xml | 181 -- app/src/main/res/layout/main.xml | 291 +-- .../main/res/layout/multiple_artboards.xml | 74 - app/src/main/res/layout/nested_input.xml | 59 - app/src/main/res/layout/nested_text_run.xml | 80 - app/src/main/res/layout/opengl.xml | 13 - .../main/res/layout/rive_font_load_simple.xml | 22 - app/src/main/res/layout/rive_viewstub.xml | 11 - app/src/main/res/layout/simple.xml | 38 - .../main/res/layout/simple_state_machine.xml | 53 - app/src/main/res/layout/single.xml | 20 - app/src/main/res/layout/view_pager.xml | 12 - .../res/layout/view_pager_rive_wrapper.xml | 11 - app/src/main/res/values/attrs.xml | 14 - gradle/libs.versions.toml | 7 - kotlin/build.gradle | 6 +- .../app/rive/CommandQueueComposeTest.kt | 2 +- .../app/rive/HardwareRenderBufferTest.kt | 2 +- .../kotlin/app/rive/RiveAndroidTest.kt | 6 +- .../kotlin/app/rive/RiveCanvasSessionTest.kt | 2 +- .../app/rive/SoftwareRenderBufferTest.kt | 2 +- .../kotlin/app/rive/ViewModelInstanceTest.kt | 2 +- .../app/rive/core/RiveSurfaceLifecycleTest.kt | 2 +- .../core/RiveAnimationConfigurationsTest.kt | 78 - .../kotlin/core/RiveAnimationLoadTest.kt | 75 - .../kotlin/core/RiveArtboardLoadTest.kt | 165 -- .../kotlin/core/RiveArtboardRendererTest.kt | 400 ---- .../kotlin/core/RiveArtboardVolumeTest.kt | 37 - .../runtime/kotlin/core/RiveAssetsTest.kt | 432 ---- .../runtime/kotlin/core/RiveControllerTest.kt | 289 --- .../kotlin/core/RiveDataBindingTest.kt | 1633 ------------- .../rive/runtime/kotlin/core/RiveEventTest.kt | 87 - .../runtime/kotlin/core/RiveFileLoadTest.kt | 107 - .../runtime/kotlin/core/RiveLifecycleTest.kt | 96 - .../RiveLinearAnimationInstanceAdvanceTest.kt | 151 -- .../runtime/kotlin/core/RiveListenerTest.kt | 415 ---- .../runtime/kotlin/core/RiveMemoryTests.kt | 547 ----- .../runtime/kotlin/core/RiveMultitouchTest.kt | 895 ------- .../kotlin/core/RiveNestedInputsTest.kt | 97 - .../RiveStateMachineConfigurationsTest.kt | 116 - .../core/RiveStateMachineInstanceTest.kt | 128 - .../kotlin/core/RiveStateMachineLoadTest.kt | 87 - .../RiveStateMachineStateResolutionTest.kt | 252 -- .../core/RiveStateMachineTouchEventTest.kt | 316 --- .../kotlin/core/RiveTextValueRunTest.kt | 230 -- .../RiveTextureViewSurfaceTeardownTest.kt | 86 - .../rive/runtime/kotlin/core/RiveUtilTest.kt | 63 - .../kotlin/core/RiveViewLifecycleTest.kt | 277 --- .../kotlin/core/RiveViewStateMachineTest.kt | 159 -- .../rive/runtime/kotlin/core/RiveViewTest.kt | 760 ------ .../app/rive/runtime/kotlin/core/TestUtils.kt | 266 --- .../runtime/kotlin/fonts/FontHelpersTest.kt | 2090 ----------------- .../runtime/kotlin/fonts/FontPickerTest.kt | 282 --- .../rive/snapshot/SnapshotBitmapActivity.kt | 6 +- .../rive/snapshot/SnapshotComposeActivity.kt | 6 +- kotlin/src/main/AndroidManifest.xml | 2 +- .../app/rive/runtime/kotlin/Observable.kt | 6 - .../rive/runtime/kotlin/RiveAnimationView.kt | 1298 ---------- .../rive/runtime/kotlin/RiveTextureView.kt | 139 -- .../kotlin/controllers/RiveFileController.kt | 1168 --------- .../rive/runtime/kotlin/core/AdvanceResult.kt | 17 - .../app/rive/runtime/kotlin/core/Alignment.kt | 18 - .../runtime/kotlin/core/AnimationState.kt | 18 - .../app/rive/runtime/kotlin/core/AnyState.kt | 13 - .../app/rive/runtime/kotlin/core/Artboard.kt | 424 ---- .../runtime/kotlin/core/BindableArtboard.kt | 39 - .../rive/runtime/kotlin/core/BlendState.kt | 13 - .../app/rive/runtime/kotlin/core/Direction.kt | 12 - .../rive/runtime/kotlin/core/EntryState.kt | 13 - .../app/rive/runtime/kotlin/core/EventType.kt | 12 - .../app/rive/runtime/kotlin/core/ExitState.kt | 13 - .../java/app/rive/runtime/kotlin/core/File.kt | 271 --- .../app/rive/runtime/kotlin/core/FileAsset.kt | 366 --- .../runtime/kotlin/core/FileAssetLoader.kt | 201 -- .../java/app/rive/runtime/kotlin/core/Fit.kt | 21 - .../app/rive/runtime/kotlin/core/Helpers.kt | 33 - .../rive/runtime/kotlin/core/LayerState.kt | 50 - .../kotlin/core/LinearAnimationInstance.kt | 184 -- .../java/app/rive/runtime/kotlin/core/Loop.kt | 21 - .../rive/runtime/kotlin/core/NativeObject.kt | 157 -- .../runtime/kotlin/core/PlayableInstance.kt | 5 - .../app/rive/runtime/kotlin/core/RefCount.kt | 16 - .../rive/runtime/kotlin/core/RendererType.kt | 18 - .../java/app/rive/runtime/kotlin/core/Rive.kt | 228 -- .../app/rive/runtime/kotlin/core/RiveEvent.kt | 54 - .../runtime/kotlin/core/RiveGeneralEvent.kt | 13 - .../runtime/kotlin/core/RiveOpenURLEvent.kt | 24 - .../runtime/kotlin/core/RiveTextValueRun.kt | 33 - .../rive/runtime/kotlin/core/SMIBoolean.kt | 18 - .../app/rive/runtime/kotlin/core/SMIInput.kt | 41 - .../app/rive/runtime/kotlin/core/SMINumber.kt | 18 - .../rive/runtime/kotlin/core/SMITrigger.kt | 16 - .../kotlin/core/StateMachineInstance.kt | 237 -- .../app/rive/runtime/kotlin/core/ViewModel.kt | 160 -- .../runtime/kotlin/core/ViewModelInstance.kt | 1079 --------- .../kotlin/core/errors/AnimationException.kt | 9 - .../kotlin/core/errors/ArtboardException.kt | 8 - .../core/errors/MalformedFileException.kt | 8 - .../kotlin/core/errors/RiveEventException.kt | 8 - .../kotlin/core/errors/RiveException.kt | 8 - .../core/errors/StateMachineException.kt | 8 - .../core/errors/StateMachineInputException.kt | 8 - .../core/errors/TextValueRunException.kt | 8 - .../UnsupportedRuntimeVersionException.kt | 8 - .../kotlin/core/errors/ViewModelException.kt | 10 - .../rive/runtime/kotlin/renderers/Renderer.kt | 469 ---- .../kotlin/renderers/RendererMetrics.kt | 97 - .../kotlin/renderers/RiveArtboardRenderer.kt | 118 - kotlin/src/main/kotlin/app/rive/RiveFile.kt | 14 +- .../app/rive}/RiveInitializer.kt | 17 +- kotlin/src/main/kotlin/app/rive/RiveView.kt | 169 -- .../main/kotlin/app/rive/ViewModelInstance.kt | 16 +- .../main/kotlin/app/rive/core/CommandQueue.kt | 23 +- .../src/main/kotlin/app/rive/core/FileEnum.kt | 7 + .../app/rive}/core/ImageDecoder.kt | 2 +- .../main/kotlin/app/rive/core/RiveNative.kt | 79 + .../app/rive/core/ViewModelProperties.kt | 36 + .../app/rive}/fonts/FontFallbackStrategy.kt | 4 +- .../app/rive}/fonts/FontHelpers.kt | 10 +- kotlin/src/main/res/values/attrs.xml | 83 - 194 files changed, 193 insertions(+), 24622 deletions(-) delete mode 100644 app/src/androidTest/kotlin/app/rive/runtime/example/RiveActivityLifecycleTest.kt delete mode 100644 app/src/androidTest/kotlin/app/rive/runtime/example/RiveBuilderTest.kt delete mode 100644 app/src/androidTest/kotlin/app/rive/runtime/example/TestUtils.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/AssetLoaderActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/AssetLoaderFragment.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/AssetsActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/AudioAssetActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/BindArtboardWithDataActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/BlendActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/ButtonActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/DynamicTextActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/EventsActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/FontFallback.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/FrameActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/HttpActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/ImageBindingActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/InteractiveSamplesActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/LayoutActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/LegacyComposeActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/LegacyDataBindingActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/LegacyScriptingActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/LoopModeActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/LowLevelActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/MeshesActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/MetricsActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/MultiTouchActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/MultipleArtboardsActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/NestedInputActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/NestedTextRunActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/RecyclerActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/RiveFontLoadActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/RiveFragment.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/RiveFragmentActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/RiveViewActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/SimpleActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/SimpleStateMachineActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/StressTestActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/TestActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/TouchPassthroughActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/ViewPagerActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/ViewStubActivity.kt delete mode 100644 app/src/main/java/app/rive/runtime/example/utils/RiveButton.kt delete mode 100644 app/src/main/res/layout/activity_asset_loader.xml delete mode 100644 app/src/main/res/layout/activity_audio_asset.xml delete mode 100644 app/src/main/res/layout/activity_audio_external_asset.xml delete mode 100644 app/src/main/res/layout/activity_font_fallback.xml delete mode 100644 app/src/main/res/layout/activity_frame.xml delete mode 100644 app/src/main/res/layout/activity_http.xml delete mode 100644 app/src/main/res/layout/activity_image_binding.xml delete mode 100644 app/src/main/res/layout/activity_low_level.xml delete mode 100644 app/src/main/res/layout/activity_meshes.xml delete mode 100644 app/src/main/res/layout/activity_metrics.xml delete mode 100644 app/src/main/res/layout/activity_recycler.xml delete mode 100644 app/src/main/res/layout/activity_recycler_item.xml delete mode 100644 app/src/main/res/layout/activity_rive_fragment.xml delete mode 100644 app/src/main/res/layout/activity_stress_test.xml delete mode 100644 app/src/main/res/layout/activity_view_stub.xml delete mode 100644 app/src/main/res/layout/android_player.xml delete mode 100644 app/src/main/res/layout/assets.xml delete mode 100644 app/src/main/res/layout/blend.xml delete mode 100644 app/src/main/res/layout/button.xml delete mode 100644 app/src/main/res/layout/dynamic_text.xml delete mode 100644 app/src/main/res/layout/events.xml delete mode 100644 app/src/main/res/layout/fragment_asset_button.xml delete mode 100644 app/src/main/res/layout/fragment_asset_loader.xml delete mode 100644 app/src/main/res/layout/fragment_rive.xml delete mode 100644 app/src/main/res/layout/fragment_text.xml delete mode 100644 app/src/main/res/layout/interactive_samples.xml delete mode 100644 app/src/main/res/layout/layout.xml delete mode 100644 app/src/main/res/layout/loop_mode.xml delete mode 100644 app/src/main/res/layout/multiple_artboards.xml delete mode 100644 app/src/main/res/layout/nested_input.xml delete mode 100644 app/src/main/res/layout/nested_text_run.xml delete mode 100644 app/src/main/res/layout/opengl.xml delete mode 100644 app/src/main/res/layout/rive_font_load_simple.xml delete mode 100644 app/src/main/res/layout/rive_viewstub.xml delete mode 100644 app/src/main/res/layout/simple.xml delete mode 100644 app/src/main/res/layout/simple_state_machine.xml delete mode 100644 app/src/main/res/layout/single.xml delete mode 100644 app/src/main/res/layout/view_pager.xml delete mode 100644 app/src/main/res/layout/view_pager_rive_wrapper.xml delete mode 100644 app/src/main/res/values/attrs.xml delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveAnimationConfigurationsTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveAnimationLoadTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveArtboardLoadTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveArtboardRendererTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveArtboardVolumeTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveAssetsTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveControllerTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveDataBindingTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveEventTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveFileLoadTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveLifecycleTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveLinearAnimationInstanceAdvanceTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveListenerTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveMemoryTests.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveMultitouchTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveNestedInputsTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveStateMachineConfigurationsTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveStateMachineInstanceTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveStateMachineLoadTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveStateMachineStateResolutionTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveStateMachineTouchEventTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveTextValueRunTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveTextureViewSurfaceTeardownTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveUtilTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveViewLifecycleTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveViewStateMachineTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/RiveViewTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/core/TestUtils.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/fonts/FontHelpersTest.kt delete mode 100644 kotlin/src/androidTest/kotlin/app/rive/runtime/kotlin/fonts/FontPickerTest.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/Observable.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/RiveAnimationView.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/RiveTextureView.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/controllers/RiveFileController.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/AdvanceResult.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/Alignment.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/AnimationState.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/AnyState.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/Artboard.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/BindableArtboard.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/BlendState.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/Direction.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/EntryState.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/EventType.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/ExitState.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/File.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/FileAsset.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/FileAssetLoader.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/Fit.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/Helpers.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/LayerState.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/LinearAnimationInstance.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/Loop.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/NativeObject.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/PlayableInstance.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/RefCount.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/RendererType.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/Rive.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/RiveEvent.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/RiveGeneralEvent.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/RiveOpenURLEvent.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/RiveTextValueRun.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/SMIBoolean.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/SMIInput.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/SMINumber.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/SMITrigger.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/StateMachineInstance.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/ViewModel.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/ViewModelInstance.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/AnimationException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/ArtboardException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/MalformedFileException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/RiveEventException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/RiveException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/StateMachineException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/StateMachineInputException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/TextValueRunException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/UnsupportedRuntimeVersionException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/core/errors/ViewModelException.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/renderers/Renderer.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/renderers/RendererMetrics.kt delete mode 100644 kotlin/src/main/java/app/rive/runtime/kotlin/renderers/RiveArtboardRenderer.kt rename kotlin/src/main/{java/app/rive/runtime/kotlin => kotlin/app/rive}/RiveInitializer.kt (65%) delete mode 100644 kotlin/src/main/kotlin/app/rive/RiveView.kt create mode 100644 kotlin/src/main/kotlin/app/rive/core/FileEnum.kt rename kotlin/src/main/{java/app/rive/runtime/kotlin => kotlin/app/rive}/core/ImageDecoder.kt (97%) create mode 100644 kotlin/src/main/kotlin/app/rive/core/RiveNative.kt create mode 100644 kotlin/src/main/kotlin/app/rive/core/ViewModelProperties.kt rename kotlin/src/main/{java/app/rive/runtime/kotlin => kotlin/app/rive}/fonts/FontFallbackStrategy.kt (97%) rename kotlin/src/main/{java/app/rive/runtime/kotlin => kotlin/app/rive}/fonts/FontHelpers.kt (99%) delete mode 100644 kotlin/src/main/res/values/attrs.xml diff --git a/app/build.gradle b/app/build.gradle index c0ba745cd..6f6cfad39 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,14 +39,6 @@ android { profileable true signingConfig = signingConfigs.debug } - preview { - debuggable true - minifyEnabled false - shrinkResources = false - proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" - getIsDefault().set(true) - signingConfig = signingConfigs.debug - } } def javaVersion = JavaVersion.VERSION_11 @@ -59,7 +51,6 @@ android { } buildFeatures { - viewBinding = true compose = true } packagingOptions { @@ -79,24 +70,15 @@ dependencies { def composeBom = platform(libs.androidx.compose.bom) implementation(composeBom) - implementation(libs.android.volley) implementation(libs.androidx.activity.compose) implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.material.icons.core) implementation(libs.androidx.compose.ui.tooling.preview.android) - implementation(libs.androidx.fragment.ktx) implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.androidx.startup.runtime) implementation(libs.google.material) - debugImplementation project(path: ":kotlin") - benchmarkImplementation project(path: ":kotlin") - releaseImplementation project(path: ":kotlin") - previewImplementation(libs.rive.android.preview) - - androidTestImplementation(libs.androidx.test.ext.junit) - androidTestImplementation(libs.androidx.test.runner) - androidTestImplementation project(path: ":kotlin") + implementation project(path: ":kotlin") debugImplementation(libs.leakcanary) } diff --git a/app/src/androidTest/kotlin/app/rive/runtime/example/RiveActivityLifecycleTest.kt b/app/src/androidTest/kotlin/app/rive/runtime/example/RiveActivityLifecycleTest.kt deleted file mode 100644 index 291d7367f..000000000 --- a/app/src/androidTest/kotlin/app/rive/runtime/example/RiveActivityLifecycleTest.kt +++ /dev/null @@ -1,215 +0,0 @@ -package app.rive.runtime.example - -import android.view.ViewGroup -import android.widget.Button -import androidx.core.view.doOnLayout -import androidx.core.view.updateLayoutParams -import androidx.test.core.app.ActivityScenario -import androidx.test.ext.junit.runners.AndroidJUnit4 -import app.rive.runtime.example.TestUtils.Companion.waitUntil -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.controllers.RiveFileController -import app.rive.runtime.kotlin.core.ContextAssetLoader -import app.rive.runtime.kotlin.core.File -import app.rive.runtime.kotlin.core.FileAsset -import app.rive.runtime.kotlin.core.FileAssetLoader -import app.rive.runtime.kotlin.core.RendererType -import app.rive.runtime.kotlin.core.errors.RiveException -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertNull -import org.junit.Assert.assertThrows -import org.junit.Assert.assertTrue -import org.junit.Test -import org.junit.runner.RunWith -import java.util.concurrent.CountDownLatch -import java.util.concurrent.TimeUnit -import kotlin.time.Duration.Companion.milliseconds - -@RunWith(AndroidJUnit4::class) -class RiveActivityLifecycleTest { - @Test - fun activityWithRiveView() { - val activityScenario = ActivityScenario.launch(SingleActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - // Start the Activity. - activityScenario.onActivity { - riveView = it.findViewById(R.id.rive_single) - controller = riveView.controller - - assertEquals(2, controller.refCount) - assertTrue(controller.isActive) - assertNotNull(controller.file) - assertNotNull(controller.activeArtboard) - // Defaults to Rive Renderer. - assertEquals(RendererType.Rive, riveView.rendererAttributes.rendererType) - assertEquals(riveView.rendererAttributes.rendererType, controller.file?.rendererType) - } - // Close it down. - activityScenario.close() - // Background thread deallocates asynchronously. - waitUntil(1500.milliseconds) { - controller.refCount == 0 && !controller.isActive && controller.file == null && controller.activeArtboard == null - } - assertFalse(controller.isActive) - assertNull(controller.file) - assertNull(controller.activeArtboard) - } - - @Test - fun withCustomLoader() { - val activityScenario = ActivityScenario.launch(SingleActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - lateinit var ogAssetLoader: FileAssetLoader - lateinit var replacedAssetLoader: FileAssetLoader - // Start the Activity. - activityScenario.onActivity { - riveView = it.findViewById(R.id.rive_single) - controller = riveView.controller - - ogAssetLoader = riveView.rendererAttributes.assetLoader!! - assertTrue(ogAssetLoader.hasCppObject) - - replacedAssetLoader = object : ContextAssetLoader(it) { - override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean = true - } - assertEquals(2, ogAssetLoader.refCount) - riveView.setAssetLoader(replacedAssetLoader) - // The old asset loader is still referenced by the old file - assertEquals(1, ogAssetLoader.refCount) - assertEquals( - replacedAssetLoader, - riveView.rendererAttributes.assetLoader - ) - // One ref from the owner (this test) and one from the View. - assertEquals(2, replacedAssetLoader.refCount) - } - // Close it down. - activityScenario.close() - // Background thread deallocates asynchronously. - waitUntil(1500.milliseconds) { - controller.refCount == 0 && - !controller.isActive && - controller.file == null && - controller.activeArtboard == null && - !ogAssetLoader.hasCppObject - } - assertFalse(controller.isActive) - assertNull(controller.file) - assertNull(controller.activeArtboard) - assertFalse(ogAssetLoader.hasCppObject) - - // New assetLoader needs to be freed by the creator - assertTrue(replacedAssetLoader.hasCppObject) - replacedAssetLoader.release() - assertFalse(replacedAssetLoader.hasCppObject) - } - - @Test - fun activityWithRiveViewSetsWrongFileType() { - val activityScenario = ActivityScenario.launch(SingleActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - // Start the Activity. - activityScenario.onActivity { - riveView = it.findViewById(R.id.rive_single) - controller = riveView.controller - - assertEquals(2, controller.refCount) - assertTrue(controller.isActive) - assertNotNull(controller.file) - assertNotNull(controller.activeArtboard) - // Defaults to Rive Renderer. - assertEquals(RendererType.Rive, riveView.rendererAttributes.rendererType) - assertEquals(riveView.rendererAttributes.rendererType, controller.file?.rendererType) - // Set wrong file type throws! - val customRendererFile = File( - it.resources.openRawResource(R.raw.off_road_car_blog).readBytes(), - RendererType.Canvas - ) - assertEquals(RendererType.Canvas, customRendererFile.rendererType) - val wrongFileTypeException = assertThrows(RiveException::class.java) { - // Boom! - riveView.setRiveFile(customRendererFile) - } - assertEquals( - "Incompatible Renderer types: file initialized with ${customRendererFile.rendererType.name}" + - " but View is set up for ${riveView.rendererAttributes.rendererType.name}", - wrongFileTypeException.message - ) - } - // Close it down. - activityScenario.close() - // Background thread deallocates asynchronously. - waitUntil(1500.milliseconds) { controller.refCount == 0 && !controller.isActive && controller.file == null && controller.activeArtboard == null } - assertFalse(controller.isActive) - assertNull(controller.file) - assertNull(controller.activeArtboard) - } - - @Test - fun resizeRiveView() { - val activityScenario = ActivityScenario.launch(SingleActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var ogWidth = 0f - - val layoutCompleteLatch = CountDownLatch(1) - // Start the Activity. - activityScenario.onActivity { activity -> - riveView = activity.findViewById(R.id.rive_single) - controller = riveView.controller - - assertEquals(2, controller.refCount) - assertTrue(controller.isActive) - assertNotNull(controller.file) - assertNotNull(controller.activeArtboard) - - ogWidth = riveView.artboardRenderer!!.width - - // This block runs after the initial layout - riveView.doOnLayout { - ogWidth = riveView.artboardRenderer!!.width - - val button = Button(activity).apply { - text = "RESIZE" - setOnClickListener { - riveView.updateLayoutParams { width = (ogWidth - 1).toInt() } - } - - // After requesting resize, wait for the next layout pass to confirm it - riveView.doOnLayout { layoutCompleteLatch.countDown() } - } - - (riveView.parent as ViewGroup).addView(button) - button.performClick() - } - } - - assertTrue( - "Timed out waiting for view to be re-laid out.", - layoutCompleteLatch.await(3, TimeUnit.SECONDS) - ) - - var finalWidth: Float? = null - activityScenario.onActivity { finalWidth = riveView.artboardRenderer?.width } - - assertEquals(ogWidth - 1f, finalWidth) - - // Close it down. - activityScenario.close() - - // Background thread deallocates asynchronously, so let's wait for it. - waitUntil(1500.milliseconds) { - controller.refCount == 0 && - controller.file == null && - controller.activeArtboard == null - } - assertFalse(controller.isActive) - assertNull(controller.file) - assertNull(controller.activeArtboard) - } -} diff --git a/app/src/androidTest/kotlin/app/rive/runtime/example/RiveBuilderTest.kt b/app/src/androidTest/kotlin/app/rive/runtime/example/RiveBuilderTest.kt deleted file mode 100644 index c7406928c..000000000 --- a/app/src/androidTest/kotlin/app/rive/runtime/example/RiveBuilderTest.kt +++ /dev/null @@ -1,392 +0,0 @@ -package app.rive.runtime.example - -import androidx.test.core.app.ActivityScenario -import androidx.test.ext.junit.runners.AndroidJUnit4 -import app.rive.runtime.example.TestUtils.Companion.waitUntil -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.controllers.RiveFileController -import app.rive.runtime.kotlin.core.Alignment -import app.rive.runtime.kotlin.core.CDNAssetLoader -import app.rive.runtime.kotlin.core.FallbackAssetLoader -import app.rive.runtime.kotlin.core.File -import app.rive.runtime.kotlin.core.FileAsset -import app.rive.runtime.kotlin.core.FileAssetLoader -import app.rive.runtime.kotlin.core.Fit -import app.rive.runtime.kotlin.core.Loop -import app.rive.runtime.kotlin.core.RendererType -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertTrue -import org.junit.Test -import org.junit.runner.RunWith -import java.util.concurrent.TimeoutException -import kotlin.time.Duration.Companion.milliseconds - -@RunWith(AndroidJUnit4::class) -class RiveBuilderTest { - private val cleanupTimeout = 1500.milliseconds - - @Test - fun withIdResource() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var capturedAssetLoader: FileAssetLoader? = null - - activityScenario.onActivity { - riveView = RiveAnimationView.Builder(it) - .setResource(R.raw.off_road_car_blog) - .build() - it.container.addView(riveView) - controller = riveView.controller - capturedAssetLoader = riveView.rendererAttributes.assetLoader - assertTrue(controller.isActive) - assertEquals("New Artboard", controller.activeArtboard?.name) - assertEquals( - listOf("idle"), - controller.playingAnimations.toList().map { anim -> anim.name }) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val assetLoaderCppObjectGone = capturedAssetLoader?.hasCppObject == false - - refCountZero && isInactive && artboardIsNull && fileIsNull && assetLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for withIdResource within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "assetLoader?.hasCppObject=${capturedAssetLoader?.hasCppObject}", e - ) - } - } - - @Test - fun withFileResource() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var capturedAssetLoader: FileAssetLoader? = null - - activityScenario.onActivity { activity -> - val file = activity - .resources - .openRawResource(R.raw.basketball) - .use { res -> File(res.readBytes()) } - - riveView = RiveAnimationView.Builder(activity) - .setResource(file) - .build() - activity.container.addView(riveView) - controller = riveView.controller - capturedAssetLoader = riveView.rendererAttributes.assetLoader - assertTrue(controller.isActive) - assertEquals("New Artboard", controller.activeArtboard?.name) - assertEquals( - listOf("idle"), - controller.playingAnimations.toList().map { anim -> anim.name }) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val assetLoaderCppObjectGone = capturedAssetLoader?.hasCppObject == false - - refCountZero && isInactive && artboardIsNull && fileIsNull && assetLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for withFileResource within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "assetLoader?.hasCppObject=${capturedAssetLoader?.hasCppObject}", e - ) - } - } - - @Test - fun withBytesResource() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var capturedAssetLoader: FileAssetLoader? = null - - activityScenario.onActivity { activity -> - val fileBytes = activity - .resources - .openRawResource(R.raw.basketball) - .use { res -> res.readBytes() } - riveView = RiveAnimationView.Builder(activity) - .setResource(fileBytes) - .build() - activity.container.addView(riveView) - controller = riveView.controller - capturedAssetLoader = riveView.rendererAttributes.assetLoader - assertTrue(controller.isActive) - assertEquals("New Artboard", controller.activeArtboard?.name) - assertEquals( - listOf("idle"), - controller.playingAnimations.toList().map { anim -> anim.name }) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val assetLoaderCppObjectGone = capturedAssetLoader?.hasCppObject == false - - refCountZero && isInactive && artboardIsNull && fileIsNull && assetLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for withBytesResource within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "assetLoader?.hasCppObject=${capturedAssetLoader?.hasCppObject}", e - ) - } - } - - @Test - fun manyParameters() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var capturedAssetLoader: FileAssetLoader? = null - - activityScenario.onActivity { activity -> - riveView = RiveAnimationView.Builder(activity) - .setAlignment(Alignment.BOTTOM_CENTER) - .setFit(Fit.FIT_HEIGHT) - .setLoop(Loop.PINGPONG) - .setAutoplay(false) - .setAutoBind(true) - .setTraceAnimations(true) - .setArtboardName("artboard2") - .setAnimationName("artboard2animation1") - .setResource(R.raw.multipleartboards) - .build() - activity.container.addView(riveView) - controller = riveView.controller - capturedAssetLoader = riveView.rendererAttributes.assetLoader - assertTrue(controller.isActive) - assertFalse(controller.autoplay) - assertNotNull(controller.activeArtboard?.viewModelInstance) - assertEquals(Alignment.BOTTOM_CENTER, controller.alignment) - assertEquals(Fit.FIT_HEIGHT, controller.fit) - assertEquals(Loop.PINGPONG, controller.loop) - assertTrue(riveView.artboardRenderer!!.trace) - assertEquals("artboard2", controller.activeArtboard?.name) - assertEquals( - emptyList(), - controller.playingAnimations.toList().map { anim -> anim.name }) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val assetLoaderCppObjectGone = capturedAssetLoader?.hasCppObject == false - refCountZero && isInactive && artboardIsNull && fileIsNull && assetLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for manyParameters within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "assetLoader?.hasCppObject=${capturedAssetLoader?.hasCppObject}", e - ) - } - } - - @Test - fun assetLoader() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - val assetStore = mutableListOf() - val customLoader = object : FileAssetLoader() { - override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean { - return assetStore.add(asset) - } - } - - activityScenario.onActivity { activity -> - riveView = RiveAnimationView.Builder(activity) - .setResource(R.raw.walle) - .setAssetLoader(customLoader) - .build() - activity.container.addView(riveView) - controller = riveView.controller - - val actualLoader = riveView.rendererAttributes.assetLoader - assertTrue(actualLoader is FallbackAssetLoader) - val fallbackLoader = actualLoader as FallbackAssetLoader - assertEquals(2, fallbackLoader.loaders.size) - assertEquals(customLoader, fallbackLoader.loaders.first()) - assertTrue(fallbackLoader.loaders.last() is CDNAssetLoader) - assertEquals(2, assetStore.size) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val customLoaderCppObjectGone = !customLoader.hasCppObject - - refCountZero && isInactive && artboardIsNull && fileIsNull && customLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for assetLoader within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "customLoader.hasCppObject=${customLoader.hasCppObject}", e - ) - } - } - - @Test - fun noCDNLoader() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var capturedAssetLoader: FileAssetLoader? = null - - activityScenario.onActivity { activity -> - riveView = RiveAnimationView.Builder(activity) - .setResource(R.raw.walle) - .setShouldLoadCDNAssets(false) - .build() - activity.container.addView(riveView) - controller = riveView.controller - capturedAssetLoader = riveView.rendererAttributes.assetLoader - - val actualLoader = riveView.rendererAttributes.assetLoader - assertTrue(actualLoader is FallbackAssetLoader) - val fallbackLoader = actualLoader as FallbackAssetLoader - assertTrue(fallbackLoader.loaders.isEmpty()) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val assetLoaderCppObjectGone = capturedAssetLoader?.hasCppObject == false - - refCountZero && isInactive && artboardIsNull && fileIsNull && assetLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for noCDNLoader within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "assetLoader?.hasCppObject=${capturedAssetLoader?.hasCppObject}", e - ) - } - } - - @Test - fun withRendererType() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var capturedAssetLoader: FileAssetLoader? = null - - activityScenario.onActivity { activity -> - riveView = RiveAnimationView.Builder(activity) - .setResource(R.raw.basketball) - .setRendererType(RendererType.Canvas) - .build() - activity.container.addView(riveView) - controller = riveView.controller - capturedAssetLoader = riveView.rendererAttributes.assetLoader - assertNotNull(riveView.artboardRenderer) - assertEquals(RendererType.Canvas, riveView.artboardRenderer?.type) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val assetLoaderCppObjectGone = capturedAssetLoader?.hasCppObject == false - - refCountZero && isInactive && artboardIsNull && fileIsNull && assetLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for withRendererType within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "assetLoader?.hasCppObject=${capturedAssetLoader?.hasCppObject}", e - ) - } - } - - @Test - fun withStateMachineName() { - val activityScenario = ActivityScenario.launch(EmptyActivity::class.java) - lateinit var riveView: RiveAnimationView - lateinit var controller: RiveFileController - var capturedAssetLoader: FileAssetLoader? = null - - activityScenario.onActivity { activity -> - riveView = RiveAnimationView.Builder(activity) - .setResource(R.raw.what_a_state) - .setStateMachineName("State Machine 2") - .build() - activity.container.addView(riveView) - controller = riveView.controller - capturedAssetLoader = riveView.rendererAttributes.assetLoader - assertEquals(1, controller.playingStateMachines.size) - assertEquals("State Machine 2", controller.playingStateMachines.first().name) - } - activityScenario.close() - - try { - waitUntil(cleanupTimeout) { - val refCountZero = controller.refCount == 0 - val isInactive = !controller.isActive - val artboardIsNull = controller.activeArtboard == null - val fileIsNull = controller.file == null - val assetLoaderCppObjectGone = capturedAssetLoader?.hasCppObject == false - - refCountZero && isInactive && artboardIsNull && fileIsNull && assetLoaderCppObjectGone - } - } catch (e: TimeoutException) { - throw AssertionError( - "Cleanup conditions not met for withStateMachineName within $cleanupTimeout. Current state: " + - "controller.refCount=${controller.refCount}, controller.isActive=${controller.isActive}, " + - "controller.file=${controller.file}, controller.activeArtboard=${controller.activeArtboard}, " + - "assetLoader?.hasCppObject=${capturedAssetLoader?.hasCppObject}", e - ) - } - } -} diff --git a/app/src/androidTest/kotlin/app/rive/runtime/example/TestUtils.kt b/app/src/androidTest/kotlin/app/rive/runtime/example/TestUtils.kt deleted file mode 100644 index 7a958a504..000000000 --- a/app/src/androidTest/kotlin/app/rive/runtime/example/TestUtils.kt +++ /dev/null @@ -1,99 +0,0 @@ -package app.rive.runtime.example - -import android.annotation.SuppressLint -import android.os.Build -import java.io.BufferedReader -import java.io.IOException -import java.io.InputStreamReader -import java.lang.reflect.Method -import java.util.concurrent.TimeoutException -import kotlin.time.Duration - -class TestUtils { - companion object { - fun waitUntil( - atMost: Duration, - condition: () -> Boolean - ) { - val maxTime = atMost.inWholeMilliseconds - - val interval: Long = 50 - var elapsed: Long = 0 - do { - elapsed += interval - Thread.sleep(interval) - - if (elapsed > maxTime) { - throw TimeoutException("Took too long.") - } - } while (!condition()) - } - - // Helper function to check whether it's running on an emulator - // Found on: https://stackoverflow.com/a/21505193 - val isProbablyRunningOnEmulator: Boolean by lazy { - // Android SDK emulator - return@lazy ((Build.MANUFACTURER == "Google" && Build.BRAND == "google" && - ((Build.FINGERPRINT.startsWith("google/sdk_gphone_") - && Build.FINGERPRINT.endsWith(":user/release-keys") - && Build.PRODUCT.startsWith("sdk_gphone_") - && Build.MODEL.startsWith("sdk_gphone_")) - //alternative - || (Build.FINGERPRINT.startsWith("google/sdk_gphone64_") - && (Build.FINGERPRINT.endsWith(":userdebug/dev-keys") || Build.FINGERPRINT.endsWith( - ":user/release-keys" - )) - && Build.PRODUCT.startsWith("sdk_gphone64_") - && Build.MODEL.startsWith("sdk_gphone64_")))) - // - || Build.FINGERPRINT.startsWith("generic") - || Build.FINGERPRINT.startsWith("unknown") - || Build.MODEL.contains("google_sdk") - || Build.MODEL.contains("Emulator") - || Build.MODEL.contains("Android SDK built for x86") - //bluestacks - || "QC_Reference_Phone" == Build.BOARD && !"Xiaomi".equals( - Build.MANUFACTURER, - ignoreCase = true - ) - //bluestacks - || Build.MANUFACTURER.contains("Genymotion") - || Build.HOST.startsWith("Build") - //MSI App Player - || Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic") - || Build.PRODUCT == "google_sdk" - // another Android SDK emulator check - || SystemProperties.getProp("ro.kernel.qemu") == "1") - } - } - - object SystemProperties { - private var failedUsingReflection = false - private var getPropMethod: Method? = null - - @SuppressLint("PrivateApi") - fun getProp(propName: String, defaultResult: String = ""): String { - if (!failedUsingReflection) try { - if (getPropMethod == null) { - val clazz = Class.forName("android.os.SystemProperties") - getPropMethod = clazz.getMethod("get", String::class.java, String::class.java) - } - return getPropMethod!!.invoke(null, propName, defaultResult) as String? - ?: defaultResult - } catch (_: Exception) { - getPropMethod = null - failedUsingReflection = true - } - var process: Process? = null - try { - process = Runtime.getRuntime().exec("getprop \"$propName\" \"$defaultResult\"") - val reader = BufferedReader(InputStreamReader(process.inputStream)) - return reader.readLine() - } catch (_: IOException) { - } finally { - process?.destroy() - } - return defaultResult - } - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9388e1d67..4ab3aece9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,9 +2,6 @@ - - - @@ -68,132 +65,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt b/app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt deleted file mode 100644 index 06a1ae749..000000000 --- a/app/src/main/java/app/rive/runtime/example/AndroidPlayerActivity.kt +++ /dev/null @@ -1,430 +0,0 @@ -package app.rive.runtime.example - -import android.graphics.Color -import android.os.Bundle -import android.view.Gravity -import android.view.View -import android.widget.AdapterView -import android.widget.ArrayAdapter -import android.widget.LinearLayout -import android.widget.RadioButton -import android.widget.Spinner -import android.widget.TextView -import androidx.activity.ComponentActivity -import androidx.appcompat.widget.AppCompatButton -import androidx.appcompat.widget.AppCompatCheckBox -import androidx.appcompat.widget.AppCompatEditText -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.controllers.RiveFileController -import app.rive.runtime.kotlin.core.Artboard -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.PlayableInstance -import app.rive.runtime.kotlin.core.SMIBoolean -import app.rive.runtime.kotlin.core.SMINumber -import app.rive.runtime.kotlin.core.StateMachineInstance - -class AndroidPlayerActivity : ComponentActivity() { - var loop: Loop = Loop.AUTO - var direction: Direction = Direction.AUTO - var playButtonMap: HashMap = HashMap() - var pauseButtonMap: HashMap = HashMap() - var stopButtonMap: HashMap = HashMap() - - private val animationResources = listOf( - R.raw.artboard_animations, - R.raw.basketball, - R.raw.circle_move, - R.raw.clipping, - R.raw.explorer, - R.raw.f22, - R.raw.flux_capacitor, - R.raw.loopy, - R.raw.mascot, - R.raw.neostream, - R.raw.off_road_car_blog, - R.raw.progress, - R.raw.pull, - R.raw.rope, - R.raw.skills, - R.raw.trailblaze, - R.raw.ui_swipe_left_to_delete, - R.raw.vader, - R.raw.wacky, - R.raw.what_a_state, - R.raw.two_bone_ik, - R.raw.constrained, - ) - - val animationView by lazy(LazyThreadSafetyMode.NONE) { - findViewById(R.id.android_player_view) - } - - val resourceNames: List - get() { - return animationResources.map { resources.getResourceName(it).split('/').last() } - } - - fun loadResource(index: Int) { - animationView.setRiveResource(animationResources[index], artboardName = null) - setSpinner() - - playButtonMap.clear() - pauseButtonMap.clear() - stopButtonMap.clear() - - animationView.controller.file?.firstArtboard?.name?.let { - loadArtboard(it) - } - } - - fun onLoopModeSelected(view: View) { - if (view is RadioButton && view.isChecked) { - // Check which radio button was clicked - when (view.id) { - R.id.loop_auto -> - loop = Loop.AUTO - - R.id.loop_loop -> - loop = Loop.LOOP - - R.id.loop_oneshot -> - loop = Loop.ONESHOT - - R.id.loop_pingpong -> - loop = Loop.PINGPONG - } - } - } - - fun onDirectionSelected(view: View) { - if (view is RadioButton && view.isChecked) { - // Check which radio button was clicked - when (view.id) { - R.id.direction_auto -> - direction = Direction.AUTO - - R.id.direction_backwards -> - direction = Direction.BACKWARDS - - R.id.direction_forwards -> - direction = Direction.FORWARDS - } - } - } - - fun onReset(view: View) { - if (view is AppCompatButton) { - animationView.reset() - } - } - - fun addAnimationControl(animationName: String): View { - val layout = LinearLayout(this) - layout.orientation = LinearLayout.HORIZONTAL - layout.gravity = Gravity.END - - val text = TextView(this) - text.text = animationName - - val playButton = AppCompatButton(this) - playButton.text = ">" - playButton.background.setTint(Color.WHITE) - playButton.setOnClickListener { - animationView.play(animationName, loop, direction) - } - playButtonMap[animationName] = playButton - - val pauseButton = AppCompatButton(this) - pauseButton.text = "||" - pauseButton.background.setTint(Color.WHITE) - pauseButton.setOnClickListener { - animationView.pause(animationName) - } - pauseButtonMap[animationName] = pauseButton - - val stopButton = AppCompatButton(this) - stopButton.text = "[]" - stopButton.background.setTint(Color.RED) - stopButton.setOnClickListener { - animationView.stop(animationName) - } - stopButtonMap[animationName] = stopButton - - layout.addView(text) - layout.addView(playButton) - layout.addView(pauseButton) - layout.addView(stopButton) - return layout - } - - fun addStateMachineControl(artboard: Artboard, stateMachineName: String): List { - val views = mutableListOf() - val layout = LinearLayout(this) - layout.orientation = LinearLayout.HORIZONTAL - layout.gravity = Gravity.END - - val text = TextView(this) - text.text = stateMachineName - - val playButton = AppCompatButton(this) - playButton.text = ">" - playButton.background.setTint(Color.WHITE) - playButton.setOnClickListener { - animationView.play(stateMachineName, loop, direction, isStateMachine = true) - } - playButtonMap[stateMachineName] = playButton - - val pauseButton = AppCompatButton(this) - pauseButton.text = "||" - pauseButton.background.setTint(Color.WHITE) - pauseButton.setOnClickListener { - animationView.pause(stateMachineName, isStateMachine = true) - } - pauseButtonMap[stateMachineName] = pauseButton - - val stopButton = AppCompatButton(this) - stopButton.text = "[]" - stopButton.background.setTint(Color.RED) - stopButton.setOnClickListener { - animationView.stop(stateMachineName, isStateMachine = true) - } - stopButtonMap[stateMachineName] = stopButton - - val stateMachine = artboard.stateMachine(stateMachineName) - - layout.addView(text) - layout.addView(playButton) - layout.addView(pauseButton) - layout.addView(stopButton) - views.add(layout) - - stateMachine.inputs.forEach { - val innerLayout = LinearLayout(this) - innerLayout.orientation = LinearLayout.HORIZONTAL - innerLayout.gravity = Gravity.END - - val innerText = TextView(this) - innerText.text = it.name - innerLayout.addView(innerText) - - if (it.isTrigger) { - val triggerButton = AppCompatButton(this) - triggerButton.text = "Fire" - triggerButton.background.setTint(Color.WHITE) - triggerButton.setOnClickListener { _ -> - animationView.fireState(stateMachineName, it.name) - } - innerLayout.addView(triggerButton) - } - - if (it.isBoolean) { - val boolBox = AppCompatCheckBox(this) - if ((it as SMIBoolean).value) { - boolBox.isChecked = true - } - boolBox.setOnCheckedChangeListener { _, b -> - animationView.setBooleanState(stateMachineName, it.name, b) - } - innerLayout.addView(boolBox) - } - - if (it.isNumber) { - val editText = AppCompatEditText(this) - editText.setText((it as SMINumber).value.toString()) - val editTriggerButton = AppCompatButton(this) - editTriggerButton.text = "Apply" - editTriggerButton.background.setTint(Color.WHITE) - editTriggerButton.setOnClickListener { _ -> - try { - val value = editText.text.toString().toFloat() - animationView.setNumberState(stateMachineName, it.name, value) - } catch (e: Error) { - - } - } - - innerLayout.addView(editText) - innerLayout.addView(editTriggerButton) - } - - views.add(innerLayout) - } - - return views - } - - fun loadArtboard(artboardName: String) { - val controls = findViewById(R.id.controls) - controls.removeAllViews() - animationView.controller.file?.artboard(artboardName)?.let { artboard -> - if (artboard.stateMachineNames.isNotEmpty()) { - val stateMachineHeader = TextView(this) - stateMachineHeader.text = "State Machines:" - controls.addView(stateMachineHeader) - artboard.stateMachineNames.forEach { - addStateMachineControl(artboard, it).forEach { - controls.addView(it) - } - } - } - if (artboard.animationNames.isNotEmpty()) { - val animationsHeader = TextView(this) - animationsHeader.text = "Animations:" - controls.addView(animationsHeader) - artboard.animationNames.forEach { - controls.addView(addAnimationControl(it)) - } - } - } - - } - - fun setSpinner() { - animationView.controller.file?.artboardNames?.let { artboardNames -> - val dropdown = findViewById(R.id.artboards) - val adapter = ArrayAdapter( - this, - android.R.layout.simple_spinner_dropdown_item, - artboardNames - ) - dropdown.adapter = adapter - dropdown.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - arg0: AdapterView<*>?, - arg1: View?, - arg2: Int, - arg3: Long - ) { - val item = dropdown.selectedItem.toString() - - animationView.artboardName = item - loadArtboard(item) - } - - override fun onNothingSelected(arg0: AdapterView<*>?) {} - } - } - } - - fun setResourceSpinner() { - animationResources.let { _ -> - val dropdown = findViewById(R.id.resources) - val adapter = ArrayAdapter( - this, - android.R.layout.simple_spinner_dropdown_item, - resourceNames - ) - dropdown.adapter = adapter - dropdown.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - arg0: AdapterView<*>?, - arg1: View?, - arg2: Int, - arg3: Long - ) { - loadResource(arg2) - } - - override fun onNothingSelected(arg0: AdapterView<*>?) {} - } - } - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.android_player) - - setResourceSpinner() - loadResource(0) - val that = this - val events = findViewById(R.id.events) - val elapsedTextView = findViewById(R.id.elapsed_text_view) - val listener = object : RiveFileController.Listener { - override fun notifyPlay(animation: PlayableInstance) { - var text: String? = null - if (animation is LinearAnimationInstance) { - text = animation.name - } else if (animation is StateMachineInstance) { - text = animation.name - } - text?.let { theText -> - runOnUiThread { - val textView = TextView(that) - textView.text = "Play $theText" - events.addView(textView, 0) - playButtonMap[theText]?.background?.setTint(Color.GREEN) - pauseButtonMap[theText]?.background?.setTint(Color.WHITE) - stopButtonMap[theText]?.background?.setTint(Color.WHITE) - } - } - } - - override fun notifyPause(animation: PlayableInstance) { - var text: String? = null - if (animation is LinearAnimationInstance) { - text = animation.name - } else if (animation is StateMachineInstance) { - text = animation.name - } - text?.let { - runOnUiThread { - val textView = TextView(that) - textView.text = "Pause $text" - events.addView(textView, 0) - playButtonMap[text]?.background?.setTint(Color.WHITE) - pauseButtonMap[text]?.background?.setTint(Color.BLUE) - stopButtonMap[text]?.background?.setTint(Color.WHITE) - } - } - } - - override fun notifyStop(animation: PlayableInstance) { - var text: String? = null - if (animation is LinearAnimationInstance) { - text = animation.name - } else if (animation is StateMachineInstance) { - text = animation.name - } - text?.let { - runOnUiThread { - val textView = TextView(that) - textView.text = "Stop $text" - events.addView(textView, 0) - playButtonMap[text]?.background?.setTint(Color.WHITE) - pauseButtonMap[text]?.background?.setTint(Color.WHITE) - stopButtonMap[text]?.background?.setTint(Color.RED) - } - } - } - - override fun notifyLoop(animation: PlayableInstance) { - if (animation is LinearAnimationInstance) { - runOnUiThread { - val text = TextView(that) - text.text = "Loop ${animation.name}" - events.addView(text, 0) - } - } - } - - override fun notifyStateChanged(stateMachineName: String, stateName: String) { - runOnUiThread { - val text = TextView(that) - text.text = "$stateMachineName: State Changed: $stateName" - events.addView(text, 0) - } - } - - override fun notifyAdvance(elapsed: Float) { - runOnUiThread { - elapsedTextView.text = "Delta time: $elapsed" - } - } - } - - animationView.registerListener(listener) - } -} diff --git a/app/src/main/java/app/rive/runtime/example/AssetLoaderActivity.kt b/app/src/main/java/app/rive/runtime/example/AssetLoaderActivity.kt deleted file mode 100644 index 58880fd29..000000000 --- a/app/src/main/java/app/rive/runtime/example/AssetLoaderActivity.kt +++ /dev/null @@ -1,93 +0,0 @@ -package app.rive.runtime.example - -import android.content.Context -import android.os.Bundle -import android.util.Log -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentActivity -import androidx.viewpager2.adapter.FragmentStateAdapter -import app.rive.runtime.example.databinding.ActivityAssetLoaderBinding -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.core.BytesRequest -import app.rive.runtime.kotlin.core.ContextAssetLoader -import app.rive.runtime.kotlin.core.FileAsset -import app.rive.runtime.kotlin.core.FileAssetLoader -import com.android.volley.toolbox.Volley -import com.google.android.material.tabs.TabLayoutMediator -import kotlin.random.Random - -class AssetLoaderActivity : FragmentActivity() { - private lateinit var binding: ActivityAssetLoaderBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivityAssetLoaderBinding.inflate(layoutInflater) - setEdgeToEdgeContent(binding.root) - - binding.viewPager.adapter = object : FragmentStateAdapter(this) { - override fun getItemCount(): Int = 3 - - override fun createFragment(position: Int): Fragment { - return when (position) { - 0 -> AssetLoaderFragment() - 1 -> AssetButtonFragment() - else -> FontAssetFragment() - } - } - } - - TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position -> - tab.text = when (position) { - 0 -> "Asset Loader" - 1 -> "Change Images" - else -> "Fonts" - } - }.attach() - } -} - -/** - * [FileAssetLoader] tailored for the two assets in the walle.riv file. - * - * The main purpose of this class is to demonstrate how create a custom [ContextAssetLoader] via - * XML. - */ -class WalleAssetLoader(context: Context) : ContextAssetLoader(context) { - override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean { - val identifier = - if (asset.uniqueFilename.contains("eve")) R.raw.walle_img_eve - else R.raw.walle_img_walle - - context.resources.openRawResource(identifier).use { - asset.decode(it.readBytes()) - } - return true - } -} - -/** Loads a random image from picsum.photos. */ -class RandomNetworkLoader(context: Context) : FileAssetLoader() { - private val loremImage = "https://picsum.photos" - private val queue = Volley.newRequestQueue(context) - private val minSize = 150 - private val maxSize = 500 - private val maxId = 1084 - - override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean { - val randomWidth = Random.nextInt(minSize, maxSize) - val randomHeight = Random.nextInt(minSize, maxSize) - val imgId = Random.nextInt(maxId) - - val url = "$loremImage/id/$imgId/$randomWidth/$randomHeight" - val request = BytesRequest( - url, - { bytes -> asset.decode(bytes) }, - { - Log.e("Request", "onAssetLoaded: failed to load image from $url") - it.printStackTrace() - } - ) - queue.add(request) - return true - } -} diff --git a/app/src/main/java/app/rive/runtime/example/AssetLoaderFragment.kt b/app/src/main/java/app/rive/runtime/example/AssetLoaderFragment.kt deleted file mode 100644 index d3c52d6e6..000000000 --- a/app/src/main/java/app/rive/runtime/example/AssetLoaderFragment.kt +++ /dev/null @@ -1,240 +0,0 @@ -package app.rive.runtime.example - -import android.content.Context -import android.os.Bundle -import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import android.widget.FrameLayout -import androidx.fragment.app.Fragment -import app.rive.runtime.example.databinding.FragmentAssetButtonBinding -import app.rive.runtime.example.databinding.FragmentAssetLoaderBinding -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.core.BytesRequest -import app.rive.runtime.kotlin.core.FileAsset -import app.rive.runtime.kotlin.core.FileAssetLoader -import app.rive.runtime.kotlin.core.FontAsset -import app.rive.runtime.kotlin.core.ImageAsset -import app.rive.runtime.kotlin.core.Loop -import app.rive.runtime.kotlin.core.RiveFont -import app.rive.runtime.kotlin.core.RiveRenderImage -import com.android.volley.RequestQueue -import com.android.volley.toolbox.Volley -import kotlin.random.Random - -private fun makeContainer(context: Context): FrameLayout { - return FrameLayout(context).apply { - layoutParams = FrameLayout.LayoutParams( - FrameLayout.LayoutParams.WRAP_CONTENT, - FrameLayout.LayoutParams.WRAP_CONTENT, - ).apply { - // 16dp equivalent - val dpPadding = (16 * resources.displayMetrics.density).toInt() - topMargin = dpPadding - } - } -} - -private fun makeButton( - context: Context, - label: String, - clickListener: View.OnClickListener -): Button { - return Button(context).apply { - layoutParams = ViewGroup.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, - ) - text = label - setOnClickListener(clickListener) - } -} - -class AssetLoaderFragment : Fragment() { - private var _binding: FragmentAssetLoaderBinding? = null - private val binding get() = _binding!! - private lateinit var networkLoader: RandomNetworkLoader - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - _binding = FragmentAssetLoaderBinding.inflate(inflater, container, false) - val view = binding.root - val ctx = view.context - networkLoader = RandomNetworkLoader(ctx) - - makeContainer(ctx).let { - val riveView = RiveAnimationView.Builder(ctx) - .setAssetLoader(networkLoader) - .setResource(R.raw.walle) - .build() - it.addView(riveView) - binding.fragmentLoaderContainer.addView(it) - } - - makeContainer(ctx).let { - val cdnRiveView = RiveAnimationView.Builder(ctx) - .setResource(R.raw.cdn_image) - .build() - it.addView(cdnRiveView) - binding.fragmentLoaderContainer.addView(it) - } - - return view - } -} - -class AssetButtonFragment : Fragment() { - private var _binding: FragmentAssetButtonBinding? = null - private val binding get() = _binding!! - - private val loremImage = "https://picsum.photos" - private lateinit var queue: RequestQueue - private lateinit var assetStore: ImageAssetStore - private val minSize = 750 - private val maxSize = 1000 - private val maxId = 1084 - - private fun randomImageButton(context: Context): Button { - return makeButton(context, "Change Image") { - val randomWidth = Random.nextInt(minSize, maxSize) - val randomHeight = Random.nextInt(minSize, maxSize) - val imgId = Random.nextInt(maxId) - val url = "$loremImage/id/$imgId/$randomWidth/$randomHeight" - val request = BytesRequest( - url, - { bytes -> - assetStore.nextAsset.image = RiveRenderImage.fromEncoded(bytes) - }, - { - Log.e("Request", "onAssetLoaded: failed to load $url.") - it.printStackTrace() - } - ) - queue.add(request) - } - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - - _binding = FragmentAssetButtonBinding.inflate(inflater, container, false) - val view = binding.root - val ctx = view.context - queue = Volley.newRequestQueue(ctx) - - assetStore = ImageAssetStore() - val riveView = RiveAnimationView.Builder(ctx) - .setAssetLoader(assetStore) - .setResource(R.raw.asset_load_check) - .build() - - makeContainer(ctx).let { - it.addView(riveView) - binding.fragmentButtonContainer.addView(it) - } - - randomImageButton(ctx).let { - binding.fragmentButtonContainer.addView(it) - } - - return view - } - - private class ImageAssetStore : FileAssetLoader() { - private var lastAssetChanged = 0 - val assetList = mutableListOf() - - val nextAsset: ImageAsset - get() = assetList[lastAssetChanged++ % assetList.size] - - override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean { - if (asset is ImageAsset) { - return assetList.add(asset) - } - return false - } - } -} - -class FontAssetFragment : Fragment() { - private var _binding: FragmentAssetButtonBinding? = null - private lateinit var queue: RequestQueue - private val binding get() = _binding!! - - private lateinit var fontDecoder: RandomFontDecoder - - private val fontUrls = listOf( - "https://cdn.rive.app/runtime/flutter/IndieFlower-Regular.ttf", - "https://cdn.rive.app/runtime/flutter/comic-neue.ttf", - "https://cdn.rive.app/runtime/flutter/inter.ttf", - "https://cdn.rive.app/runtime/flutter/inter-tight.ttf", - "https://cdn.rive.app/runtime/flutter/josefin-sans.ttf", - "https://cdn.rive.app/runtime/flutter/send-flowers.ttf", - ) - - private fun randomFontButton(context: Context): Button { - return makeButton(context, "Change Font") { - val url = fontUrls.random() - val request = BytesRequest( - url, - { bytes -> fontDecoder.fontAsset.font = RiveFont.make(bytes) }, - { - Log.e("Request", "onAssetLoaded: failed to load $url.") - it.printStackTrace() - } - ) - queue.add(request) - } - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - - _binding = FragmentAssetButtonBinding.inflate(inflater, container, false) - val view = binding.root - val ctx = view.context - queue = Volley.newRequestQueue(ctx) - - fontDecoder = RandomFontDecoder(ctx) - val riveView = RiveAnimationView.Builder(ctx) - .setAssetLoader(fontDecoder) - .setAnimationName("Bounce") - .setLoop(Loop.PINGPONG) - .setResource(R.raw.fontz_oob) - .build() - - makeContainer(ctx).let { - it.addView(riveView) - binding.fragmentButtonContainer.addView(it) - } - randomFontButton(ctx).let { - binding.fragmentButtonContainer.addView(it) - } - - return view - } - - private class RandomFontDecoder(private val context: Context) : FileAssetLoader() { - lateinit var fontAsset: FontAsset - override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean { - if (asset is FontAsset) { - // Store a reference to the asset. - fontAsset = asset - - // Load the original font - context.resources.openRawResource(R.raw.roboto).use { - return asset.decode(it.readBytes()) - } - } - return false - } - } -} diff --git a/app/src/main/java/app/rive/runtime/example/AssetsActivity.kt b/app/src/main/java/app/rive/runtime/example/AssetsActivity.kt deleted file mode 100644 index beff6cadf..000000000 --- a/app/src/main/java/app/rive/runtime/example/AssetsActivity.kt +++ /dev/null @@ -1,13 +0,0 @@ -package app.rive.runtime.example - -import android.os.Bundle -import androidx.activity.ComponentActivity -import app.rive.runtime.example.utils.setEdgeToEdgeContent - -class AssetsActivity : ComponentActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.assets) - } -} diff --git a/app/src/main/java/app/rive/runtime/example/AudioAssetActivity.kt b/app/src/main/java/app/rive/runtime/example/AudioAssetActivity.kt deleted file mode 100644 index 12f68b973..000000000 --- a/app/src/main/java/app/rive/runtime/example/AudioAssetActivity.kt +++ /dev/null @@ -1,69 +0,0 @@ -package app.rive.runtime.example - -import android.content.Context -import android.os.Bundle -import androidx.activity.ComponentActivity -import app.rive.runtime.example.databinding.ActivityAudioExternalAssetBinding -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.core.AudioAsset -import app.rive.runtime.kotlin.core.FileAsset -import app.rive.runtime.kotlin.core.FileAssetLoader -import app.rive.runtime.kotlin.core.RiveAudio - -class AudioAssetActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.activity_audio_asset) - } -} - -class AudioExternalAssetActivity : ComponentActivity() { - - private lateinit var binding: ActivityAudioExternalAssetBinding - private val audioDecoder = AudioDecoder(this) - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivityAudioExternalAssetBinding.inflate(layoutInflater) - setEdgeToEdgeContent(binding.root) - - val riveView = RiveAnimationView.Builder(this) - .setAssetLoader(audioDecoder) - .setResource(R.raw.ping_pong_audio_demo) - .build() - - riveView.setVolume(0.75f) // Set the volume for the active artboard - - binding.main.addView(riveView) - } - - private class AudioDecoder(private val context: Context) : FileAssetLoader() { - override fun loadContents(asset: FileAsset, inBandBytes: ByteArray): Boolean { - if (asset is AudioAsset) { - val audioFilename = asset.uniqueFilename - val rawResource = when { - audioFilename.startsWith("racket1") -> R.raw.racket1 - audioFilename.startsWith("racket2") -> R.raw.racket2 - audioFilename.startsWith("table") -> R.raw.table - else -> 0 - } - - if (rawResource <= 0) { - // Unknown resource... - return false - } - - val audio = context - .resources - .openRawResource(rawResource) - .use { - RiveAudio.make(it.readBytes()) - } - asset.audio = audio - return true - } - return false - } - } -} diff --git a/app/src/main/java/app/rive/runtime/example/BindArtboardWithDataActivity.kt b/app/src/main/java/app/rive/runtime/example/BindArtboardWithDataActivity.kt deleted file mode 100644 index 62a33ff52..000000000 --- a/app/src/main/java/app/rive/runtime/example/BindArtboardWithDataActivity.kt +++ /dev/null @@ -1,43 +0,0 @@ -package app.rive.runtime.example - -import android.os.Bundle -import android.util.Log -import androidx.activity.ComponentActivity -import androidx.lifecycle.lifecycleScope -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.RiveAnimationView -import kotlinx.coroutines.launch - -class BindArtboardWithDataActivity : ComponentActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - val rive = RiveAnimationView(this) - rive.setRiveResource( - R.raw.data_bind_test_impl, - "Bindable Artboard Host", - autoBind = true, - autoplay = true - ) - - setEdgeToEdgeContent(rive) - - val file = rive.file!! - val vmi = file.getViewModelByName("Test Bound Artboard Child VM") - .createInstanceFromName("Override") - val bindableArtboard = file.createBindableArtboardByName("Bindable Artboard With VM", vmi) - - lifecycleScope.launch { - vmi.getStringProperty("Echo String").valueFlow.collect { - Log.i("BindArtboard", "New echo string: $it") - } - } - - val artboardProperty = - rive.controller.stateMachines.first().viewModelInstance!!.getArtboardProperty("Child Artboard") - - artboardProperty.set(bindableArtboard) - bindableArtboard.release() // Release the reference we hold from creation - } -} diff --git a/app/src/main/java/app/rive/runtime/example/BlendActivity.kt b/app/src/main/java/app/rive/runtime/example/BlendActivity.kt deleted file mode 100644 index 6be19f0d6..000000000 --- a/app/src/main/java/app/rive/runtime/example/BlendActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package app.rive.runtime.example - -import android.os.Bundle -import androidx.activity.ComponentActivity -import app.rive.runtime.example.utils.setEdgeToEdgeContent - -class BlendActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.blend) - } -} diff --git a/app/src/main/java/app/rive/runtime/example/ButtonActivity.kt b/app/src/main/java/app/rive/runtime/example/ButtonActivity.kt deleted file mode 100644 index bb671be09..000000000 --- a/app/src/main/java/app/rive/runtime/example/ButtonActivity.kt +++ /dev/null @@ -1,20 +0,0 @@ -package app.rive.runtime.example - -import android.os.Bundle -import android.widget.TextView -import androidx.activity.ComponentActivity -import app.rive.runtime.example.utils.RiveButton -import app.rive.runtime.example.utils.setEdgeToEdgeContent - -class ButtonActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.button) - - val button = findViewById(R.id.myButton) - button.setOnClickListener { - val counterText = findViewById(R.id.myButtonCounter) - counterText.text = (counterText.text.toString().toInt() + 1).toString() - } - } -} diff --git a/app/src/main/java/app/rive/runtime/example/DynamicTextActivity.kt b/app/src/main/java/app/rive/runtime/example/DynamicTextActivity.kt deleted file mode 100644 index 0aad9b63e..000000000 --- a/app/src/main/java/app/rive/runtime/example/DynamicTextActivity.kt +++ /dev/null @@ -1,55 +0,0 @@ -package app.rive.runtime.example - -import android.os.Bundle -import android.text.Editable -import android.text.TextWatcher -import android.util.Log -import android.widget.EditText -import androidx.activity.ComponentActivity -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.RiveAnimationView - -/** - * Dynamically change a Rive Text Run value. In this example the run is named: "name" For the run to - * be discoverable at runtime, the name as to be set in the editor. - * - * See: https://rive.app/community/doc/text/docn2E6y1lXo - */ -class DynamicTextActivity : ComponentActivity(), TextWatcher { - private val animationView by lazy(LazyThreadSafetyMode.NONE) { - findViewById(R.id.dynamic_text) - } - - /** Reference to a [RiveTextValueRun]. */ - private val textRun by lazy(LazyThreadSafetyMode.NONE) { - animationView.controller.activeArtboard?.textRun("name") - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.dynamic_text) - - val editText = findViewById(R.id.text_run_value) - editText.addTextChangedListener(this) - } - - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - // get the current value of the reference - textRun?.text?.let { Log.i("text-value-run", "Run before change: $it") } - - // or you can get the current value with: - // animationView.getTextRunValue("name").let { Log.i("text-value-run", "Run before change: $it") } - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - // update the reference - textRun?.text = s.toString() - - // or update the value using: - // animationView.setTextRunValue("name", s.toString()) - } - - override fun afterTextChanged(s: Editable?) { - textRun?.text?.let { Log.i("text-value-run", "Run after change: $it") } - } -} diff --git a/app/src/main/java/app/rive/runtime/example/EventsActivity.kt b/app/src/main/java/app/rive/runtime/example/EventsActivity.kt deleted file mode 100644 index f07115dff..000000000 --- a/app/src/main/java/app/rive/runtime/example/EventsActivity.kt +++ /dev/null @@ -1,121 +0,0 @@ -package app.rive.runtime.example - -import android.content.Intent -import android.net.Uri -import android.os.Bundle -import android.util.Log -import android.widget.TextView -import androidx.activity.ComponentActivity -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.RiveAnimationView -import app.rive.runtime.kotlin.controllers.RiveFileController -import app.rive.runtime.kotlin.core.RiveEvent -import app.rive.runtime.kotlin.core.RiveGeneralEvent -import app.rive.runtime.kotlin.core.RiveOpenURLEvent - -class EventsActivity : ComponentActivity() { - - private val starRatingAnimation: RiveAnimationView by lazy(LazyThreadSafetyMode.NONE) { - findViewById(R.id.star_event_asset) - } - - private val urlButtonAnimation: RiveAnimationView by lazy(LazyThreadSafetyMode.NONE) { - findViewById(R.id.url_event_button) - } - - private val logButtonAnimation: RiveAnimationView by lazy(LazyThreadSafetyMode.NONE) { - findViewById(R.id.log_event_button) - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.events) - - setStarRating() - setUrlButton() - setLogButton() - } - - override fun onDestroy() { - starRatingAnimation.removeEventListener(starRatingListener) - urlButtonAnimation.removeEventListener(urlButtonListener) - logButtonAnimation.removeEventListener(logButtonListener) - super.onDestroy() - } - - private lateinit var starRatingListener: RiveFileController.RiveEventListener - private lateinit var urlButtonListener: RiveFileController.RiveEventListener - private lateinit var logButtonListener: RiveFileController.RiveEventListener - - private fun setStarRating() { - val starRatingTextView = findViewById(R.id.star_rating) - - starRatingListener = object : RiveFileController.RiveEventListener { - override fun notifyEvent(event: RiveEvent) { - when (event) { - is RiveGeneralEvent -> { - Log.i( - "RiveEvent", - "General event received, name: ${event.name}, delaySeconds: ${event.delay} properties: ${event.properties}" - ) - runOnUiThread { - // This event contains a number value with the name "rating" - // to indicate the star rating selected - if (event.properties.containsKey("rating")) { - starRatingTextView.text = - "Star rating: ${event.properties["rating"]}" - } - } - } - } - } - } - starRatingAnimation.addEventListener(starRatingListener) - } - - private fun setUrlButton() { - urlButtonListener = object : RiveFileController.RiveEventListener { - override fun notifyEvent(event: RiveEvent) { - when (event) { - is RiveOpenURLEvent -> { - Log.i("RiveEvent", "Open URL Rive event: ${event.url}") - runOnUiThread { - try { - val uri = Uri.parse(event.url) - val browserIntent = - Intent(Intent.ACTION_VIEW, uri) - startActivity(browserIntent) - } catch (e: Exception) { - Log.i("RiveEvent", "Not a valid URL ${event.url}") - } - } - } - } - } - } - urlButtonAnimation.addEventListener(urlButtonListener) - } - - private fun setLogButton() { - logButtonListener = object : RiveFileController.RiveEventListener { - override fun notifyEvent(event: RiveEvent) { - when (event) { - is RiveOpenURLEvent -> { - Log.i("RiveEvent", "Open URL Rive event: ${event.url}") - } - - is RiveGeneralEvent -> { - Log.i("RiveEvent", "General Rive event") - } - } - Log.i("RiveEvent", "name: ${event.name}") - Log.i("RiveEvent", "delay: ${event.delay}") - Log.i("RiveEvent", "type: ${event.type}") - Log.i("RiveEvent", "properties: ${event.properties}") - // `data` contains all information in the event - Log.i("RiveEvent", "data: ${event.data}") - } - } - logButtonAnimation.addEventListener(logButtonListener) - } -} diff --git a/app/src/main/java/app/rive/runtime/example/FontFallback.kt b/app/src/main/java/app/rive/runtime/example/FontFallback.kt deleted file mode 100644 index 82c2b6c75..000000000 --- a/app/src/main/java/app/rive/runtime/example/FontFallback.kt +++ /dev/null @@ -1,76 +0,0 @@ -package app.rive.runtime.example - -import android.os.Bundle -import androidx.activity.ComponentActivity -import app.rive.runtime.example.databinding.ActivityFontFallbackBinding -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.fonts.FontBytes -import app.rive.runtime.kotlin.fonts.FontFallbackStrategy -import app.rive.runtime.kotlin.fonts.FontHelper -import app.rive.runtime.kotlin.fonts.Fonts - -class FontFallback : ComponentActivity(), FontFallbackStrategy { - - private lateinit var binding: ActivityFontFallbackBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - binding = ActivityFontFallbackBinding.inflate(layoutInflater) - setEdgeToEdgeContent(binding.root) - - updateTextRuns() - updateThaiText() - - FontFallbackStrategy.stylePicker = this - } - - // This class is a `FontFallbackStrategy` and this override picks fonts based on weight. - override fun getFont(weight: Fonts.Weight): List { - var fontMatch = Fonts.FontOpts( - familyName = "serif", - ) - when { - // 'Invert' the weights to make the fallback chars more prominent. - weight.weight < 400 -> fontMatch = - Fonts.FontOpts(familyName = "sans-serif", weight = Fonts.Weight(900)) - - weight.weight > 400 -> fontMatch = - Fonts.FontOpts(familyName = "sans-serif", weight = Fonts.Weight(100)) - } - val fonts = listOf( - fontMatch, - // Tag a Thai font along so our second view can draw the glyphs - Fonts.FontOpts("NotoSansThai-Regular.ttf") - ) - return fonts.mapNotNull { FontHelper.getFallbackFontBytes(it) } - } - - /** - * The Rive file displayed here contains four blocks of text each with three different runs - * Also, the Rive file only exported the glyphs that have been specified in the file, and each - * line is made of three runs: | ABC | DEF | GHI | - * - * Modifying these runs with glyphs that are not part of the { ABCDEFGHI } set will require a - * fallback. - */ - private fun updateTextRuns() { - binding.riveViewStylePicker.setTextRunValue("ultralight_start", "aBc ") - binding.riveViewStylePicker.setTextRunValue("ultralight_mid", "DeF") - binding.riveViewStylePicker.setTextRunValue("ultralight_end", " gHi") - - binding.riveViewStylePicker.setTextRunValue("regular_mid", " def ") - - binding.riveViewStylePicker.setTextRunValue("bold_start", "PQR ") - binding.riveViewStylePicker.setTextRunValue("bold_end", "XYZ") - - binding.riveViewStylePicker.setTextRunValue("black_mid", " def ") - } - - private fun updateThaiText() { - val thaiHelloText = "สวัสดี " - val thaiWorldText = " โลก" - binding.riveViewThai.setTextRunValue("regular_start", thaiHelloText) - binding.riveViewThai.setTextRunValue("regular_end", thaiWorldText) - } -} diff --git a/app/src/main/java/app/rive/runtime/example/FrameActivity.kt b/app/src/main/java/app/rive/runtime/example/FrameActivity.kt deleted file mode 100644 index b3578aa7d..000000000 --- a/app/src/main/java/app/rive/runtime/example/FrameActivity.kt +++ /dev/null @@ -1,69 +0,0 @@ -package app.rive.runtime.example - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentActivity -import androidx.fragment.app.commit -import app.rive.runtime.example.utils.setEdgeToEdgeContent -import app.rive.runtime.kotlin.RiveAnimationView - -class FrameActivity : FragmentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setEdgeToEdgeContent(R.layout.activity_frame) - - // Don't do anything if restoring a previous state. - if (savedInstanceState != null) { - return - } - - supportFragmentManager.commit { - setReorderingAllowed(true) - add(R.id.frame_fragment_container, TextFragment()) - } - - findViewById