-
Notifications
You must be signed in to change notification settings - Fork 9
feat: add RiveImages.loadFromURLAsync for dynamic image loading #39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
585e875
feat(ios): add RiveImages.loadFromURLAsync for dynamic image loading
mfazekas 1f4522b
feat: android implementation of RiveImage
mfazekas 79e9ddf
review suggestions
mfazekas 65446d0
remove default ctor from HybridRiveImage
mfazekas 5ab2162
refactor: use HTTPLoader for loading files for http
mfazekas 73436b1
test: added error boundary to suspense example
mfazekas 86e017f
refactor: throw our MalformedURLException
mfazekas 154e9e1
fix: fix linter error ImageURLS
mfazekas 4b82bde
tweak swift lint
mfazekas 93829ba
fix: revert rive file parse back to io threads
mfazekas 613395d
kotlin:lint fixes
mfazekas d7af261
chore: disable ktlint for generated nitrogen files
mfazekas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
android/src/main/java/com/margelo/nitro/rive/HTTPLoader.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package com.margelo.nitro.rive | ||
|
|
||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import java.net.HttpURLConnection | ||
| import java.net.MalformedURLException | ||
| import java.net.URL | ||
|
|
||
| sealed class HTTPLoaderException(message: String) : Exception(message) { | ||
| class InvalidURL(url: String) : HTTPLoaderException("Invalid URL: $url") | ||
| class HttpError(val statusCode: Int, url: String) : | ||
| HTTPLoaderException("HTTP error $statusCode for $url") | ||
| } | ||
|
|
||
| object HTTPLoader { | ||
| suspend fun downloadBytes(url: String): ByteArray = withContext(Dispatchers.IO) { | ||
| val urlObj = try { | ||
| URL(url) | ||
| } catch (e: MalformedURLException) { | ||
| throw HTTPLoaderException.InvalidURL(url) | ||
| } | ||
| val connection = urlObj.openConnection() as HttpURLConnection | ||
|
|
||
| try { | ||
| connection.requestMethod = "GET" | ||
| val statusCode = connection.responseCode | ||
|
|
||
| if (statusCode !in 200..299) { | ||
| throw HTTPLoaderException.HttpError(statusCode, url) | ||
| } | ||
|
|
||
| connection.inputStream.use { it.readBytes() } | ||
| } finally { | ||
| connection.disconnect() | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
android/src/main/java/com/margelo/nitro/rive/HybridRiveImage.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package com.margelo.nitro.rive | ||
|
|
||
| import androidx.annotation.Keep | ||
| import app.rive.runtime.kotlin.core.RiveRenderImage | ||
| import com.facebook.proguard.annotations.DoNotStrip | ||
|
|
||
| @Keep | ||
| @DoNotStrip | ||
| class HybridRiveImage( | ||
| val renderImage: RiveRenderImage, | ||
| private val dataSize: Int | ||
| ) : HybridRiveImageSpec() { | ||
| override val byteSize: Double | ||
| get() = dataSize.toDouble() | ||
| } |
22 changes: 22 additions & 0 deletions
22
android/src/main/java/com/margelo/nitro/rive/HybridRiveImageFactory.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.margelo.nitro.rive | ||
|
|
||
| import androidx.annotation.Keep | ||
| import app.rive.runtime.kotlin.core.RiveRenderImage | ||
| import com.facebook.proguard.annotations.DoNotStrip | ||
| import com.margelo.nitro.core.Promise | ||
|
|
||
| @Keep | ||
| @DoNotStrip | ||
| class HybridRiveImageFactory : HybridRiveImageFactorySpec() { | ||
| override fun loadFromURLAsync(url: String): Promise<HybridRiveImageSpec> { | ||
| return Promise.async { | ||
| try { | ||
| val imageData = HTTPLoader.downloadBytes(url) | ||
| val renderImage = RiveRenderImage.fromEncoded(imageData) | ||
| HybridRiveImage(renderImage, imageData.size) | ||
| } catch (e: Exception) { | ||
| throw Exception("Failed to load image from URL: $url - ${e.message}", e) | ||
|
mfazekas marked this conversation as resolved.
|
||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.