From a6f18c878387c0eafe33c1bd387d0912bced9f53 Mon Sep 17 00:00:00 2001 From: Luigi Rosso Date: Mon, 29 Nov 2021 16:05:18 -0800 Subject: [PATCH] Small name change to match C++ runtime. --- lib/src/core/importers/file_asset_importer.dart | 4 ++-- lib/src/rive_file.dart | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/src/core/importers/file_asset_importer.dart b/lib/src/core/importers/file_asset_importer.dart index c6687d0..4a600c9 100644 --- a/lib/src/core/importers/file_asset_importer.dart +++ b/lib/src/core/importers/file_asset_importer.dart @@ -7,12 +7,12 @@ import 'package:rive/src/rive_core/assets/file_asset_contents.dart'; /// A helper for resolving Rive file assets (like images) that are provided out /// of band with regards to the .riv file itself. // ignore: one_member_abstracts -abstract class RiveAssetResolver { +abstract class FileAssetResolver { Future loadContents(FileAsset asset); } class FileAssetImporter extends ImportStackObject { - final RiveAssetResolver? assetResolver; + final FileAssetResolver? assetResolver; final FileAsset fileAsset; FileAssetImporter(this.fileAsset, this.assetResolver); diff --git a/lib/src/rive_file.dart b/lib/src/rive_file.dart index ec5d1eb..dd8f05e 100644 --- a/lib/src/rive_file.dart +++ b/lib/src/rive_file.dart @@ -89,7 +89,7 @@ class RiveFile { Backboard _backboard = Backboard.unknown; final _artboards = []; - final RiveAssetResolver? _assetResolver; + final FileAssetResolver? _assetResolver; RiveFile._( BinaryReader reader, @@ -247,7 +247,7 @@ class RiveFile { /// [RiveUnsupportedVersionException] if the version is not supported. factory RiveFile.import( ByteData bytes, { - RiveAssetResolver? assetResolver, + FileAssetResolver? assetResolver, }) { var reader = BinaryReader(bytes); return RiveFile._(reader, RuntimeHeader.read(reader), assetResolver); @@ -273,7 +273,7 @@ class RiveFile { /// your file contains images that needed to be loaded with separate network /// requests. static Future network(String url, - {RiveAssetResolver? assetResolver}) async { + {FileAssetResolver? assetResolver}) async { final res = await http.get(Uri.parse(url)); final bytes = ByteData.view(res.bodyBytes.buffer); return RiveFile.import(bytes, assetResolver: assetResolver); @@ -298,7 +298,7 @@ class RiveFile { } /// Resolves a Rive asset from the network provided a [baseUrl]. -class NetworkAssetResolver extends RiveAssetResolver { +class NetworkAssetResolver extends FileAssetResolver { final String baseUrl; NetworkAssetResolver(this.baseUrl); @@ -309,7 +309,7 @@ class NetworkAssetResolver extends RiveAssetResolver { } } -class _LocalAssetResolver extends RiveAssetResolver { +class _LocalAssetResolver extends FileAssetResolver { String basePath; _LocalAssetResolver(this.basePath); @override