Minor UI fixes

srgtuszy · Oct 22, 2024 · 5b28456 · 5b28456
1 parent 2005a26
commit 5b28456
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 75 deletions.
diff --git a/lib/electricity_chart.dart b/lib/electricity_chart.dart
@@ -52,14 +52,14 @@ class _ElectricityChartState extends State<ElectricityChart> {
                 final formattedDate =
                     '${date.hour}:${date.minute}:${date.second}';
                 return LineTooltipItem(
-                  'Time: $formattedDate\nUsage: ${spot.y.toStringAsFixed(2)} kWh',
+                  'Time:  $formattedDate\nUsage:  ${spot.y.toStringAsFixed(2)} kWh',
                   const TextStyle(color: Colors.white),
                 );
               }).toList();
             },
           ),
         ),
-        gridData: const FlGridData(show: true, drawVerticalLine: false),
+        gridData: const FlGridData(show: true, drawVerticalLine: true),
         lineBarsData: [
           LineChartBarData(
             spots: _spots,
@@ -92,8 +92,7 @@ class _ElectricityChartState extends State<ElectricityChart> {
               reservedSize: 50,
               getTitlesWidget: (value, meta) {
                 return Text('${value.toInt()}',
-                    style:
-                        const TextStyle(color: Colors.black54, fontSize: 12));
+                    style: Theme.of(context).textTheme.labelSmall);
               },
             ),
           ),
@@ -110,8 +109,7 @@ class _ElectricityChartState extends State<ElectricityChart> {
                 return SideTitleWidget(
                   axisSide: meta.axisSide,
                   child: Text(formattedTime,
-                      style:
-                          const TextStyle(color: Colors.black54, fontSize: 10)),
+                      style: Theme.of(context).textTheme.labelSmall),
                 );
               },
             ),

diff --git a/lib/main.dart b/lib/main.dart
@@ -193,77 +193,81 @@ class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
     return SingleChildScrollView(
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          const SizedBox(
-            height: 300,
-            child: ElectricityChart(),
-          ),
-          const SizedBox(height: 20),
-          ElevatedButton(
-            onPressed: _toggleDataGeneration,
-            child: Text(isGenerating
-                ? 'Stop Generating Data'
-                : 'Start Generating Data'),
-          ),
-          const SizedBox(height: 10),
-          ElevatedButton(
-            onPressed: _clearFirestoreData,
-            child: const Text('Clear Firestore Data'),
-          ),
-          const SizedBox(height: 10),
-          const SizedBox(height: 10),
-          StatefulBuilder(
-            builder: (context, setState) {
-              return _isLoading
-                  ? const CircularProgressIndicator()
-                  : ElevatedButton(
-                      onPressed: _triggerGenerateTips,
-                      child: const Text('Generate Tips'),
-                    );
-            },
-          ),
-          const SizedBox(height: 20),
-          StreamBuilder<List<Tip>>(
-            stream: _tipStore.streamTips(),
-            builder: (context, snapshot) {
-              if (snapshot.hasData) {
-                final tips = snapshot.data!;
-                return GridView.builder(
-                  shrinkWrap: true,
-                  gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-                    maxCrossAxisExtent: 200,
-                    mainAxisSpacing: 10,
-                    crossAxisSpacing: 10,
-                  ),
-                  itemCount: tips.length,
-                  itemBuilder: (context, index) {
-                    final tip = tips[index];
-                    return Card(
-                      child: Padding(
-                        padding: const EdgeInsets.all(10),
-                        child: Center(
-                          child: Text(
-                            tip.tip,
-                            textAlign: TextAlign.center,
-                            style: const TextStyle(fontSize: 14),
-                            maxLines: 6,
-                            overflow: TextOverflow.fade,
+      child: Padding(
+        padding: const EdgeInsets.all(30),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const SizedBox(
+              height: 300,
+              child: ElectricityChart(),
+            ),
+            const SizedBox(height: 20),
+            ElevatedButton(
+              onPressed: _toggleDataGeneration,
+              child: Text(isGenerating
+                  ? 'Stop Generating Data'
+                  : 'Start Generating Data'),
+            ),
+            const SizedBox(height: 10),
+            ElevatedButton(
+              onPressed: _clearFirestoreData,
+              child: const Text('Clear Firestore Data'),
+            ),
+            const SizedBox(height: 10),
+            const SizedBox(height: 10),
+            StatefulBuilder(
+              builder: (context, setState) {
+                return _isLoading
+                    ? const CircularProgressIndicator()
+                    : ElevatedButton(
+                        onPressed: _triggerGenerateTips,
+                        child: const Text('Generate Tips'),
+                      );
+              },
+            ),
+            const SizedBox(height: 20),
+            StreamBuilder<List<Tip>>(
+              stream: _tipStore.streamTips(),
+              builder: (context, snapshot) {
+                if (snapshot.hasData) {
+                  final tips = snapshot.data!;
+                  return GridView.builder(
+                    shrinkWrap: true,
+                    gridDelegate:
+                        const SliverGridDelegateWithMaxCrossAxisExtent(
+                      maxCrossAxisExtent: 200,
+                      mainAxisSpacing: 10,
+                      crossAxisSpacing: 10,
+                    ),
+                    itemCount: tips.length,
+                    itemBuilder: (context, index) {
+                      final tip = tips[index];
+                      return Card(
+                        child: Padding(
+                          padding: const EdgeInsets.all(10),
+                          child: Center(
+                            child: Text(
+                              tip.tip,
+                              textAlign: TextAlign.center,
+                              style: const TextStyle(fontSize: 14),
+                              maxLines: 6,
+                              overflow: TextOverflow.fade,
+                            ),
                           ),
                         ),
-                      ),
-                    );
-                  },
-                );
-              } else if (snapshot.hasError) {
-                return Text('Error: ${snapshot.error}');
-              } else {
-                return const CircularProgressIndicator();
-              }
-            },
-          ),
-        ],
+                      );
+                    },
+                  );
+                } else if (snapshot.hasError) {
+                  return Text('Error: ${snapshot.error}');
+                } else {
+                  return const CircularProgressIndicator();
+                }
+              },
+            ),
+          ],
+        ),
       ),
     );
   }