2463-dont-do-activities-in-word-mode (#2481)

* chore(reading_assistance): give content outside of message mode * generated --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ggurdin <46800240+ggurdin@users.noreply.github.com>
2025-04-17 15:52:41 -04:00 · 2025-04-17 15:52:41 -04:00 · 11289c6267
commit 11289c6267
parent 4d7428d4a4
7 changed files with 91 additions and 71 deletions
--- a/lib/pangea/toolbar/widgets/message_selection_overlay.dart
+++ b/lib/pangea/toolbar/widgets/message_selection_overlay.dart
@ -28,6 +28,7 @@ import 'package:fluffychat/pangea/practice_activities/practice_selection.dart';
 import 'package:fluffychat/pangea/practice_activities/practice_selection_repo.dart';
 import 'package:fluffychat/pangea/toolbar/controllers/text_to_speech_controller.dart';
 import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
+import 'package:fluffychat/pangea/toolbar/enums/reading_assistance_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/morph_selection.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_positioner.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/reading_assistance_content.dart';
@ -88,6 +89,8 @@ class MessageOverlayController extends State<MessageSelectionOverlay>

  final GlobalKey<ReadingAssistanceContentState> wordZoomKey = GlobalKey();

+  ReadingAssistanceMode? readingAssistanceMode; // default mode
+
  double maxWidth = AppConfig.toolbarMinWidth;

  /////////////////////////////////////
@ -403,6 +406,9 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
      pangeaMessageEvent != null &&
      pangeaMessageEvent!.event.messageType == MessageTypes.Text;

+  bool get hideWordCardContent =>
+      readingAssistanceMode == ReadingAssistanceMode.messageMode;
+
  bool get isPracticeComplete => isTranslationUnlocked;

  bool get isEmojiDone =>
--- a/lib/pangea/toolbar/widgets/message_selection_positioner.dart
+++ b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
@ -64,7 +64,6 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>
  final Completer _tooltipCompleter = Completer();

  MessageMode _currentMode = MessageMode.noneSelected;
-  ReadingAssistanceMode? _readingAssistanceMode;

  Animation<Offset>? _overlayOffsetAnimation;
  Animation<Size>? _messageSizeAnimation;
@ -185,11 +184,13 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>

    if (mode == ReadingAssistanceMode.messageMode) {
      setState(
-        () => _readingAssistanceMode = ReadingAssistanceMode.transitionMode,
+        () => widget.overlayController.readingAssistanceMode =
+            ReadingAssistanceMode.transitionMode,
      );
    } else if (mode == ReadingAssistanceMode.tokenMode) {
      setState(
-        () => _readingAssistanceMode = ReadingAssistanceMode.tokenMode,
+        () => widget.overlayController.readingAssistanceMode =
+            ReadingAssistanceMode.tokenMode,
      );
    }

@ -237,7 +238,8 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>
    }

    await _animationController.forward(from: 0);
-    if (mounted) setState(() => _readingAssistanceMode = mode);
+    if (mounted)
+      setState(() => widget.overlayController.readingAssistanceMode = mode);
  }

  T _runWithLogging<T>(
@ -259,6 +261,9 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>
    }
  }

+  ReadingAssistanceMode? get _readingAssistanceMode =>
+      widget.overlayController.readingAssistanceMode;
+
  double get _inputBarSize =>
      _readingAssistanceMode == ReadingAssistanceMode.messageMode ||
              _readingAssistanceMode == ReadingAssistanceMode.transitionMode
