Commit a00515c

derdilla <derdilla06@gmail.com>
2023-09-07 17:50:03
improved functionality on small devices
1 parent ba4e8ca
Changed files (3)
lib
lib/components/measurement_list/measurement_list.dart
@@ -43,14 +43,17 @@ class ModernListHeader extends StatelessWidget {
                     Expanded(
                         flex: 30,
                         child: Text(localizations.sysLong,
+                            overflow: TextOverflow.ellipsis,
                             style: TextStyle(fontWeight: FontWeight.bold, color: settings.sysColor))),
                     Expanded(
                         flex: 30,
                         child: Text(localizations.diaLong,
+                            overflow: TextOverflow.ellipsis,
                             style: TextStyle(fontWeight: FontWeight.bold, color: settings.diaColor))),
                     Expanded(
                         flex: 30,
                         child: Text(localizations.pulLong,
+                            overflow: TextOverflow.ellipsis,
                             style: TextStyle(fontWeight: FontWeight.bold, color: settings.pulColor))),
                     const Expanded(
                         flex: 20,
lib/components/display_interval_picker.dart
@@ -10,36 +10,35 @@ class IntervalPicker extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Consumer<Settings>(builder: (context, settings, child) {
-      final Widget intervallDisplay;
+      final String intervallDisplayText;
       switch (settings.graphStepSize) {
         case TimeStep.day:
-          intervallDisplay = Text(DateFormat.yMMMd(AppLocalizations.of(context)!.localeName).format(settings.displayDataStart));
+          intervallDisplayText = DateFormat.yMMMd(AppLocalizations.of(context)!.localeName).format(settings.displayDataStart);
           break;
         case TimeStep.week:
           final dayOfYear = int.parse(DateFormat("D").format(settings.displayDataStart));
           final weekOfYear = ((dayOfYear - settings.displayDataStart.weekday + 10) / 7).floor();
-          intervallDisplay = Text(AppLocalizations.of(context)!.weekOfYear(weekOfYear, settings.displayDataStart.year));
+          intervallDisplayText = AppLocalizations.of(context)!.weekOfYear(weekOfYear, settings.displayDataStart.year);
           break;
         case TimeStep.month:
-          intervallDisplay =  Text(DateFormat.yMMM(AppLocalizations.of(context)!.localeName).format(settings.displayDataStart));
+          intervallDisplayText =  DateFormat.yMMM(AppLocalizations.of(context)!.localeName).format(settings.displayDataStart);
           break;
         case TimeStep.year:
-          intervallDisplay =  Text(DateFormat.y(AppLocalizations.of(context)!.localeName).format(settings.displayDataStart));
+          intervallDisplayText = DateFormat.y(AppLocalizations.of(context)!.localeName).format(settings.displayDataStart);
           break;
         case TimeStep.lifetime:
-          intervallDisplay =  const Text('-');
+          intervallDisplayText =  '-';
           break;
         case TimeStep.last7Days:
         case TimeStep.last30Days:
         case TimeStep.custom:
           final f = DateFormat.yMMMd(AppLocalizations.of(context)!.localeName);
-          intervallDisplay = Text('${f.format(settings.displayDataStart)} - ${f.format(settings.displayDataEnd)}');
+          intervallDisplayText = '${f.format(settings.displayDataStart)} - ${f.format(settings.displayDataEnd)}';
           break;
-
       }
       return Column(
         children: [
-          intervallDisplay,
+          Text(intervallDisplayText, overflow: TextOverflow.ellipsis,),
           const SizedBox(
             height: 2,
           ),
lib/screens/home.dart
@@ -121,7 +121,7 @@ class AppHome extends StatelessWidget {
                   onPressed: () {
                     Navigator.push(context, _buildTransition(const StatisticsPage(), settings.animationSpeed));
                   },
-                  child: const Icon(Icons.insights),
+                  child: const Icon(Icons.insights, color: Colors.black),
                 ),
                 const SizedBox(
                   height: 10,