added xp number to xp progress bar

pull/1476/head
ggurdin 1 year ago
parent 7f651417fd
commit d904c59d6a
No known key found for this signature in database
GPG Key ID: A01CB41737CBB478

@ -5,12 +5,16 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.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 = final String key =
'grammarCopy${category.toUpperCase()}${feature.toLowerCase()}'; 'grammarCopy${category.toUpperCase()}${lemma.toLowerCase()}';
switch (key) { switch (key) {
case 'grammarCopyPOSsconj': case 'grammarCopyPOSsconj':

@ -66,11 +66,8 @@ class AnalyticsPopup extends StatelessWidget {
return Column( return Column(
children: [ children: [
ExpansionTile( 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) { children: category.value.map((constructUses) {
return ConstructUsesXPTile( return ConstructUsesXPTile(
indicator: indicator, indicator: indicator,
@ -127,17 +124,23 @@ class ConstructUsesXPTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final lemma = constructUses.lemma;
return Tooltip( return Tooltip(
message: "${constructUses.points} / ${constructsModel.maxXPPerLemma}", message: "${constructUses.points} / ${constructsModel.maxXPPerLemma}",
child: ListTile( child: ListTile(
onTap: () {}, onTap: () {},
title: Text( title: Text(
constructsModel.type == ConstructTypeEnum.morph constructsModel.type == ConstructTypeEnum.morph
? getGrammarCopy(lemma, context) ? getGrammarCopy(
: lemma, category: constructUses.category,
lemma: constructUses.lemma,
context: context,
)
: constructUses.lemma,
), ),
subtitle: LinearProgressIndicator( subtitle: Row(
children: [
Expanded(
child: LinearProgressIndicator(
value: constructUses.points / constructsModel.maxXPPerLemma, value: constructUses.points / constructsModel.maxXPPerLemma,
minHeight: 20, minHeight: 20,
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(
@ -145,6 +148,11 @@ class ConstructUsesXPTile extends StatelessWidget {
), ),
color: indicator.color(context), color: indicator.color(context),
), ),
),
const SizedBox(width: 12),
Text("${constructUses.points}xp"),
],
),
contentPadding: const EdgeInsets.symmetric( contentPadding: const EdgeInsets.symmetric(
horizontal: 20, horizontal: 20,
), ),

Loading…
Cancel
Save