diff --git a/.rive_head b/.rive_head index 57a5c15..c5fb219 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -59858e3330db2d56f9db570df8bcb8f6af23b154 +31d9a54243e694ede76dc133cf209d7b67c13708 diff --git a/lib/src/rive_core/text/text_modifier_group.dart b/lib/src/rive_core/text/text_modifier_group.dart index a47ec9a..94593df 100644 --- a/lib/src/rive_core/text/text_modifier_group.dart +++ b/lib/src/rive_core/text/text_modifier_group.dart @@ -148,8 +148,10 @@ class TextModifierGroup extends TextModifierGroupBase { } if (axisVariations.isNotEmpty) { - var varFont = font.makeVariation(axisVariations.entries - .map((entry) => FontAxisCoord(entry.key, entry.value))); + var varFont = font.withOptions( + axisVariations.entries + .map((entry) => FontAxisCoord(entry.key, entry.value)), + []); if (varFont != null) { _cleanupFonts.add(varFont); font = varFont; diff --git a/lib/src/rive_core/text/text_style.dart b/lib/src/rive_core/text/text_style.dart index 42d12dc..b38677c 100644 --- a/lib/src/rive_core/text/text_style.dart +++ b/lib/src/rive_core/text/text_style.dart @@ -65,8 +65,8 @@ class TextStyle extends TextStyleBase TextVariationHelper? _variationHelper; TextVariationHelper? get variationHelper => _variationHelper; - Font? _makeVariableFont() => asset?.font?.makeVariation( - _variations.map((axis) => FontAxisCoord(axis.tag, axis.axisValue))); + Font? _makeVariableFont() => asset?.font?.withOptions( + _variations.map((axis) => FontAxisCoord(axis.tag, axis.axisValue)), []); Font? get font => _variationHelper?.font ?? asset?.font; diff --git a/lib/src/rive_core/text/text_style_axis.dart b/lib/src/rive_core/text/text_style_axis.dart index 225e49d..f5a1ce3 100644 --- a/lib/src/rive_core/text/text_style_axis.dart +++ b/lib/src/rive_core/text/text_style_axis.dart @@ -9,7 +9,7 @@ class TextStyleAxis extends TextStyleAxisBase { @override bool validate() => super.validate() && parent is TextStyle; - String get tagName => FontAxis.tagToName(tag); + String get tagName => FontTag.tagToName(tag); @override void update(int dirt) {} diff --git a/lib/src/rive_core/text/text_variation_modifier.dart b/lib/src/rive_core/text/text_variation_modifier.dart index 4378c81..9ef0a83 100644 --- a/lib/src/rive_core/text/text_variation_modifier.dart +++ b/lib/src/rive_core/text/text_variation_modifier.dart @@ -7,7 +7,7 @@ import 'package:rive_common/rive_text.dart'; export 'package:rive/src/generated/text/text_variation_modifier_base.dart'; class TextVariationModifier extends TextVariationModifierBase { - String get tagName => FontAxis.tagToName(axisTag); + String get tagName => FontTag.tagToName(axisTag); @override void axisTagChanged(int from, int to) => diff --git a/pubspec.yaml b/pubspec.yaml index d46a367..864bc27 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: http: ^0.13.3 meta: ^1.3.0 plugin_platform_interface: ^2.0.2 - rive_common: ^0.0.10 + rive_common: 0.1.0 dev_dependencies: flutter_test: sdk: flutter