Merge remote-tracking branch 'origin/dev'

Author: m-r-davari

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.3.1
+
+### Fixes
+* Fix the issue in fetching available animations and textures in iOS
+
 ## v1.3.0
 
 ### Features

README.md

@@ -104,7 +104,7 @@ Flutter3DViewer(
 
 ```yaml
 dependencies:
-  flutter_3d_controller: ^1.3.0
+  flutter_3d_controller: ^1.3.1
 ```
 
 ### `AndroidManifest.xml` (Android 9+ only)

example/pubspec.lock

@@ -76,7 +76,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.3.0"
+    version: "1.3.1"
   flutter_lints:
     dependency: "direct dev"
     description:

lib/src/data/datasources/flutter_3d_datasource_mobile.dart

@@ -4,6 +4,7 @@ import 'package:webview_flutter/webview_flutter.dart';
 
 class Flutter3DDatasource implements IFlutter3DDatasource {
   final WebViewController? _webViewController;
+
   Flutter3DDatasource([this._webViewController]);
 
   @override
@@ -38,9 +39,13 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   Future<List<String>> getAvailableAnimations() async {
     final result = await executeCustomJsCodeWithResult(
         "document.querySelector(\"model-viewer\").availableAnimations;");
-    return jsonDecode(result as String)
-        .map<String>((e) => e.toString())
-        .toList();
+    String checkedResult;
+    if (result is String) {
+      checkedResult = _tupleToList(result);
+    } else {
+      return [];
+    }
+    return jsonDecode(checkedResult).map<String>((e) => e.toString()).toList();
   }
 
   @override
@@ -54,9 +59,13 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
   Future<List<String>> getAvailableTextures() async {
     final result = await executeCustomJsCodeWithResult(
         "document.querySelector(\"model-viewer\").availableVariants;");
-    return jsonDecode(result as String)
-        .map<String>((e) => e.toString())
-        .toList();
+    String checkedResult;
+    if (result is String) {
+      checkedResult = _tupleToList(result);
+    } else {
+      return [];
+    }
+    return jsonDecode(checkedResult).map<String>((e) => e.toString()).toList();
   }
 
   @override
@@ -100,4 +109,23 @@ class Flutter3DDatasource implements IFlutter3DDatasource {
     final result = await _webViewController?.runJavaScriptReturningResult(code);
     return result;
   }
+
+  /*
+  * Converts Tuple string to List
+  * */
+  String _tupleToList(String input) {
+    String trimmedString = input.trim();
+    if (trimmedString.isNotEmpty && trimmedString.length > 2) {
+      if (trimmedString[0] == "(") {
+        trimmedString = trimmedString.replaceFirst("(", "[");
+      }
+      if (trimmedString[trimmedString.length - 1] == ")") {
+        trimmedString =
+            trimmedString.substring(0, trimmedString.length - 2) + "]";
+      }
+      return trimmedString;
+    } else {
+      return "[]";
+    }
+  }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_3d_controller
 description: A Flutter package for rendering interactive 3D models in different formats(glb, gltf, fbx, obj), with ability to control animations, textures and camera.
-version: 1.3.0
+version: 1.3.1
 homepage: https://github.com/m-r-davari/flutter_3d_controller
 
 topics: