Add more verbose small stat labels

cph-cachet · Jul 24, 2023 · 7afb4d8 · 7afb4d8
1 parent 393e59f
commit 7afb4d8
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 35 deletions.
diff --git a/assets/lang/da.json b/assets/lang/da.json
@@ -16,7 +16,9 @@
     "pages.data_viz.thanks": "Tak for din deltagelse i dette studie. Her er et resumé af dit bidrag.",
     "pages.data_viz.no_data": "Ingen data at vise",
     "cards.scoreboard.days": "Antal dage i studiet",
+    "cards.scoreboard.days-short": "Dage",
     "cards.scoreboard.tasks": "Antal opgaver udført",
+    "cards.scoreboard.tasks-short": "Opgaver",
     "cards.measures.title": "MÅLINGER",
     "cards.survey.title": "SPØRGESKEMAER",
     "cards.audio.title": "LYDOPTAGELSER",

diff --git a/assets/lang/en.json b/assets/lang/en.json
@@ -17,7 +17,9 @@
     "pages.data_viz.no_data": "No data to show",
     "cards.no_data": "No data",
     "cards.scoreboard.days": "Days in study",
+    "cards.scoreboard.days-short": "Days",
     "cards.scoreboard.tasks": "Tasks completed",
+    "cards.scoreboard.tasks-short": "Tasks",
     "cards.measures.title": "MEASURES",
     "cards.survey.title": "SURVEYS",
     "cards.audio.title": "AUDIOS",

diff --git a/lib/ui/cards/scoreboard_card.dart b/lib/ui/cards/scoreboard_card.dart
@@ -51,6 +51,48 @@ class ScoreboardPersistentHeaderDelegate
       BuildContext context, double shrinkOffset, bool overlapsContent) {
     double height = 110;
 
+    double offsetForShrink = 60;
+
+    List<Widget> childrenTasks = [
+      Text(model.taskCompleted.toString(),
+          style: scoreNumberStyle.copyWith(
+              fontSize: calculateSize(shrinkOffset,
+                  scoreNumberStyleSmall.fontSize!, scoreNumberStyle.fontSize!),
+              color: Theme.of(context).primaryColor)),
+      if (shrinkOffset < offsetForShrink)
+        Text(locale.translate('cards.scoreboard.tasks'),
+            style:
+                scoreTextStyle.copyWith(color: Theme.of(context).primaryColor)),
+      if (shrinkOffset > offsetForShrink)
+        Expanded(
+          flex: 0,
+          child: Padding(
+            padding: const EdgeInsets.only(left: 8.0),
+            child: Text(locale.translate('cards.scoreboard.tasks-short'),
+                style: scoreTextStyle.copyWith(
+                    color: Theme.of(context).primaryColor)),
+          ),
+        )
+    ];
+    List<Widget> childrenDays = [
+      Text(model.daysInStudy.toString(),
+          style: scoreNumberStyle.copyWith(
+              fontSize: calculateSize(shrinkOffset,
+                  scoreNumberStyleSmall.fontSize!, scoreNumberStyle.fontSize!),
+              color: Theme.of(context).primaryColor)),
+      if (shrinkOffset < offsetForShrink)
+        Text(locale.translate('cards.scoreboard.days'),
+            style:
+                scoreTextStyle.copyWith(color: Theme.of(context).primaryColor)),
+      if (shrinkOffset > offsetForShrink)
+        Padding(
+          padding: const EdgeInsets.only(left: 8.0),
+          child: Text(locale.translate('cards.scoreboard.days-short'),
+              style:
+                  scoreTextStyle.copyWith(color: Theme.of(context).primaryColor)),
+        )
+    ];
+
     return Container(
       color: Theme.of(context).colorScheme.secondary,
       height: height,
@@ -62,24 +104,17 @@ class ScoreboardPersistentHeaderDelegate
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: [
               Expanded(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Text(model.daysInStudy.toString(),
-                        style: scoreNumberStyle.copyWith(
-                            fontSize: calculateSize(
-                                shrinkOffset,
-                                scoreNumberStyleSmall.fontSize!,
-                                scoreNumberStyle.fontSize!),
-                            color: Theme.of(context).primaryColor)),
-                    if (shrinkOffset < 60)
-                      Text(locale.translate('cards.scoreboard.days'),
-                          style: scoreTextStyle.copyWith(
-                              color: Theme.of(context).primaryColor)),
-                  ],
-                ),
+                child: shrinkOffset < offsetForShrink
+                    ? Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: childrenDays,
+                      )
+                    : Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: childrenDays,
+                      ),
               ),
-              // a vertical divider line with rounded corners that spans from 10% to 90% of the height
+              // A vertical divider line with rounded corners that spans from 10% to 90% of the height
               Expanded(
                 flex: 0,
                 child: Container(
@@ -93,23 +128,15 @@ class ScoreboardPersistentHeaderDelegate
                 ),
               ),
               Expanded(
-                flex: 1,
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Text(model.taskCompleted.toString(),
-                        style: scoreNumberStyle.copyWith(
-                            fontSize: calculateSize(
-                                shrinkOffset,
-                                scoreNumberStyleSmall.fontSize!,
-                                scoreNumberStyle.fontSize!),
-                            color: Theme.of(context).primaryColor)),
-                    if (shrinkOffset < 60)
-                      Text(locale.translate('cards.scoreboard.tasks'),
-                          style: scoreTextStyle.copyWith(
-                              color: Theme.of(context).primaryColor)),
-                  ],
-                ),
+                child: shrinkOffset < offsetForShrink
+                    ? Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: childrenTasks,
+                      )
+                    : Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: childrenTasks,
+                      ),
               )
             ],
           );
@@ -132,7 +159,7 @@ class ScoreboardPersistentHeaderDelegate
 
   @override
   bool shouldRebuild(ScoreboardPersistentHeaderDelegate oldDelegate) {
-    return false;
+    return true;
   }
 
   @override