From 9bf1363ab59e33f32244b1a9d17ba0db4d9931df Mon Sep 17 00:00:00 2001
From: Daniel Cujba <daniel.cujba.54@gmail.com>
Date: Sun, 20 Nov 2022 07:15:06 +0200
Subject: [PATCH] sadas

---
 assets/images/paharPB.png | Bin 0 -> 2115 bytes
 lib/main.dart             | 250 ++++++++++++++++++++++++++++++--------
 pubspec.yaml              |   1 +
 3 files changed, 203 insertions(+), 48 deletions(-)
 create mode 100644 assets/images/paharPB.png

diff --git a/assets/images/paharPB.png b/assets/images/paharPB.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2616c3baec214cafa2dc6ed0bcbd10f90673ebb
GIT binary patch
literal 2115
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

literal 0
HcmV?d00001

diff --git a/lib/main.dart b/lib/main.dart
index 6dd64e4..5d2df1b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -18,7 +18,7 @@ class MyApp extends StatelessWidget {
             backgroundColor: Colors.transparent,
             elevation: 0.0,
             centerTitle: true,
-            titleTextStyle: TextStyle(color: Colors.black, fontSize: 20),
+            titleTextStyle: TextStyle(color: Colors.white, fontSize: 30),
           )),
       home: const MyHomePage(title: 'Fitness Homie'),
     );
