Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
.DS_Store
local.properties
/tmp
/release
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<p align="center">
<a href="https://android-arsenal.com/api?level=21"><img alt="API" src="https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat"/></a>
<a href="https://jitpack.io/#LottieFiles/dotlottie-android"><img alt="API" src="https://jitpack.io/v/LottieFiles/dotlottie-android.svg"/></a>
<a href="https://github.com/LottieFiles/dotlottie-rs/releases/tag/v0.1.47"><img alt="API" src="https://img.shields.io/badge/dotlottie--rs-0.1.47-blue"/></a>
<a href="https://github.com/LottieFiles/dotlottie-rs/releases/tag/v0.1.58"><img alt="API" src="https://img.shields.io/badge/dotlottie--rs-0.1.58-blue"/></a>
<a href="LICENSE"><img alt="License" src="https://img.shields.io/badge/License-MIT-yellow.svg"/></a>
</p>
<br />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ abstract class BuildDotLottieRsTask : DefaultTask() {
add("make/android.mk")
addAll(makeTargets)
add("android-package")
add("ANDROID_DEFAULT_FEATURES=tvg,tvg-sw,c_api")
add("ANDROID_DEFAULT_FEATURES=tvg,tvg-cpu,tvg-gl,c_api")
add("ANDROID_FEATURES=$featuresArg")
add("ANDROID_NDK_HOME=$ndkHome")
add("API_LEVEL=${apiLevel.get()}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class RustBuildPlugin : Plugin<Project> {
"tvg-png",
"tvg-jpg",
"tvg-ttf",
"tvg-otf",
"tvg-lottie-expressions",
"tvg-threads"
)
Expand Down
2 changes: 1 addition & 1 deletion deps/dotlottie-rs
Submodule dotlottie-rs updated 171 files
1 change: 1 addition & 0 deletions dotlottie/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dotlottieRust {
"tvg-png", // PNG image support
"tvg-jpg", // JPEG image support
"tvg-ttf", // TrueType font support
"tvg-otf", // OpenType font support
"tvg-lottie-expressions", // Lottie expression evaluation
"tvg-threads", // multi-threaded rendering
)
Expand Down
78 changes: 45 additions & 33 deletions dotlottie/src/main/cpp/dotlottie_player.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef DOTLOTTIE_PLAYER_H
#define DOTLOTTIE_PLAYER_H

/* Generated with cbindgen:0.29.2 */
/* Generated with cbindgen:0.29.4 */

/* Warning, this file is autogenerated. Do not modify this! */

Expand Down Expand Up @@ -45,11 +45,13 @@ typedef enum dotlottieFit {
None,
} dotlottieFit;

typedef enum dotlottiePlaybackStatus {
Playing = 0,
Paused = 1,
Stopped = 2,
} dotlottiePlaybackStatus;
typedef enum dotlottieStatus {
Idle = 0,
Playing = 1,
Paused = 2,
Stopped = 3,
Tweening = 4,
} dotlottieStatus;

typedef enum dotlottieColorSpace {
ABGR8888,
Expand Down Expand Up @@ -101,6 +103,23 @@ typedef struct dotlottiePlayer dotlottiePlayer;

typedef struct dotlottieRgba dotlottieRgba;

/**
* Loads bytes for an asset `src` the player cannot resolve itself.
* Return `true` with `*out_data`/`*out_size` set to supply the asset,
* `false` to skip it. The buffer is copied before the finalizer runs.
*/
typedef bool (*dotlottieDotLottieAssetResolver)(const char *src,
const uint8_t **out_data,
uintptr_t *out_size,
void *user_data);

/**
* Called after the resolver's buffer has been copied, so the caller can free it.
*/
typedef void (*dotlottieDotLottieAssetResolverFinalizer)(const uint8_t *data,
uintptr_t size,
void *user_data);

typedef struct dotlottieLayout {
enum dotlottieFit fit;
float align[2];
Expand Down Expand Up @@ -284,6 +303,18 @@ enum dotlottieDotLottieResult dotlottie_load_dotlottie_data(struct dotlottiePlay
const char *file_data,
uintptr_t file_size);

/**
* Set a resolver for assets outside the dotLottie container (remote URLs,
* external paths). Called synchronously when ThorVG first needs the asset;
* takes effect on the next load. Pass a NULL `resolver` to clear. Pass a
* `finalizer` to free the resolver's buffer after it has been copied, or NULL
* if the buffer is static.
*/
enum dotlottieDotLottieResult dotlottie_set_asset_resolver(struct dotlottiePlayer *ptr,
dotlottieDotLottieAssetResolver resolver,
dotlottieDotLottieAssetResolverFinalizer finalizer,
void *user_data);

/**
* Get the manifest as a JSON string.
*
Expand Down Expand Up @@ -490,23 +521,10 @@ enum dotlottieDotLottieResult dotlottie_get_current_loop_count(struct dotlottieP
uint32_t *result);

/**
* Returns whether an animation is loaded.
* Returns the current status (Idle, Playing, Paused, Stopped, or Tweening).
* Returns Idle if the pointer is invalid.
*/
bool dotlottie_is_loaded(struct dotlottiePlayer *ptr);

/**
* Returns the current playback status.
*
* Priority order: Playing > Paused > Stopped
*
* # Parameters
* - `ptr`: Pointer to the Player instance
*
* # Returns
* The current PlaybackStatus (Playing, Paused, or Stopped)
* Returns Stopped if the pointer is invalid
*/
enum dotlottiePlaybackStatus dotlottie_get_playback_status(struct dotlottiePlayer *ptr);
enum dotlottieStatus dotlottie_status(struct dotlottiePlayer *ptr);

enum dotlottieDotLottieResult dotlottie_play(struct dotlottiePlayer *ptr);

Expand Down Expand Up @@ -673,18 +691,12 @@ enum dotlottieDotLottieResult dotlottie_set_position_slot(struct dotlottiePlayer
float y);

/**
* Set an image slot from a file path
*/
enum dotlottieDotLottieResult dotlottie_set_image_slot_path(struct dotlottiePlayer *ptr,
const char *slot_id,
const char *path);

/**
* Set an image slot from a data URL (base64 encoded)
* Set an image slot from a source string (a `data:` URI, an `http(s)://` URL,
* or a file in the package `i/` folder referenced by name).
*/
enum dotlottieDotLottieResult dotlottie_set_image_slot_data_url(struct dotlottiePlayer *ptr,
const char *slot_id,
const char *data_url);
enum dotlottieDotLottieResult dotlottie_set_image_slot_src(struct dotlottiePlayer *ptr,
const char *slot_id,
const char *src);

/**
* Returns the number of slot IDs in the current animation.
Expand Down
52 changes: 17 additions & 35 deletions dotlottie/src/main/cpp/jni_bridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,8 @@ static jint nativeSetVectorSlot(JNIEnv *env, jclass, jlong ptr, jstring slotId,
jfloat x, jfloat y);
static jint nativeSetPositionSlot(JNIEnv *env, jclass, jlong ptr,
jstring slotId, jfloat x, jfloat y);
static jint nativeSetImageSlotPath(JNIEnv *env, jclass, jlong ptr,
jstring slotId, jstring path);
static jint nativeSetImageSlotDataUrl(JNIEnv *env, jclass, jlong ptr,
jstring slotId, jstring dataUrl);
static jint nativeSetImageSlotSrc(JNIEnv *env, jclass, jlong ptr,
jstring slotId, jstring src);
static jstring nativeGetSlotStr(JNIEnv *env, jclass, jlong ptr, jstring slotId);

// Viewport
Expand Down Expand Up @@ -434,28 +432,26 @@ jint nativeSetFrame(JNIEnv *env, jclass, jlong ptr, jfloat frame) {

jboolean nativeIsLoaded(JNIEnv *env, jclass, jlong ptr) {
auto *player = reinterpret_cast<dotlottiePlayer *>(ptr);
return dotlottie_is_loaded(player) ? JNI_TRUE : JNI_FALSE;
return dotlottie_status(player) != dotlottieStatus::Idle ? JNI_TRUE
: JNI_FALSE;
}

jboolean nativeIsPlaying(JNIEnv *env, jclass, jlong ptr) {
auto *player = reinterpret_cast<dotlottiePlayer *>(ptr);
return dotlottie_get_playback_status(player) == dotlottiePlaybackStatus::Playing
? JNI_TRUE
: JNI_FALSE;
return dotlottie_status(player) == dotlottieStatus::Playing ? JNI_TRUE
: JNI_FALSE;
}

jboolean nativeIsPaused(JNIEnv *env, jclass, jlong ptr) {
auto *player = reinterpret_cast<dotlottiePlayer *>(ptr);
return dotlottie_get_playback_status(player) == dotlottiePlaybackStatus::Paused
? JNI_TRUE
: JNI_FALSE;
return dotlottie_status(player) == dotlottieStatus::Paused ? JNI_TRUE
: JNI_FALSE;
}

jboolean nativeIsStopped(JNIEnv *env, jclass, jlong ptr) {
auto *player = reinterpret_cast<dotlottiePlayer *>(ptr);
return dotlottie_get_playback_status(player) == dotlottiePlaybackStatus::Stopped
? JNI_TRUE
: JNI_FALSE;
return dotlottie_status(player) == dotlottieStatus::Stopped ? JNI_TRUE
: JNI_FALSE;
}

jboolean nativeIsComplete(JNIEnv *env, jclass, jlong ptr) {
Expand Down Expand Up @@ -913,25 +909,14 @@ jint nativeSetPositionSlot(JNIEnv *env, jclass, jlong ptr, jstring slotId,
return static_cast<jint>(result);
}

jint nativeSetImageSlotPath(JNIEnv *env, jclass, jlong ptr, jstring slotId,
jstring path) {
jint nativeSetImageSlotSrc(JNIEnv *env, jclass, jlong ptr, jstring slotId,
jstring src) {
auto *player = reinterpret_cast<dotlottiePlayer *>(ptr);
const char *cSlotId = env->GetStringUTFChars(slotId, nullptr);
const char *cPath = env->GetStringUTFChars(path, nullptr);
auto result = dotlottie_set_image_slot_path(player, cSlotId, cPath);
const char *cSrc = env->GetStringUTFChars(src, nullptr);
auto result = dotlottie_set_image_slot_src(player, cSlotId, cSrc);
env->ReleaseStringUTFChars(slotId, cSlotId);
env->ReleaseStringUTFChars(path, cPath);
return static_cast<jint>(result);
}

jint nativeSetImageSlotDataUrl(JNIEnv *env, jclass, jlong ptr, jstring slotId,
jstring dataUrl) {
auto *player = reinterpret_cast<dotlottiePlayer *>(ptr);
const char *cSlotId = env->GetStringUTFChars(slotId, nullptr);
const char *cDataUrl = env->GetStringUTFChars(dataUrl, nullptr);
auto result = dotlottie_set_image_slot_data_url(player, cSlotId, cDataUrl);
env->ReleaseStringUTFChars(slotId, cSlotId);
env->ReleaseStringUTFChars(dataUrl, cDataUrl);
env->ReleaseStringUTFChars(src, cSrc);
return static_cast<jint>(result);
}

Expand Down Expand Up @@ -1669,12 +1654,9 @@ static JNINativeMethod playerMethods[] = {
(void *)nativeSetVectorSlot},
{"nativeSetPositionSlot", "(JLjava/lang/String;FF)I",
(void *)nativeSetPositionSlot},
{"nativeSetImageSlotPath",
"(JLjava/lang/String;Ljava/lang/String;)I",
(void *)nativeSetImageSlotPath},
{"nativeSetImageSlotDataUrl",
{"nativeSetImageSlotSrc",
"(JLjava/lang/String;Ljava/lang/String;)I",
(void *)nativeSetImageSlotDataUrl},
(void *)nativeSetImageSlotSrc},
{"nativeGetSlotStr", "(JLjava/lang/String;)Ljava/lang/String;",
(void *)nativeGetSlotStr},

Expand Down
2 changes: 1 addition & 1 deletion dotlottie/src/main/cpp/version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dlplayer-version=0.1.58-1522301
dlplayer-version=0.1.58-3bb9d23
api-type=c-api
Original file line number Diff line number Diff line change
Expand Up @@ -427,12 +427,8 @@ class DotLottieController {
return dlplayer?.setPositionSlot(slotId, position) ?: false
}

fun setImageSlotPath(slotId: String, path: String): Boolean {
return dlplayer?.setImageSlotPath(slotId, path) ?: false
}

fun setImageSlotDataUrl(slotId: String, dataUrl: String): Boolean {
return dlplayer?.setImageSlotDataUrl(slotId, dataUrl) ?: false
fun setImageSlotSrc(slotId: String, src: String): Boolean {
return dlplayer?.setImageSlotSrc(slotId, src) ?: false
}

fun clearSlots(): Boolean {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ class DotLottieDrawable(
override fun stop() {
dlPlayer?.stop()
choreographer.removeFrameCallback(frameCallback)
scheduleFrame(forceUpdate = true)
invalidateSelf()
}

Expand Down Expand Up @@ -466,14 +467,8 @@ class DotLottieDrawable(
return result
}

fun setImageSlotPath(slotId: String, path: String): Boolean {
val result = dlPlayer?.setImageSlotPath(slotId, path) ?: false
if (result) scheduleFrame(forceUpdate = true)
return result
}

fun setImageSlotDataUrl(slotId: String, dataUrl: String): Boolean {
val result = dlPlayer?.setImageSlotDataUrl(slotId, dataUrl) ?: false
fun setImageSlotSrc(slotId: String, src: String): Boolean {
val result = dlPlayer?.setImageSlotSrc(slotId, src) ?: false
if (result) scheduleFrame(forceUpdate = true)
return result
}
Expand Down Expand Up @@ -511,6 +506,7 @@ class DotLottieDrawable(
fun pause() {
dlPlayer?.pause()
choreographer.removeFrameCallback(frameCallback)
scheduleFrame(forceUpdate = true)
}

fun stateMachineStart(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,8 @@ class DotLottieAnimation @JvmOverloads constructor(
return mLottieDrawable?.setPositionSlot(slotId, position) ?: false
}

fun setImageSlotPath(slotId: String, path: String): Boolean {
return mLottieDrawable?.setImageSlotPath(slotId, path) ?: false
}

fun setImageSlotDataUrl(slotId: String, dataUrl: String): Boolean {
return mLottieDrawable?.setImageSlotDataUrl(slotId, dataUrl) ?: false
fun setImageSlotSrc(slotId: String, src: String): Boolean {
return mLottieDrawable?.setImageSlotSrc(slotId, src) ?: false
}

fun clearSlots(): Boolean {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -799,12 +799,8 @@ class DotLottieGLAnimation @JvmOverloads constructor(
return dlPlayer?.setPositionSlot(slotId, position) ?: false
}

fun setImageSlotPath(slotId: String, path: String): Boolean {
return dlPlayer?.setImageSlotPath(slotId, path) ?: false
}

fun setImageSlotDataUrl(slotId: String, dataUrl: String): Boolean {
return dlPlayer?.setImageSlotDataUrl(slotId, dataUrl) ?: false
fun setImageSlotSrc(slotId: String, src: String): Boolean {
return dlPlayer?.setImageSlotSrc(slotId, src) ?: false
}

fun clearSlots(): Boolean {
Expand Down
Binary file modified dotlottie/src/main/jniLibs/arm64-v8a/libdotlottie_player.so
Binary file not shown.
Binary file modified dotlottie/src/main/jniLibs/armeabi-v7a/libdotlottie_player.so
Binary file not shown.
Binary file modified dotlottie/src/main/jniLibs/x86/libdotlottie_player.so
Binary file not shown.
Binary file modified dotlottie/src/main/jniLibs/x86_64/libdotlottie_player.so
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,8 @@ class DotLottiePlayer {
return result == 0
}

fun setImageSlotPath(slotId: String, path: String): Boolean {
val result = JNI.nativeSetImageSlotPath(nativePtr, slotId, path)
return result == 0
}

fun setImageSlotDataUrl(slotId: String, dataUrl: String): Boolean {
val result = JNI.nativeSetImageSlotDataUrl(nativePtr, slotId, dataUrl)
fun setImageSlotSrc(slotId: String, src: String): Boolean {
val result = JNI.nativeSetImageSlotSrc(nativePtr, slotId, src)
return result == 0
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,7 @@ object DotLottiePlayer {
external fun nativeSetPositionSlot(ptr: Long, slotId: String, x: Float, y: Float): Int

@JvmStatic
external fun nativeSetImageSlotPath(ptr: Long, slotId: String, path: String): Int

@JvmStatic
external fun nativeSetImageSlotDataUrl(ptr: Long, slotId: String, dataUrl: String): Int
external fun nativeSetImageSlotSrc(ptr: Long, slotId: String, src: String): Int

@JvmStatic
external fun nativeGetSlotStr(ptr: Long, slotId: String): String
Expand Down
Loading
Loading