diff --git a/firka/lib/l10n b/firka/lib/l10n index 305aee3..8d2a419 160000 --- a/firka/lib/l10n +++ b/firka/lib/l10n @@ -1 +1 @@ -Subproject commit 305aee34bf491eb4e999e0c071b74b83a11609c6 +Subproject commit 8d2a419999fde59d9aedb028c2b2acd1d8ee4e14 diff --git a/firka/lib/ui/phone/pages/home/home_grades.dart b/firka/lib/ui/phone/pages/home/home_grades.dart index b1ddd91..e9dbfbb 100644 --- a/firka/lib/ui/phone/pages/home/home_grades.dart +++ b/firka/lib/ui/phone/pages/home/home_grades.dart @@ -96,6 +96,7 @@ class _HomeGradesScreen extends State { ); } else { var subjectAvg = 0.00; + var subjectAvgRounded = 0.00; final List subjects = List.empty(growable: true); final List gradeCards = []; @@ -134,10 +135,12 @@ class _HomeGradesScreen extends State { )); } - subjectAvg += roundGrade(avg); + subjectAvg += avg; + subjectAvgRounded += roundGrade(avg); } subjectAvg /= subjects.length; + subjectAvgRounded /= subjects.length; var subjectAvgColor = getGradeColor(subjectAvg); @@ -206,6 +209,30 @@ class _HomeGradesScreen extends State { ), ], ), + FirkaCard( + left: [ + Text( + widget.data.l10n.subject_avg_rounded, + style: appStyle.fonts.B_16SB + .apply(color: appStyle.colors.textPrimary), + ), + ], + right: [ + Card( + shadowColor: Colors.transparent, + color: subjectAvgColor.withAlpha(38), + child: Padding( + padding: EdgeInsets.only( + left: 8, right: 8, top: 4, bottom: 4), + child: Text( + subjectAvgRounded.toStringAsFixed(2), + style: appStyle.fonts.B_16SB + .apply(color: subjectAvgColor), + ), + ), + ), + ], + ), FirkaCard(left: [ Text( widget.data.l10n.class_avg,