Merge branch 'main' into xp-fix

lib/pangea/models/pangea_token_model.dart

@@ -171,8 +171,7 @@ class PangeaToken {
   bool _isActivityBasicallyEligible(ActivityTypeEnum a) {
     switch (a) {
       case ActivityTypeEnum.wordMeaning:
-        // return isContentWord;
-        return true;
+        return isContentWord;
       case ActivityTypeEnum.wordFocusListening:
       case ActivityTypeEnum.hiddenWordListening:
         return canBeHeard;

lib/pangea/widgets/chat/message_toolbar_buttons.dart

@@ -156,21 +156,21 @@ class DisabledAnimationState extends State<DisabledAnimation>
   void initState() {
     super.initState();
     _controller = AnimationController(
-      duration: const Duration(milliseconds: 750),
+      duration: const Duration(milliseconds: 1000),
       vsync: this,
     );
 
     _animation = TweenSequence<double>([
       TweenSequenceItem<double>(
-        tween: Tween<double>(begin: 0, end: 1),
+        tween: Tween<double>(begin: 0, end: 0.9),
         weight: 1.0,
       ),
       TweenSequenceItem<double>(
-        tween: Tween<double>(begin: 1, end: 1),
+        tween: Tween<double>(begin: 0.9, end: 0.9),
         weight: 1.0,
       ),
       TweenSequenceItem<double>(
-        tween: Tween<double>(begin: 1, end: 0),
+        tween: Tween<double>(begin: 0.9, end: 0),
         weight: 1.0,
       ),
     ]).animate(_controller);
@@ -199,7 +199,7 @@ class DisabledAnimationState extends State<DisabledAnimation>
               opacity: _animation.value,
               child: const Icon(
                 Icons.lock,
-                color: Colors.red,
+                color: AppConfig.primaryColor,
                 size: 28,
               ),
             ),