flet-rive 0.1.0.dev1__py3-none-any.whl → 0.2.0.dev30__py3-none-any.whl

flutter/flet_rive/lib/src/rive.dart

@@ -3,78 +3,73 @@ import 'package:flutter/widgets.dart';
 import 'package:rive/rive.dart';
 
 class RiveControl extends StatefulWidget {
-  final Control? parent;
   final Control control;
-  final List<Control> children;
-  final bool parentDisabled;
-  final bool? parentAdaptive;
-  final FletControlBackend backend;
 
-  const RiveControl(
-      {super.key,
-      required this.parent,
-      required this.control,
-      required this.children,
-      required this.parentDisabled,
-      required this.parentAdaptive,
-      required this.backend});
+  const RiveControl({super.key, required this.control});
 
   @override
   State<RiveControl> createState() => _RiveControlState();
 }
 
-class _RiveControlState extends State<RiveControl> with FletStoreMixin {
+class _RiveControlState extends State<RiveControl> {
   @override
   Widget build(BuildContext context) {
     debugPrint("Rive build: ${widget.control.id} (${widget.control.hashCode})");
-    bool disabled = widget.control.isDisabled || widget.parentDisabled;
-    Widget? placeholder;
-
-    var src = widget.control.attrString("src", "")!;
-    if (src == "") {
+    var src = widget.control.getString("src");
+    if (src == null) {
       return const ErrorControl("Rive must have \"src\" specified.");
     }
 
-    var artBoard = widget.control.attrString("artBoard");
-    var antiAliasing = widget.control.attrBool("enableAntiAliasing", true)!;
-    var useArtBoardSize = widget.control.attrBool("useArtBoardSize", false)!;
-    var fit = parseBoxFit(widget.control.attrString("fit"));
-    var alignment = parseAlignment(widget.control, "alignment");
-    var ctrls = widget.children.where((c) => c.isVisible);
-    if (ctrls.isNotEmpty) {
-      placeholder = createControl(widget.control, ctrls.first.id, disabled);
-    }
+    var artBoard = widget.control.getString("art_board");
+    var antiAliasing = widget.control.getBool("enable_anti_aliasing", true)!;
+    var useArtBoardSize = widget.control.getBool("use_art_board_size", false)!;
+    var fit = widget.control.getBoxFit("fit");
+    var alignment = widget.control.getAlignment("alignment");
+    var placeholder = widget.control.buildWidget("placeholder");
+    var speedMultiplier = widget.control.getDouble("speed_multiplier", 1)!;
+    var animations = widget.control.get<List<String>>("animations", const [])!;
+    var stateMachines =
+        widget.control.get<List<String>>("state_machines", const [])!;
+    var headers = widget.control.get("headers")?.cast<String, String>();
+    var clipRect = widget.control.getRect("clip_rect");
 
-    return withPageArgs((context, pageArgs) {
-      Widget? rive;
+    Widget? rive;
 
-      var assetSrc = getAssetSrc(src, pageArgs.pageUri!, pageArgs.assetsDir);
-      if (assetSrc.isFile) {
-        // Local File
-        rive = RiveAnimation.file(
-          assetSrc.path,
-          artboard: artBoard,
-          fit: fit,
-          antialiasing: antiAliasing,
-          useArtboardSize: useArtBoardSize,
-          alignment: alignment,
-          placeHolder: placeholder,
-        );
-      } else {
-        // URL
-        rive = RiveAnimation.network(
-          assetSrc.path,
-          fit: fit,
-          artboard: artBoard,
-          alignment: alignment,
-          antialiasing: antiAliasing,
-          useArtboardSize: useArtBoardSize,
-          placeHolder: placeholder,
-          // onInit: _onInit,
-        );
-      }
+    var assetSrc = widget.control.backend.getAssetSource(src);
+    if (assetSrc.isFile) {
+      // Local File
+      rive = RiveAnimation.file(
+        assetSrc.path,
+        artboard: artBoard,
+        fit: fit,
+        antialiasing: antiAliasing,
+        useArtboardSize: useArtBoardSize,
+        alignment: alignment,
+        placeHolder: placeholder,
+        speedMultiplier: speedMultiplier,
+        animations: animations,
+        stateMachines: stateMachines,
+        clipRect: clipRect,
+      );
+    } else {
+      // URL
+      rive = RiveAnimation.network(
+        assetSrc.path,
+        fit: fit,
+        artboard: artBoard,
+        alignment: alignment,
+        antialiasing: antiAliasing,
+        useArtboardSize: useArtBoardSize,
+        placeHolder: placeholder,
+        speedMultiplier: speedMultiplier,
+        animations: animations,
+        stateMachines: stateMachines,
+        headers: headers,
+        clipRect: clipRect,
+        // onInit: _onInit,
+      );
+    }
 
-      return constrainedControl(context, rive, widget.parent, widget.control);
-    });
+    return ConstrainedControl(control: widget.control, child: rive);
   }
 }