@@ -41,6 +41,7 @@ class _MyHomePageState extends State<MyHomePage> {
   List<Widget> tasks = [];
   final tasks_progress = [];
   int _total_tasks = 15;
+  int _water = 7;
 
   final screens = [];
 
@@ -449,59 +450,211 @@ class _MyHomePageState extends State<MyHomePage> {
 
   void create_home_page() {
     setState(() {
-      screens.add(
-        SpannableGrid(
-          cells: [
-            SpannableGridCellData(
+      screens.add(SpannableGrid(
+        cells: [
+          SpannableGridCellData(
               id: 1,
               column: 1,
               row: 1,
-              columnSpan: 2,
+              columnSpan: 4,
+              rowSpan: 3,
               child: Container(
-                  child: Center(child: Text("Text 1")),
-                  color: Color.fromRGBO(255, 255, 0, 1)),
-            ),
-            SpannableGridCellData(
-                id: 2,
-                column: 1,
-                row: 2,
-                columnSpan: 2,
-                child: Container(
-                    child: Center(child: Text("Text 1")),
-                    color: Color.fromRGBO(255, 255, 0, 1))),
-            SpannableGridCellData(
-              id: 3,
-              column: 1,
-              row: 3,
-              child: Container(
-                  child: Center(child: Text("Text 1")),
-                  color: Color.fromRGBO(255, 255, 0, 1)),
-            ),
-            SpannableGridCellData(
-              id: 4,
-              column: 1,
-              row: 4,
-              child: Container(
-                  child: Center(child: Text("Text 1")),
-                  color: Color.fromRGBO(255, 255, 0, 1)),
-            ),
-            SpannableGridCellData(
-              id: 5,
-              column: 2,
-              row: 3,
-              rowSpan: 2,
-              child: Container(
-                  child: Center(child: Text("Text 1")),
-                  color: Color.fromRGBO(255, 255, 0, 1)),
-            ),
-          ],
-          columns: 2,
-          rows: 4,
-          style: SpannableGridStyle(
-            spacing: 10,
+                  decoration: BoxDecoration(
+                      border: Border.all(
+                          width: 5, color: Color.fromARGB(255, 115, 115, 130)),
+                      borderRadius: BorderRadius.all(Radius.circular(25)),
+                      color: Color.fromRGBO(240, 240, 240, 1)),
+                  child: SpannableGrid(
+                    cells: [
+                      SpannableGridCellData(
+                        id: 5,
+                        column: 1,
+                        row: 1,
+                        columnSpan: 4,
+                        child: Container(
+                            child: Center(
+                                child: Text(
+                          "Hello Mihnea!",
+                          style: TextStyle(
+                            fontSize: 35,
+                            fontFamily: "Lato",
+                            color: Color.fromARGB(255, 0, 0, 0),
+                            fontWeight: FontWeight.w500,
+                            fontStyle: FontStyle.normal,
+                            letterSpacing: 8,
+                            wordSpacing: 10,
+                          ),
+                        ))),
+                      ),
+                      SpannableGridCellData(
+                        id: 6,
+                        column: 1,
+                        row: 2,
+                        columnSpan: 4,
+                        child: Container(
+                            child: Center(
+                                child: Text(
+                          "Welcome back!",
+                          style: TextStyle(
+                              fontSize: 35,
+                              color: Color.fromARGB(255, 0, 0, 0),
+                              fontStyle: FontStyle.normal,
+                              letterSpacing: 4,
+                              wordSpacing: 5),
+                        ))),
+                      ),
+                      SpannableGridCellData(
+                          id: 7,
+                          column: 1,
+                          row: 3,
+                          columnSpan: 4,
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              SizedBox(
+                                width: MediaQuery.of(context).size.width * 0.85,
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Text("data1"),
+                                    Text("data2"),
+                                  ],
+                                ),
+                              ),
+                              SizedBox(
+                                height: 15,
+                              ),
+                              SizedBox(
+                                child: LinearPercentIndicator(
+                                  alignment: MainAxisAlignment.center,
+                                  width:
+                                      MediaQuery.of(context).size.width * 0.8,
+                                  animation: true,
+                                  lineHeight: 20.0,
+                                  animationDuration: 2500,
+                                  percent: 0.8,
+                                  barRadius: const Radius.circular(16),
+                                  center: Text("80.0%"),
+                                  progressColor: Colors.deepPurple,
+                                ),
+                              ),
+                            ],
+                          ))
+                    ],
+                    columns: 4,
+                    rows: 3,
+                    style: SpannableGridStyle(
+                      spacing: 0,
+                    ),
+                  ))),
+          SpannableGridCellData(
+            id: 2,
+            column: 1,
+            row: 4,
+            columnSpan: 2,
+            rowSpan: 2,
+            child: Container(
+                decoration: BoxDecoration(
+                    border: Border.all(
+                        width: 5, color: Color.fromARGB(255, 115, 115, 130)),
+                    borderRadius: BorderRadius.all(Radius.circular(25)),
+                    color: Color.fromRGBO(240, 240, 240, 1)),
+                child: Center(
+                    child: Flex(
+                  direction: Axis.vertical,
+                  children: [
+                    Expanded(flex: 1, child: Center(child: Text("Hours Used"))),
+                    Expanded(
+                        flex: 1,
+                        child: Center(
+                            child: Flex(
+                          direction: Axis.vertical,
+                          children: [Text("12 hrs"), Text("6hrs total")],
+                        ))),
+                  ],
+                ))),
           ),
+          SpannableGridCellData(
+            id: 3,
+            column: 1,
+            row: 6,
+            columnSpan: 2,
+            rowSpan: 2,
+            child: Container(
+                decoration: BoxDecoration(
+                    border: Border.all(
+                        width: 5, color: Color.fromARGB(255, 115, 115, 130)),
+                    borderRadius: BorderRadius.all(Radius.circular(25)),
+                    color: Color.fromRGBO(240, 240, 240, 1)),
+                alignment: Alignment.center,
+                child: Flex(
+                  direction: Axis.vertical,
+                  children: [
+                    Expanded(flex: 1, child: Center(child: Text('data'))),
+                    Expanded(
+                        flex: 1,
+                        child: Center(
+                            child: Stack(
+                          children: [
+                            LinearPercentIndicator(
+                              alignment: MainAxisAlignment.center,
+                              width: 160,
+                              animation: true,
+                              animateFromLastPercent: true,
+                              lineHeight: 35.0,
+                              animationDuration: 1000,
+                              percent: 0.1 * _water,
+                              progressColor: Color.fromARGB(255, 58, 79, 183),
+                            ),
+                            Image(
+                              image: AssetImage("paharPB.png"),
+                            ),
+                          ],
+                        ))),
+                    Expanded(
+                        flex: 1,
+                        child: Center(
+                            child: TextButton(
+                          style: ButtonStyle(
+                            foregroundColor: MaterialStateProperty.all<Color>(
+                                Colors.deepPurple),
+                          ),
+                          onPressed: () {
+                            setState(() {
+                              _water = _water + 1;
+                            });
+                          },
+                          child: Text(
+                            'TextButton',
+                          ),
+                        )))
+                  ],
+                )),
+          ),
+          SpannableGridCellData(
+            id: 4,
+            column: 3,
+            row: 4,
+            rowSpan: 4,
+            columnSpan: 2,
+            child: Container(
+              child: Center(child: Text("Text 4")),
+              decoration: BoxDecoration(
+                  border: Border.all(
+                      width: 5, color: Color.fromARGB(255, 115, 115, 130)),
+                  borderRadius: BorderRadius.all(Radius.circular(25)),
+                  color: Color.fromRGBO(240, 240, 240, 1)),
+            ),
+          ),
+        ],
+        columns: 4,
+        rows: 7,
+        style: SpannableGridStyle(
+          spacing: 10,
         ),
-      );
+      ));
     });
   }
 
@@ -540,6 +693,7 @@ class _MyHomePageState extends State<MyHomePage> {
               BottomNavigationBarItem(
                   label: "Profile", icon: Icon(Icons.person))
             ],
+            selectedItemColor: Colors.deepPurple,
             currentIndex: _selectedIndex,
             onTap: _onItemTapped,
           ),
diff --git a/pubspec.yaml b/pubspec.yaml
index a8ab086..32188ed 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -59,6 +59,7 @@ dev_dependencies:
 flutter:
   assets:
   - blank-profile.jpg
+  - paharPB.png
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.