From 89e726b9636073614306d65d127ea0314142bbfd Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:42:15 -0400 Subject: [PATCH] Added New Bot with Animations --- assets/pangea/bot_faces/pangea_bot.riv | Bin 0 -> 10794 bytes .../controllers/it_controller.dart | 24 ------ lib/pangea/controllers/user_controller.dart | 2 +- lib/pangea/widgets/common/bot_face_svg.dart | 78 +++++++++++++++--- pubspec.yaml | 3 +- 5 files changed, 68 insertions(+), 39 deletions(-) create mode 100644 assets/pangea/bot_faces/pangea_bot.riv diff --git a/assets/pangea/bot_faces/pangea_bot.riv b/assets/pangea/bot_faces/pangea_bot.riv new file mode 100644 index 0000000000000000000000000000000000000000..b6956e547eeb1962304f8ad5aeec12c435307b3e GIT binary patch literal 10794 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 BTiyTw literal 0 HcmV?d00001 diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index f29bb59b2..ba14aa095 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -231,30 +231,6 @@ class ITController { _setSourceText(); getTranslationData(false); - /*sourceText = newSourceText; - final String currentText = choreographer.currentText; - - choreographer.startLoading(); - - final List responses = await Future.wait([ - _customInputTranslation(""), - _customInputTranslation(choreographer.currentText), - ]); - if (responses[0].goldContinuances != null && - responses[0].goldContinuances!.isNotEmpty) { - goldRouteTracker = GoldRouteTracker( - responses[0].goldContinuances!, - sourceText!, - ); - } - currentITStep = CurrentITStep( - sourceText: sourceText!, - currentText: currentText, - responseModel: responses[1], - storedGoldContinuances: goldRouteTracker.continuances, - ); - - _addPayloadId(responses[1]);*/ } catch (err, stack) { debugger(when: kDebugMode); if (err is! http.Response) { diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 0e336fdf6..c6a1b3409 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -142,7 +142,7 @@ class UserController extends BaseController { await updateMatrixProfile( dateOfBirth: dob, - autoPlayMessages: autoPlay, + autoPlayMessages: autoPlay ?? false, activatedFreeTrial: trial, interactiveTranslator: interactiveTranslator, itAutoPlay: itAutoPlay, diff --git a/lib/pangea/widgets/common/bot_face_svg.dart b/lib/pangea/widgets/common/bot_face_svg.dart index 718f10c90..b856596dd 100644 --- a/lib/pangea/widgets/common/bot_face_svg.dart +++ b/lib/pangea/widgets/common/bot_face_svg.dart @@ -1,8 +1,13 @@ import 'package:flutter/material.dart'; +import 'package:rive/rive.dart'; enum BotExpression { surprised, right, addled, left, down, shocked } -class BotFace extends StatelessWidget { +class BotFace extends StatefulWidget { + final double width; + final Color? forceColor; + final BotExpression expression; + const BotFace({ super.key, required this.width, @@ -10,21 +15,68 @@ class BotFace extends StatelessWidget { this.forceColor, }); - final double width; - final Color? forceColor; - final BotExpression expression; + @override + BotFaceState createState() => BotFaceState(); +} + +class BotFaceState extends State { + Artboard? _artboard; + SMINumber? _input; + + @override + void initState() { + super.initState(); + _loadRiveFile(); + } + + double mapExpressionToInput(BotExpression expression) { + switch (expression) { + case BotExpression.surprised: + return 1.0; + case BotExpression.right: + return 2.0; + case BotExpression.shocked: + return 3.0; + case BotExpression.addled: + return 4.0; + default: + return 0.0; + } + } + + Future _loadRiveFile() async { + final riveFile = await RiveFile.asset('assets/pangea/bot_faces/pangea_bot.riv'); + + final artboard = riveFile.mainArtboard; + final controller = StateMachineController + .fromArtboard(artboard, 'BotIconStateMachine'); + + if (controller != null) { + artboard.addController(controller); + _input = controller.findInput("Enter State") as SMINumber?; + controller.setInputValue( + 890, // this should be the id of the input + mapExpressionToInput(widget.expression), + ); + } + + setState(() { + _artboard = artboard; + }); + } @override Widget build(BuildContext context) { - return Image.asset( - 'assets/pangea/bot_faces/${expression.toString().split('.').last}.png', - // 'assets/pangea/bot_faces/surprised.png', - width: width, - height: width, - // color: forceColor ?? - // (Theme.of(context).brightness == Brightness.light - // ? Theme.of(context).colorScheme.primary - // : Theme.of(context).colorScheme.primary), + + return SizedBox( + width: widget.width, + height: widget.width, + child: _artboard != null + ? Rive( + artboard: _artboard!, + fit: BoxFit.cover, + ) + : Container(), ); } } diff --git a/pubspec.yaml b/pubspec.yaml index 0c3b2faac..e8d93c8d1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -124,6 +124,7 @@ dependencies: sentry_flutter: ^8.2.0 shimmer: ^3.0.0 syncfusion_flutter_xlsio: ^25.1.40 + rive: 0.11.11 # Pangea# dev_dependencies: @@ -212,4 +213,4 @@ dependency_overrides: keyboard_shortcuts: git: url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git - ref: null-safety \ No newline at end of file + ref: null-safety