fix: show subtitle in space analytics user entry instead of tooltip (#1386)

2025-01-09 10:12:10 -05:00 · 2025-01-09 10:12:10 -05:00 · a6adf00094
commit a6adf00094
parent 900aebc092
7 changed files with 51 additions and 88 deletions
--- a/lib/pangea/enum/analytics/analytics_summary_enum.dart
+++ b/lib/pangea/enum/analytics/analytics_summary_enum.dart
@ -7,21 +7,15 @@ enum AnalyticsSummaryEnum {
  numLemmas,
  numLemmasUsedCorrectly,
  numLemmasUsedIncorrectly,
-  // listLemmas,
-  // listLemmasUsedCorrectly,
-  // listLemmasUsedIncorrectly,

  /// 0 - 30 XP
  numLemmasSmallXP,
-  // listLemmasSmallXP,

  /// 31 - 200 XP
  numLemmasMediumXP,
-  // listLemmasMediumXP,

  /// > 200 XP
  numLemmasLargeXP,
-  // listLemmasLargeXP,

  numMorphConstructs,
  listMorphConstructs,
@ -61,24 +55,12 @@ extension AnalyticsSummaryEnumExtension on AnalyticsSummaryEnum {
        return l10n.numLemmasUsedCorrectly;
      case AnalyticsSummaryEnum.numLemmasUsedIncorrectly:
        return l10n.numLemmasUsedIncorrectly;
-      // case AnalyticsSummaryEnum.listLemmas:
-      //   return l10n.listOfLemmas;
-      // case AnalyticsSummaryEnum.listLemmasUsedCorrectly:
-      //   return l10n.listLemmasUsedCorrectly;
-      // case AnalyticsSummaryEnum.listLemmasUsedIncorrectly:
-      //   return l10n.listLemmasUsedIncorrectly;
      case AnalyticsSummaryEnum.numLemmasSmallXP:
        return l10n.numLemmasSmallXP;
      case AnalyticsSummaryEnum.numLemmasMediumXP:
        return l10n.numLemmasMediumXP;
      case AnalyticsSummaryEnum.numLemmasLargeXP:
        return l10n.numLemmasLargeXP;
-      // case AnalyticsSummaryEnum.listLemmasSmallXP:
-      //   return l10n.listLemmasSmallXP;
-      // case AnalyticsSummaryEnum.listLemmasMediumXP:
-      //   return l10n.listLemmasMediumXP;
-      // case AnalyticsSummaryEnum.listLemmasLargeXP:
-      //   return l10n.listLemmasLargeXP;
      case AnalyticsSummaryEnum.numMorphConstructs:
        return l10n.numGrammarConcepts;
      case AnalyticsSummaryEnum.listMorphConstructs:
--- a/lib/pangea/models/analytics/analytics_summary_model.dart
+++ b/lib/pangea/models/analytics/analytics_summary_model.dart
@ -14,21 +14,15 @@ class AnalyticsSummaryModel {
  int numLemmas;
  int numLemmasUsedCorrectly;
  int numLemmasUsedIncorrectly;
-  // List<String> listLemmas;
-  // List<String> listLemmasUsedCorrectly;
-  // List<String> listLemmasUsedIncorrectly;

  /// 0 - 30 XP
  int numLemmasSmallXP;
-  // List<String> listLemmasSmallXP;

  /// 31 - 200 XP
  int numLemmasMediumXP;
-  // List<String> listLemmasMediumXP;

  /// > 200 XP
  int numLemmasLargeXP;
-  // List<String> listLemmasLargeXP;

  int numMorphConstructs;
  List<String> listMorphConstructs;
@ -59,15 +53,9 @@ class AnalyticsSummaryModel {
    required this.numLemmas,
    required this.numLemmasUsedCorrectly,
    required this.numLemmasUsedIncorrectly,
-    // required this.listLemmas,
-    // required this.listLemmasUsedCorrectly,
-    // required this.listLemmasUsedIncorrectly,
    required this.numLemmasSmallXP,
    required this.numLemmasMediumXP,
    required this.numLemmasLargeXP,
-    // required this.listLemmasSmallXP,
-    // required this.listLemmasMediumXP,
-    // required this.listLemmasLargeXP,
    required this.numMorphConstructs,
    required this.listMorphConstructs,
    required this.listMorphConstructsUsedCorrectly,
@ -180,24 +168,12 @@ class AnalyticsSummaryModel {
        return numLemmasUsedCorrectly;
      case AnalyticsSummaryEnum.numLemmasUsedIncorrectly:
        return numLemmasUsedIncorrectly;
-      // case AnalyticsSummaryEnum.listLemmas:
-      //   return listLemmas;
-      // case AnalyticsSummaryEnum.listLemmasUsedCorrectly:
-      //   return listLemmasUsedCorrectly;
-      // case AnalyticsSummaryEnum.listLemmasUsedIncorrectly:
-      //   return listLemmasUsedIncorrectly;
      case AnalyticsSummaryEnum.numLemmasSmallXP:
        return numLemmasSmallXP;
      case AnalyticsSummaryEnum.numLemmasMediumXP:
        return numLemmasMediumXP;
      case AnalyticsSummaryEnum.numLemmasLargeXP:
        return numLemmasLargeXP;
-      // case AnalyticsSummaryEnum.listLemmasSmallXP:
-      //   return listLemmasSmallXP;
-      // case AnalyticsSummaryEnum.listLemmasMediumXP:
-      //   return listLemmasMediumXP;
-      // case AnalyticsSummaryEnum.listLemmasLargeXP:
-      //   return listLemmasLargeXP;
      case AnalyticsSummaryEnum.numMorphConstructs:
        return numMorphConstructs;
      case AnalyticsSummaryEnum.listMorphConstructs:
@ -233,15 +209,9 @@ class AnalyticsSummaryModel {
      'numLemmas': numLemmas,
      'numLemmasUsedCorrectly': numLemmasUsedCorrectly,
      'numLemmasUsedIncorrectly': numLemmasUsedIncorrectly,
-      // 'listLemmas': listLemmas,
-      // 'listLemmasUsedCorrectly': listLemmasUsedCorrectly,
-      // 'listLemmasUsedIncorrectly': listLemmasUsedIncorrectly,
      'numLemmasSmallXP': numLemmasSmallXP,
      'numLemmasMediumXP': numLemmasMediumXP,
      'numLemmasLargeXP': numLemmasLargeXP,
-      // 'listLemmasSmallXP': listLemmasSmallXP,
-      // 'listLemmasMediumXP': listLemmasMediumXP,
-      // 'listLemmasLargeXP': listLemmasLargeXP,
      'numMorphConstructs': numMorphConstructs,
      'listMorphConstructs': listMorphConstructs,
      'listMorphConstructsUsedCorrectly': listMorphConstructsUsedCorrectly,
--- a/lib/pangea/repo/lemma_definition_repo.dart
+++ b/lib/pangea/repo/lemma_definition_repo.dart
@ -1,12 +1,13 @@
 import 'dart:convert';

+import 'package:http/http.dart';
+
 import 'package:fluffychat/pangea/config/environment.dart';
 import 'package:fluffychat/pangea/models/lemma.dart';
 import 'package:fluffychat/pangea/network/requests.dart';
 import 'package:fluffychat/pangea/network/urls.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:http/http.dart';

 class LemmaDefinitionRequest {
  final Lemma _lemma;
--- a/lib/pangea/repo/practice/word_meaning_activity_generator.dart
+++ b/lib/pangea/repo/practice/word_meaning_activity_generator.dart
@ -1,11 +1,13 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/enum/activity_type_enum.dart';
 import 'package:fluffychat/pangea/enum/construct_type_enum.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/message_activity_request.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/multiple_choice_activity_model.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/practice_activity_model.dart';
 import 'package:fluffychat/pangea/repo/lemma_definition_repo.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class WordMeaningActivityGenerator {
  Future<MessageActivityResponse> get(
--- a/lib/pangea/widgets/download_analytics_dialog.dart
+++ b/lib/pangea/widgets/download_analytics_dialog.dart
@ -324,43 +324,48 @@ class DownloadAnalyticsDialogState extends State<DownloadAnalyticsDialog> {

                    return Padding(
                      padding: const EdgeInsets.all(4.0),
-                      child: Tooltip(
-                        message: tooltip,
-                        triggerMode: TooltipTriggerMode.tap,
-                        child: Opacity(
-                          opacity: analyticsAvailable &&
-                                  _downloadStatues[user.id] != -1
-                              ? 1
-                              : 0.5,
-                          child: Row(
-                            children: [
-                              SizedBox(
-                                width: 30,
-                                child: !analyticsAvailable
-                                    ? const Icon(
-                                        Icons.error_outline,
-                                        size: 16,
-                                      )
-                                    : Center(
-                                        child: AnimatedContainer(
-                                          duration:
-                                              FluffyThemes.animationDuration,
-                                          height: 12,
-                                          width: 12,
-                                          decoration: BoxDecoration(
-                                            color:
-                                                _downloadStatusColor(user.id),
-                                            borderRadius:
-                                                BorderRadius.circular(100),
-                                          ),
+                      child: Opacity(
+                        opacity: analyticsAvailable &&
+                                _downloadStatues[user.id] != -1
+                            ? 1
+                            : 0.5,
+                        child: Row(
+                          children: [
+                            SizedBox(
+                              width: 30,
+                              child: !analyticsAvailable
+                                  ? const Icon(
+                                      Icons.error_outline,
+                                      size: 16,
+                                    )
+                                  : Center(
+                                      child: AnimatedContainer(
+                                        duration:
+                                            FluffyThemes.animationDuration,
+                                        height: 12,
+                                        width: 12,
+                                        decoration: BoxDecoration(
+                                          color: _downloadStatusColor(user.id),
+                                          borderRadius:
+                                              BorderRadius.circular(100),
                                        ),
                                      ),
+                                    ),
+                            ),
+                            Flexible(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(user.displayName ?? user.id),
+                                  if (tooltip.isNotEmpty)
+                                    Text(
+                                      tooltip,
+                                      style: const TextStyle(fontSize: 10),
+                                    ),
+                                ],
                              ),
-                              Flexible(
-                                child: Text(user.displayName ?? user.id),
-                              ),
-                            ],
-                          ),
+                            ),
+                          ],
                        ),
                      ),
                    );
--- a/lib/pangea/widgets/word_zoom/contextual_translation_widget.dart
+++ b/lib/pangea/widgets/word_zoom/contextual_translation_widget.dart
@ -1,10 +1,12 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
 import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/repo/lemma_definition_repo.dart';
 import 'package:fluffychat/pangea/widgets/igc/card_error_widget.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';

 class ContextualTranslationWidget extends StatelessWidget {
  final PangeaToken token;
--- a/lib/pangea/widgets/word_zoom/lemma_definition_widget.dart
+++ b/lib/pangea/widgets/word_zoom/lemma_definition_widget.dart
@ -1,8 +1,9 @@
+import 'package:flutter/material.dart';
+
 import 'package:fluffychat/pangea/constants/language_constants.dart';
 import 'package:fluffychat/pangea/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/repo/lemma_definition_repo.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import 'package:flutter/material.dart';

 class LemmaDefinitionWidget extends StatefulWidget {
  final PangeaToken token;