Merge branch 'main' into 871-autoplay-translation-on-by-default

pull/1476/head
ggurdin 1 year ago committed by GitHub
commit 61397d1228
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -105,23 +105,23 @@ extension ConstructUseTypeExtension on ConstructUseTypeEnum {
return 2; return 2;
case ConstructUseTypeEnum.corIt: case ConstructUseTypeEnum.corIt:
return 1;
case ConstructUseTypeEnum.ignIt: case ConstructUseTypeEnum.ignIt:
case ConstructUseTypeEnum.ignIGC: case ConstructUseTypeEnum.ignIGC:
case ConstructUseTypeEnum.ignPA: case ConstructUseTypeEnum.ignPA:
case ConstructUseTypeEnum.ignWL: case ConstructUseTypeEnum.ignWL:
return 1;
case ConstructUseTypeEnum.unk: case ConstructUseTypeEnum.unk:
case ConstructUseTypeEnum.nan: case ConstructUseTypeEnum.nan:
return 0; return 0;
case ConstructUseTypeEnum.incIt: case ConstructUseTypeEnum.incIt:
case ConstructUseTypeEnum.incIGC: case ConstructUseTypeEnum.incIGC:
return -1; return -2;
case ConstructUseTypeEnum.incPA: case ConstructUseTypeEnum.incPA:
case ConstructUseTypeEnum.incWL: case ConstructUseTypeEnum.incWL:
return -2; return -3;
} }
} }
} }

@ -16,6 +16,11 @@ class AnalyticsPopup extends StatelessWidget {
super.key, super.key,
}); });
// we just want to show the constructs that have points
List<ConstructUses> get constructs => constructsModel.constructList
.where((constructUse) => constructUse.points > 0)
.toList();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Dialog( return Dialog(
@ -36,16 +41,16 @@ class AnalyticsPopup extends StatelessWidget {
), ),
body: Padding( body: Padding(
padding: const EdgeInsets.symmetric(vertical: 20), padding: const EdgeInsets.symmetric(vertical: 20),
child: constructsModel.constructList.isEmpty child: constructs.isEmpty
? Center( ? Center(
child: Text(L10n.of(context)!.noDataFound), child: Text(L10n.of(context)!.noDataFound),
) )
: ListView.builder( : ListView.builder(
itemCount: constructsModel.constructList.length, itemCount: constructs.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
return Tooltip( return Tooltip(
message: message:
"${constructsModel.constructList[index].points} / ${constructsModel.maxXPPerLemma}", "${constructs[index].points} / ${constructsModel.maxXPPerLemma}",
child: ListTile( child: ListTile(
onTap: () {}, onTap: () {},
title: Text( title: Text(
@ -55,12 +60,11 @@ class AnalyticsPopup extends StatelessWidget {
.constructList[index].lemma, .constructList[index].lemma,
context, context,
) )
: constructsModel.constructList[index].lemma, : constructs[index].lemma,
), ),
subtitle: LinearProgressIndicator( subtitle: LinearProgressIndicator(
value: value: constructs[index].points /
constructsModel.constructList[index].points / constructsModel.maxXPPerLemma,
constructsModel.maxXPPerLemma,
minHeight: 20, minHeight: 20,
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(
Radius.circular(AppConfig.borderRadius), Radius.circular(AppConfig.borderRadius),

Loading…
Cancel
Save