6 Commits

5 changed files with 24 additions and 13 deletions

View File

@ -1 +1,4 @@
include: package:flutter_lints/flutter.yaml include: package:flutter_lints/flutter.yaml
analyzer:
errors:
unreachable_switch_default: ignore

View File

@ -9,7 +9,6 @@ import '/pages/tracked_item.dart';
import '/pages/report.dart'; import '/pages/report.dart';
import '/pages/settings.dart'; import '/pages/settings.dart';
import '/pages/help.dart'; import '/pages/help.dart';
import '/db.dart';
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {
const HomePage({ const HomePage({

View File

@ -11,8 +11,6 @@ import '/models/tracked_item.dart';
/// TODO: /// TODO:
/// - Projected Assets: /// - Projected Assets:
/// - Allow customization? /// - 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, double _assetTotal = -1,
_expenseMonthly = -1, _expenseMonthly = -1,
@ -67,18 +65,14 @@ class _ProjectionPageState extends State<ProjectionPage> {
_expenseYearly < 0) { _expenseYearly < 0) {
_showProjections = false; _showProjections = false;
projections = Center(
child: SizedBox(
child: CircularProgressIndicator(),
),
);
Future.delayed(Duration(seconds: 1), () { Future.delayed(Duration(seconds: 1), () {
setState(() { setState(() {
_showProjections = true; _showProjections = true;
}); });
}); });
} else { }
if (_showProjections) {
double oneMonth = _assetTotal + _incomeMonthly - _expenseMonthly, double oneMonth = _assetTotal + _incomeMonthly - _expenseMonthly,
threeMonths = _assetTotal + (3 * (_incomeMonthly - _expenseMonthly)), threeMonths = _assetTotal + (3 * (_incomeMonthly - _expenseMonthly)),
sixMonths = _assetTotal + (6 * (_incomeMonthly - _expenseMonthly)), sixMonths = _assetTotal + (6 * (_incomeMonthly - _expenseMonthly)),
@ -134,6 +128,12 @@ class _ProjectionPageState extends State<ProjectionPage> {
proj6, proj6,
], ],
); );
} else {
projections = Center(
child: SizedBox(
child: CircularProgressIndicator(),
),
);
} }
// Return all of the UI elements. // Return all of the UI elements.

View File

@ -1,5 +1,9 @@
// Flutter
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// Local
import '/widgets/cards.dart';
/// TODO: /// TODO:
/// - Export DB (JSON?) /// - Export DB (JSON?)
/// - Import DB (JSON?) /// - Import DB (JSON?)
@ -14,8 +18,14 @@ class SettingsPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Center( return Center(
child: Text( child: Column(
"No settings yet. :)", mainAxisSize: MainAxisSize.max,
children: [
TitleCard(title: "Settings"),
Text(
"No settings exist yet. :)",
),
],
), ),
); );
} }

View File

@ -395,7 +395,6 @@ class _TrackedItemInputDialogState extends State<TrackedItemInputDialog> {
: Text("Edit ${_type!.title}"), : Text("Edit ${_type!.title}"),
), ),
content: FutureBuilder<List<TrackedItem>>( content: FutureBuilder<List<TrackedItem>>(
// TODO / TBD -- This should no longer only be Expenses.
future: items, future: items,
builder: (BuildContext context, builder: (BuildContext context,
AsyncSnapshot<List<TrackedItem>> snapshot) { AsyncSnapshot<List<TrackedItem>> snapshot) {