flutter/rive-flutter
1
0
Fork 0
mirror of https://github.com/rive-app/rive-flutter.git synced 2025-06-26 01:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from rive-app/fix_minor_version

Browse Source 
Fix minor version reading newer minor version.
This commit is contained in:
Matt Sullivan
2020-12-22 16:30:44 -08:00
committed by GitHub
parent e24e873f9f dd5cde26aa
commit ec2f36e53c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/src/rive_file.dart
View File

@ -153,8 +153,11 @@ class RiveFile {
assert(!artboard.children.contains(artboard), assert(!artboard.children.contains(artboard),
'artboard should never contain itself as a child'); 'artboard should never contain itself as a child');
for (final object in artboard.objects) { for (final object in artboard.objects.toList(growable:false)) {
object?.onAdded(); if(object == null) {
continue;
}
object.onAdded();
} }
artboard.clean(); artboard.clean();
} }
@ -165,7 +168,8 @@ class RiveFile {
void _skipProperty(BinaryReader reader, int propertyKey, void _skipProperty(BinaryReader reader, int propertyKey,
HashMap<int, CoreFieldType> propertyToField) { HashMap<int, CoreFieldType> propertyToField) {
var field = propertyToField[propertyKey]; var field =
RiveCoreContext.coreType(propertyKey) ?? propertyToField[propertyKey];
if (field == null) { if (field == null) {
throw UnsupportedError('Unsupported property key $propertyKey. ' throw UnsupportedError('Unsupported property key $propertyKey. '
'A new runtime is likely necessary to play this file.'); 'A new runtime is likely necessary to play this file.');

6
lib/src/runtime_artboard.dart
View File

@ -18,8 +18,10 @@ class RuntimeArtboard extends Artboard implements CoreContext {
@override @override
T addObject<T extends Core>(T object) { T addObject<T extends Core>(T object) {
object.context = this; if (object != null) {
object.id = _objects.length; object.context = this;
object.id = _objects.length;
}
_objects.add(object); _objects.add(object);
return object; return object;
} }