From cccdc04deecb9eeacf390fd7cabaed7437180429 Mon Sep 17 00:00:00 2001
From: doman <domanski@basement.pl>
Date: Sat, 29 Jul 2023 20:10:59 +0200
Subject: [PATCH] RADOM JAZDA

---
 lib/models/product.dart | 13 ++++-----
 lib/screens/main.dart   | 61 ++++++++++-------------------------------
 lib/widgets/entry.dart  |  2 +-
 3 files changed, 22 insertions(+), 54 deletions(-)

diff --git a/lib/models/product.dart b/lib/models/product.dart
index c816f27..38370bc 100644
--- a/lib/models/product.dart
+++ b/lib/models/product.dart
@@ -6,13 +6,12 @@ class Product {
   final double carb;
   final double fat;
 
-
-  const Entry({
+  const Product({
     required this.id,
-    required this.name;
-    required this.calories;
-    required this.protein;
-    required this.carb;
-    required this.fat;
+    required this.name,
+    required this.calories,
+    required this.protein,
+    required this.carb,
+    required this.fat,
   });
 }
diff --git a/lib/screens/main.dart b/lib/screens/main.dart
index 2a0b40c..a9ae60c 100644
--- a/lib/screens/main.dart
+++ b/lib/screens/main.dart
@@ -14,60 +14,29 @@ class MainScreen extends BasedScreen {
 }
 
 class _MainScreen extends State<MainScreen> {
+  Diary? diary;
+
   @override
   Widget build(BuildContext context) {
-    var testDiary = Diary(
-      meals: <Meal>[
-        Meal(
-          entries: <Entry>[
-            Entry(
-              name: "DUPA",
-              calories: 123.21,
-              protein: 20.13,
-              fat: 99.99,
-              carb: -15.02,
-            ),
-            Entry(
-              name: "SRAKA",
-              calories: 123.21,
-              protein: 20.13,
-              fat: 99.99,
-              carb: -15.02,
-            ),
-          ]
-        ),
-        Meal(
-          entries: <Entry>[
-            Entry(
-              name: "MADA",
-              calories: 123.21,
-              protein: 20.13,
-              fat: 99.99,
-              carb: -15.02,
-            ),
-            Entry(
-              name: "FAKA",
-              calories: 123.21,
-              protein: 20.13,
-              fat: 99.99,
-              carb: -15.02,
-            ),
-          ]
-        ),
-      ]
-    );
-     
+    var content;
+
+    if (diary != null) {
+        content = Container(
+          constraints: const BoxConstraints(maxWidth: 600),
+          padding: const EdgeInsets.all(10),
+          child: DiaryWidget(diary: diary!),
+        );
+    } else {
+      content = const CircularProgressIndicator();
+    }
+
     return Scaffold(
       appBar: AppBar(
         backgroundColor: Theme.of(context).colorScheme.inversePrimary,
         title: Text("FOODER"),
       ),
       body: Center(
-        child: Container(
-          constraints: const BoxConstraints(maxWidth: 600),
-          padding: const EdgeInsets.all(10),
-          child: DiaryWidget(diary: testDiary),
-        ),
+        child: content,
       ),
     );
   }
diff --git a/lib/widgets/entry.dart b/lib/widgets/entry.dart
index 3e195ec..e891099 100644
--- a/lib/widgets/entry.dart
+++ b/lib/widgets/entry.dart
@@ -12,7 +12,7 @@ class EntryWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       padding: const EdgeInsets.all(8),
-      child: Text(entry.name),
+      child: Text(entry.product.name),
     );
   }
 }