Clean up and simplify code

QuantumPhysique · Jan 28, 2024 · f83b87d · f83b87d
1 parent f9cae34
commit f83b87d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 46 deletions.
diff --git a/app/lib/pages/measurementScreen.dart b/app/lib/pages/measurementScreen.dart
@@ -67,7 +67,7 @@ class _MeasurementScreen extends State<MeasurementScreen> {
       final List<SortedMeasurement> measurements = database.sortedMeasurements;
       return measurements.isNotEmpty
           ? measurementScreen(context, snapshot)
-          : defaultEmptyChart(context);
+          : defaultEmptyChart(context: context);
     }
 
     return StreamBuilder<List<Measurement>>(

diff --git a/app/lib/pages/overview.dart b/app/lib/pages/overview.dart
@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:trale/core/icons.dart';
 import 'package:trale/core/measurement.dart';
 import 'package:trale/core/measurementDatabase.dart';
 import 'package:trale/core/theme.dart';
@@ -44,35 +42,6 @@ class _OverviewScreen extends State<OverviewScreen> {
     final int firstDelayInMilliseconds =
         TraleTheme.of(context)!.transitionDuration.normal.inMilliseconds;
 
-    final SizedBox lineChart = SizedBox(
-      height: MediaQuery.of(context).size.height / 3,
-      width: MediaQuery.of(context).size.width,
-      child: Card(
-        shape: TraleTheme.of(context)!.borderShape,
-        color: Theme.of(context).colorScheme.surface,
-        margin: EdgeInsets.symmetric(
-          horizontal: TraleTheme.of(context)!.padding,
-        ),
-        child: CustomLineChart(loadedFirst: loadedFirst)
-      ),
-    );
-
-    final Widget dummyChart = emptyChart(
-      context,
-      <InlineSpan>[
-        TextSpan(
-          text: AppLocalizations.of(context)!.intro1,
-        ),
-        const WidgetSpan(
-          child: Icon(CustomIcons.add),
-          alignment: PlaceholderAlignment.middle,
-        ),
-        TextSpan(
-          text: AppLocalizations.of(context)!.intro2,
-        ),
-      ],
-    );
-
     Widget overviewScreen(BuildContext context,
         AsyncSnapshot<List<Measurement>> snapshot) {
       return Column(
@@ -119,7 +88,7 @@ class _OverviewScreen extends State<OverviewScreen> {
 
       return measurements.isNotEmpty
           ? overviewScreen(context, snapshot)
-          : dummyChart;
+          : defaultEmptyChart(context: context, overviewScreen: true);
     }
 
     return StreamBuilder<List<Measurement>>(

diff --git a/app/lib/pages/statScreen.dart b/app/lib/pages/statScreen.dart
@@ -124,7 +124,7 @@ class _StatsScreen extends State<StatsScreen> {
       final List<SortedMeasurement> measurements = database.sortedMeasurements;
       return measurements.isNotEmpty
           ? statsScreen(context, snapshot)
-          : defaultEmptyChart(context);
+          : defaultEmptyChart(context:context);
     }
 
 

diff --git a/app/lib/widget/emptyChart.dart b/app/lib/widget/emptyChart.dart
@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:trale/core/icons.dart';
 import 'package:trale/core/theme.dart';
 import 'package:trale/widget/animate_in_effect.dart';
 import 'package:trale/widget/fade_in_effect.dart';
 
-// Define empty Chart, which is used in case there are no measurements yet
+/// Define empty Chart, which is used in case there are no measurements yet
 Widget emptyChart(BuildContext context, List<InlineSpan> inlineSpan) {
   final int animationDurationInMilliseconds =
       TraleTheme.of(context)!.transitionDuration.slow.inMilliseconds;
@@ -44,16 +45,33 @@ Widget emptyChart(BuildContext context, List<InlineSpan> inlineSpan) {
   );
 }
 
-// Define the default empty Chart,
-// which is used in case there are no measurements yet
-Widget defaultEmptyChart(BuildContext context) {
-  final List<InlineSpan> inlineSpan = <InlineSpan>[
-    TextSpan(
-      text: AppLocalizations.of(context)!.intro3,
-    ),
-    const TextSpan(
-        text: '\n\n😃'
-    ),
-  ];
+/// Define the default empty Chart,
+/// which is used in case there are no measurements yet.
+Widget defaultEmptyChart({required BuildContext context,
+                          bool overviewScreen = false}) {
+  List<InlineSpan> inlineSpan;
+  if (overviewScreen){
+    inlineSpan = <InlineSpan>[
+      TextSpan(
+        text: AppLocalizations.of(context)!.intro1,
+      ),
+      const WidgetSpan(
+        child: Icon(CustomIcons.add),
+        alignment: PlaceholderAlignment.middle,
+      ),
+      TextSpan(
+        text: AppLocalizations.of(context)!.intro2,
+      ),
+    ];
+  } else{
+    inlineSpan = <InlineSpan>[
+      TextSpan(
+        text: AppLocalizations.of(context)!.intro3,
+      ),
+      const TextSpan(
+          text: '\n\n😃'
+      ),
+    ];
+  }
   return emptyChart(context, inlineSpan);
 }