From 80de341424e9233ea32bdc7d92ff06f2ba262f45 Mon Sep 17 00:00:00 2001 From: xMadKing Date: Sun, 24 Dec 2023 19:35:55 +0100 Subject: [PATCH] Fixed bug with homepage not updating --- lib/pages/homepage.dart | 10 +++++----- lib/widgets/categorywidget.dart | 2 +- lib/widgets/navbar.dart | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/pages/homepage.dart b/lib/pages/homepage.dart index 80660cc..2375fec 100644 --- a/lib/pages/homepage.dart +++ b/lib/pages/homepage.dart @@ -11,15 +11,14 @@ import 'package:smartspend/backend/wyrm/database.dart'; import 'package:smartspend/pages/myaccountpage.dart'; class HomePage extends StatefulWidget { - final User client; - - const HomePage({super.key, required this.client}); + const HomePage({super.key}); @override State createState() => _HomePageState(); } class _HomePageState extends State{ + late User client; late List categories; Map dataMap = {}; bool _loading = true; @@ -33,6 +32,7 @@ class _HomePageState extends State{ Future initArgs() async { categories = await database.categories(); + client = (await database.users()).first; setState(() { _loading = false; }); @@ -76,7 +76,7 @@ class _HomePageState extends State{ for (var element in categories) { dataMap.addEntries([MapEntry(element.categoryName, element.currentSpending.toDouble())]); } - double width = getTotalSpending() / widget.client.monthlyIncome; + double width = getTotalSpending() / client.monthlyIncome; Color barColor = Colors.purple.shade800; if(width >= 0.8){ barColor = Colors.red.shade700; @@ -84,7 +84,7 @@ class _HomePageState extends State{ width = 1; } } - String name = widget.client.name; + String name = client.name; return PopScope( canPop: false, child: Scaffold( diff --git a/lib/widgets/categorywidget.dart b/lib/widgets/categorywidget.dart index 4db5236..3824414 100644 --- a/lib/widgets/categorywidget.dart +++ b/lib/widgets/categorywidget.dart @@ -22,7 +22,7 @@ class CategoryWidget extends StatelessWidget { Color fontColor = getFontColor(); return GestureDetector( onTap: () { - print("HELLOTHERE"); + //we can maybe add future functionality here }, child: Container( margin: const EdgeInsets.all(5), diff --git a/lib/widgets/navbar.dart b/lib/widgets/navbar.dart index 7e3a0d7..7ebf503 100644 --- a/lib/widgets/navbar.dart +++ b/lib/widgets/navbar.dart @@ -17,9 +17,7 @@ class _NavBar extends State{ Color bg_color = Color(0xFF1E2038); int index = 0; late List options = [ - HomePage( - client: widget.client, - ), + HomePage(), AddExpensePage(), MyAccount(), ];