diff --git a/lib/pages/report.dart b/lib/pages/report.dart index 21519f2..5e724f3 100644 --- a/lib/pages/report.dart +++ b/lib/pages/report.dart @@ -11,8 +11,6 @@ import '/models/tracked_item.dart'; /// TODO: /// - Projected Assets: /// - Allow customization? -/// - Fix bug where editing an item does not reflect immediately when returning to Reports page. -/// - Currently reflects after going back to Reports the 2nd time. double _assetTotal = -1, _expenseMonthly = -1, @@ -67,18 +65,14 @@ class _ProjectionPageState extends State { _expenseYearly < 0) { _showProjections = false; - projections = Center( - child: SizedBox( - child: CircularProgressIndicator(), - ), - ); - Future.delayed(Duration(seconds: 1), () { setState(() { _showProjections = true; }); }); - } else { + } + + if (_showProjections) { double oneMonth = _assetTotal + _incomeMonthly - _expenseMonthly, threeMonths = _assetTotal + (3 * (_incomeMonthly - _expenseMonthly)), sixMonths = _assetTotal + (6 * (_incomeMonthly - _expenseMonthly)), @@ -134,6 +128,12 @@ class _ProjectionPageState extends State { proj6, ], ); + } else { + projections = Center( + child: SizedBox( + child: CircularProgressIndicator(), + ), + ); } // Return all of the UI elements.