Compare commits

...

2 Commits

Author SHA1 Message Date
e896611bd1 Refactor to add header to the Tracked Item pages. 2025-03-27 14:31:34 -07:00
2d9c93fec4 Fix typo. 2025-03-27 14:26:51 -07:00
4 changed files with 262 additions and 208 deletions

View File

@ -2,21 +2,26 @@ enum ItemType {
expense( expense(
title: "Expense", title: "Expense",
plural: "Expenses", plural: "Expenses",
description: "Items which cost revenue, or decrease asset value.",
), ),
income( income(
title: "Income", title: "Income",
plural: "Incomes", plural: "Income",
description: "Items which bring in revenue, or increase asset value.",
), ),
asset( asset(
title: "Asset", title: "Asset",
plural: "Assets", plural: "Assets",
description: "Value which has been earned and can be spent.",
); );
const ItemType({ const ItemType({
required this.title, required this.title,
required this.plural, required this.plural,
required this.description,
}); });
final String title; final String title;
final String plural; final String plural;
final String description;
} }

View File

@ -45,7 +45,7 @@ class HelpPage extends StatelessWidget {
" adding receipts.", " adding receipts.",
), ),
Text( Text(
"\n\t\t Tracked items can be swiped left to right for ," "\n\t\t Tracked items can be swiped left to right for"
" Deletion or right to left for Editing. Items are sorted" " Deletion or right to left for Editing. Items are sorted"
" from highest to lowest so that the biggest impacts are" " from highest to lowest so that the biggest impacts are"
" always in view.", " always in view.",

View File

@ -56,7 +56,7 @@ class _HomePageState extends State<HomePage> {
switch (pageSelected) { switch (pageSelected) {
case 0: case 0:
page = TrackedItemPage( page = TrackedItemPage(
assetsToLoad: DatabaseHelper.instance.getExpenses(), assetType: ItemType.expense,
notifyParent: refresh, notifyParent: refresh,
); );
dialog = TrackedItemInputDialog( dialog = TrackedItemInputDialog(
@ -66,7 +66,7 @@ class _HomePageState extends State<HomePage> {
break; break;
case 1: case 1:
page = TrackedItemPage( page = TrackedItemPage(
assetsToLoad: DatabaseHelper.instance.getIncomes(), assetType: ItemType.income,
notifyParent: refresh, notifyParent: refresh,
); );
dialog = TrackedItemInputDialog( dialog = TrackedItemInputDialog(
@ -76,7 +76,7 @@ class _HomePageState extends State<HomePage> {
break; break;
case 2: case 2:
page = TrackedItemPage( page = TrackedItemPage(
assetsToLoad: DatabaseHelper.instance.getAssets(), assetType: ItemType.asset,
notifyParent: refresh, notifyParent: refresh,
); );
dialog = TrackedItemInputDialog( dialog = TrackedItemInputDialog(
@ -120,15 +120,15 @@ class _HomePageState extends State<HomePage> {
destinations: [ destinations: [
NavigationRailDestination( NavigationRailDestination(
icon: Icon(Icons.payment), icon: Icon(Icons.payment),
label: Text('Expenses'), label: Text(ItemType.expense.plural),
), ),
NavigationRailDestination( NavigationRailDestination(
icon: Icon(Icons.account_balance), icon: Icon(Icons.account_balance),
label: Text('Income'), label: Text(ItemType.income.plural),
), ),
NavigationRailDestination( NavigationRailDestination(
icon: Icon(Icons.attach_money), icon: Icon(Icons.attach_money),
label: Text('Liquid Assets'), label: Text(ItemType.asset.plural),
), ),
NavigationRailDestination( NavigationRailDestination(
icon: Icon(Icons.bar_chart), icon: Icon(Icons.bar_chart),

View File

@ -11,12 +11,12 @@ import '/models/frequency.dart';
import '/db.dart'; import '/db.dart';
class TrackedItemPage extends StatefulWidget { class TrackedItemPage extends StatefulWidget {
final Future<List<TrackedItem>> assetsToLoad; final ItemType assetType;
final Function() notifyParent; final Function() notifyParent;
const TrackedItemPage({ const TrackedItemPage({
super.key, super.key,
required this.assetsToLoad, required this.assetType,
required this.notifyParent, required this.notifyParent,
}); });
@ -25,12 +25,28 @@ class TrackedItemPage extends StatefulWidget {
} }
class _TrackedItemPageState extends State<TrackedItemPage> { class _TrackedItemPageState extends State<TrackedItemPage> {
late Future<List<TrackedItem>> _assetsToLoad;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
switch (widget.assetType) {
case ItemType.expense:
_assetsToLoad = DatabaseHelper.instance.getExpenses();
break;
case ItemType.income:
_assetsToLoad = DatabaseHelper.instance.getIncomes();
break;
case ItemType.asset:
_assetsToLoad = DatabaseHelper.instance.getAssets();
break;
default:
throw UnimplementedError("Unsure whch asset group to load.");
}
return FutureBuilder<List<TrackedItem>>( return FutureBuilder<List<TrackedItem>>(
future: widget.assetsToLoad, future: _assetsToLoad,
builder: builder:
(BuildContext context, AsyncSnapshot<List<TrackedItem>> snapshot) { (BuildContext context, AsyncSnapshot<List<TrackedItem>> snapshot) {
if (!snapshot.hasData) { if (!snapshot.hasData) {
@ -46,7 +62,26 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
"Add items to get started.", "Add items to get started.",
softWrap: true, softWrap: true,
) )
: ListView.builder( : Column(
children: [
Text(
"${widget.assetType.plural}",
style: TextStyle(
fontSize: 24.0,
decoration: TextDecoration.underline,
fontWeight: FontWeight.bold,
),
),
/*Text(
"${widget.assetType.description}",
style: TextStyle(
fontSize: 16.0,
decoration: TextDecoration.none,
fontWeight: FontWeight.bold,
),
),*/
Expanded(
child: ListView.builder(
itemCount: snapshot.data!.length, itemCount: snapshot.data!.length,
itemBuilder: (_, index) { itemBuilder: (_, index) {
final TrackedItem curr = snapshot.data![index]; final TrackedItem curr = snapshot.data![index];
@ -63,7 +98,9 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
} }
final String itemDescription = curr.description; final String itemDescription = curr.description;
final double itemDayAmount, itemMonthAmount, itemYearAmount; final double itemDayAmount,
itemMonthAmount,
itemYearAmount;
final String estimateSymbolDaily, final String estimateSymbolDaily,
estimateSymbolMonthly, estimateSymbolMonthly,
estimateSymbolYearly; estimateSymbolYearly;
@ -73,7 +110,9 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
estimateSymbolDaily = curr.frequency!.numDays estimateSymbolDaily = curr.frequency!.numDays
.toStringAsFixed(2) .toStringAsFixed(2)
.endsWith(".00") && .endsWith(".00") &&
itemDayAmount.toStringAsFixed(3).endsWith("0") itemDayAmount
.toStringAsFixed(3)
.endsWith("0")
? "" ? ""
: "~"; : "~";
@ -82,7 +121,9 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
estimateSymbolMonthly = curr.frequency!.timesPerYear estimateSymbolMonthly = curr.frequency!.timesPerYear
.toStringAsFixed(2) .toStringAsFixed(2)
.endsWith(".00") && .endsWith(".00") &&
itemMonthAmount.toStringAsFixed(3).endsWith("0") itemMonthAmount
.toStringAsFixed(3)
.endsWith("0")
? "" ? ""
: "~"; : "~";
@ -90,7 +131,9 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
estimateSymbolYearly = curr.frequency!.timesPerYear estimateSymbolYearly = curr.frequency!.timesPerYear
.toStringAsFixed(2) .toStringAsFixed(2)
.endsWith(".00") && .endsWith(".00") &&
itemYearAmount.toStringAsFixed(3).endsWith("0") itemYearAmount
.toStringAsFixed(3)
.endsWith("0")
? "" ? ""
: "~"; : "~";
} else { } else {
@ -102,7 +145,8 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
estimateSymbolYearly = ""; estimateSymbolYearly = "";
} }
final String monthlyTitle = curr.type == ItemType.asset final String monthlyTitle =
curr.type == ItemType.asset
? "" ? ""
: " ${Frequency.monthly.title}"; : " ${Frequency.monthly.title}";
@ -196,7 +240,8 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
children: [ children: [
Column( Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
itemTitle, itemTitle,
@ -221,7 +266,8 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
), ),
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment:
CrossAxisAlignment.end,
children: [ children: [
Text( Text(
itemTopText, itemTopText,
@ -244,6 +290,9 @@ class _TrackedItemPageState extends State<TrackedItemPage> {
), ),
); );
}, },
),
),
],
); );
}); });
} }