added xp number to xp progress bar

lib/pangea/utils/get_grammar_copy.dart

@@ -5,12 +5,16 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-String getGrammarCopy(
+/// Used on morph constructs
-    {required String category,
+String getGrammarCopy({
-    required String feature,
+  required String category,
-    required BuildContext context}) {
+
+  /// This is the tag / feature
+  required String lemma,
+  required BuildContext context,
+}) {
   final String key =
-      'grammarCopy${category.toUpperCase()}${feature.toLowerCase()}';
+      'grammarCopy${category.toUpperCase()}${lemma.toLowerCase()}';
 
   switch (key) {
     case 'grammarCopyPOSsconj':

lib/pangea/widgets/chat_list/analytics_summary/analytics_popup.dart

@@ -66,11 +66,8 @@ class AnalyticsPopup extends StatelessWidget {
           return Column(
             children: [
               ExpansionTile(
-                title: Text(
+                // GABBY TODO switch back to getGrammarCopy once it's updated
-                  category.key != 'Other'
+                title: Text(category.key),
-                      ? getGrammarCopy(category.key, context)
-                      : category.key,
-                ),
                 children: category.value.map((constructUses) {
                   return ConstructUsesXPTile(
                     indicator: indicator,
@@ -127,23 +124,34 @@ class ConstructUsesXPTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final lemma = constructUses.lemma;
     return Tooltip(
       message: "${constructUses.points} / ${constructsModel.maxXPPerLemma}",
       child: ListTile(
         onTap: () {},
         title: Text(
           constructsModel.type == ConstructTypeEnum.morph
-              ? getGrammarCopy(lemma, context)
+              ? getGrammarCopy(
-              : lemma,
+                  category: constructUses.category,
+                  lemma: constructUses.lemma,
+                  context: context,
+                )
+              : constructUses.lemma,
         ),
-        subtitle: LinearProgressIndicator(
+        subtitle: Row(
-          value: constructUses.points / constructsModel.maxXPPerLemma,
+          children: [
-          minHeight: 20,
+            Expanded(
-          borderRadius: const BorderRadius.all(
+              child: LinearProgressIndicator(
-            Radius.circular(AppConfig.borderRadius),
+                value: constructUses.points / constructsModel.maxXPPerLemma,
-          ),
+                minHeight: 20,
-          color: indicator.color(context),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(AppConfig.borderRadius),
+                ),
+                color: indicator.color(context),
+              ),
+            ),
+            const SizedBox(width: 12),
+            Text("${constructUses.points}xp"),
+          ],
         ),
         contentPadding: const EdgeInsets.symmetric(
           horizontal: 20,