--- a/lib/pangea/toolbar/widgets/practice_activity/word_audio_button.dart
+++ b/lib/pangea/toolbar/widgets/practice_activity/word_audio_button.dart
@ -56,7 +56,7 @@ class WordAudioButtonState extends State<WordAudioButton> {
          .layerLinkAndKey('word-audio-button-${widget.uniqueID}')
          .link,
      child: Opacity(
-        opacity: !widget.isSelected ? widget.baseOpacity : 1,
+        opacity: widget.isSelected || _isPlaying ? 1 : widget.baseOpacity,
        child: IconButton(
          key: MatrixState.pAnyState
              .layerLinkAndKey('word-audio-button-${widget.uniqueID}')
@ -64,8 +64,9 @@ class WordAudioButtonState extends State<WordAudioButton> {
          icon: const Icon(Icons.volume_up),
          isSelected: _isPlaying,
          selectedIcon: const Icon(Icons.pause_outlined),
-          color:
-              widget.isSelected ? Theme.of(context).colorScheme.primary : null,
+          color: widget.isSelected || _isPlaying
+              ? Theme.of(context).colorScheme.primary
+              : null,
          tooltip:
              _isPlaying ? L10n.of(context).stop : L10n.of(context).playAudio,
          iconSize: widget.size,
--- a/lib/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart
@ -15,6 +15,7 @@ import 'package:fluffychat/pangea/lemmas/lemma_info_request.dart';
 import 'package:fluffychat/pangea/lemmas/lemma_info_response.dart';
 import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
 import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
+import 'package:fluffychat/pangea/toolbar/enums/reading_assistance_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_zoom_activity_button.dart';
 import 'package:fluffychat/widgets/matrix.dart';
@ -124,7 +125,9 @@ class LemmaMeaningWidgetState extends State<LemmaMeaningWidget> {
        widget.controller!.practiceSelection!.hasActiveActivityByToken(
          ActivityTypeEnum.wordMeaning,
          widget.token!,
-        )) {
+        ) &&
+        widget.controller!.readingAssistanceMode ==
+            ReadingAssistanceMode.messageMode) {
      return WordZoomActivityButton(
        icon: const Icon(Symbols.dictionary),
        isSelected: widget.controller?.toolbarMode == MessageMode.wordMeaning,
--- a/lib/pangea/toolbar/widgets/word_zoom/morphological_list_item.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/morphological_list_item.dart
@ -25,12 +25,13 @@ class MorphologicalListItem extends StatelessWidget {
  });

  bool get shouldDoActivity =>
+      overlayController.hideWordCardContent &&
      overlayController.practiceSelection?.hasActiveActivityByToken(
-        ActivityTypeEnum.morphId,
-        token,
-        morphFeature,
-      ) ==
-      true;
+            ActivityTypeEnum.morphId,
+            token,
+            morphFeature,
+          ) ==
+          true;

  bool get isSelected =>
      overlayController.toolbarMode == MessageMode.wordMorph &&
--- a/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
@ -39,10 +39,11 @@ class WordZoomWidget extends StatelessWidget {

  bool get hasEmojiActivity =>
      overlayController.practiceSelection?.hasActiveActivityByToken(
-        ActivityTypeEnum.emoji,
-        _selectedToken,
-      ) ==
-      true;
+            ActivityTypeEnum.emoji,
+            _selectedToken,
+          ) ==
+          true &&
+      overlayController.hideWordCardContent;

  @override
  Widget build(BuildContext context) {
@ -113,7 +114,8 @@ class WordZoomWidget extends StatelessWidget {
                  alignment: Alignment.center,
                  child: LemmaEmojiRow(
                    cId: _selectedToken.vocabConstructID,
-                    onTapOverride: hasEmojiActivity
+                    onTapOverride: overlayController.hideWordCardContent &&
+                            hasEmojiActivity
                        ? () => overlayController.updateToolbarMode(
                              MessageMode.wordEmoji,
                            )
@ -170,12 +172,14 @@ class WordZoomWidget extends StatelessWidget {
                    isSelected:
                        MessageMode.listening == overlayController.toolbarMode,
                    baseOpacity: 0.4,
-                    callbackOverride: overlayController.practiceSelection
-                                ?.hasActiveActivityByToken(
-                              MessageMode.listening.associatedActivityType!,
-                              _selectedToken,
-                            ) ==
-                            true
+                    callbackOverride: overlayController.hideWordCardContent &&
+                            overlayController.practiceSelection
+                                    ?.hasActiveActivityByToken(
+                                  MessageMode.listening.associatedActivityType!,
+                                  _selectedToken,
+                                ) ==
+                                true &&
+                            overlayController.hideWordCardContent
                        ? () => overlayController
                            .updateToolbarMode(MessageMode.listening)
                        : null,
--- a/pubspec.lock
+++ b/pubspec.lock
@ -114,10 +114,10 @@ packages:
    dependency: "direct main"
    description:
      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.12.0"
+    version: "2.11.0"
  audio_session:
    dependency: transitive
    description:
@ -218,10 +218,10 @@ packages:
    dependency: transitive
    description:
      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
  cached_network_image:
    dependency: "direct main"
    description:
@ -266,10 +266,10 @@ packages:
    dependency: "direct main"
    description:
      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
  charcode:
    dependency: transitive
    description:
@ -306,18 +306,18 @@ packages:
    dependency: transitive
    description:
      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
  collection:
    dependency: "direct main"
    description:
      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.19.1"
+    version: "1.19.0"
  colorize:
    dependency: transitive
    description:
@ -506,10 +506,10 @@ packages:
    dependency: transitive
    description:
      name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.2"
+    version: "1.3.1"
  fcm_shared_isolate:
    dependency: "direct main"
    description:
@ -529,10 +529,10 @@ packages:
    dependency: transitive
    description:
      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.1"
+    version: "7.0.0"
  file_picker:
    dependency: "direct main"
    description:
@ -1390,18 +1390,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.8"
+    version: "10.0.7"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.9"
+    version: "3.0.8"
  leak_tracker_testing:
    dependency: transitive
    description:
@ -1478,10 +1478,10 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.17"
+    version: "0.12.16+1"
  material_color_utilities:
    dependency: transitive
    description:
@ -1511,10 +1511,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
  mgrs_dart:
    dependency: transitive
    description:
@ -1695,10 +1695,10 @@ packages:
    dependency: "direct main"
    description:
      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
  path_parsing:
    dependency: transitive
    description:
@ -1823,10 +1823,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.6"
+    version: "3.1.5"
  platform_detect:
    dependency: transitive
    description:
@ -1903,10 +1903,10 @@ packages:
    dependency: transitive
    description:
      name: process
-      sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
+      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.3"
+    version: "5.0.2"
  proj4dart:
    dependency: transitive
    description:
@ -2284,10 +2284,10 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.10.1"
+    version: "1.10.0"
  sprintf:
    dependency: transitive
    description:
@ -2364,26 +2364,26 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
      url: "https://pub.dev"
    source: hosted
-    version: "1.12.1"
+    version: "1.12.0"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.2"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.1"
+    version: "1.3.0"
  string_validator:
    dependency: transitive
    description:
@ -2436,34 +2436,34 @@ packages:
    dependency: transitive
    description:
      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
  test:
    dependency: transitive
    description:
      name: test
-      sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
      url: "https://pub.dev"
    source: hosted
-    version: "1.25.15"
+    version: "1.25.8"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.4"
+    version: "0.7.3"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.8"
+    version: "0.6.5"
  text_to_speech:
    dependency: "direct main"
    description:
@ -2757,10 +2757,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
      url: "https://pub.dev"
    source: hosted
-    version: "14.3.1"
+    version: "14.3.0"
  wakelock_plus:
    dependency: "direct main"
    description:
@ -2890,5 +2890,5 @@ packages:
    source: hosted
    version: "3.1.3"
 sdks:
-  dart: ">=3.7.0-0 <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
  flutter: ">=3.27.0"