From 50906f929fe80506d2b8f44f763129c4a08e9ac8 Mon Sep 17 00:00:00 2001 From: William Jordan-Cooley Date: Fri, 15 Nov 2024 12:00:00 -0500 Subject: [PATCH] tweaking lock icon display --- lib/pangea/models/pangea_token_model.dart | 6 +----- lib/pangea/widgets/chat/message_toolbar_buttons.dart | 10 +++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/pangea/models/pangea_token_model.dart b/lib/pangea/models/pangea_token_model.dart index c3d4877316..20d9743f4d 100644 --- a/lib/pangea/models/pangea_token_model.dart +++ b/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; @@ -226,9 +225,6 @@ class PangeaToken { } bool isActivityProbablyLevelAppropriate(ActivityTypeEnum a) { - debugger(when: kDebugMode); - final int points = vocabConstruct.points; - final int myxp = xp; switch (a) { case ActivityTypeEnum.wordMeaning: return vocabConstruct.points < 15; diff --git a/lib/pangea/widgets/chat/message_toolbar_buttons.dart b/lib/pangea/widgets/chat/message_toolbar_buttons.dart index fea2cabfd5..8962d7fd3e 100644 --- a/lib/pangea/widgets/chat/message_toolbar_buttons.dart +++ b/lib/pangea/widgets/chat/message_toolbar_buttons.dart @@ -156,21 +156,21 @@ class DisabledAnimationState extends State void initState() { super.initState(); _controller = AnimationController( - duration: const Duration(milliseconds: 750), + duration: const Duration(milliseconds: 1000), vsync: this, ); _animation = TweenSequence([ TweenSequenceItem( - tween: Tween(begin: 0, end: 1), + tween: Tween(begin: 0, end: 0.9), weight: 1.0, ), TweenSequenceItem( - tween: Tween(begin: 1, end: 1), + tween: Tween(begin: 0.9, end: 0.9), weight: 1.0, ), TweenSequenceItem( - tween: Tween(begin: 1, end: 0), + tween: Tween(begin: 0.9, end: 0), weight: 1.0, ), ]).animate(_controller); @@ -199,7 +199,7 @@ class DisabledAnimationState extends State opacity: _animation.value, child: const Icon( Icons.lock, - color: Colors.red, + color: AppConfig.primaryColor, size: 28, ), ),