3 Commits

5 changed files with 229 additions and 193 deletions

View File

@ -41,6 +41,10 @@ class HomePage extends StatefulWidget {
class _HomePageState extends State<HomePage> { class _HomePageState extends State<HomePage> {
var pageSelected = 0; var pageSelected = 0;
refresh() {
setState(() {});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Widget page; Widget page;
@ -48,7 +52,9 @@ class _HomePageState extends State<HomePage> {
switch (pageSelected) { switch (pageSelected) {
case 0: case 0:
page = ExpensePage(); page = ExpensePage();
dialog = ExpenseInputDialog(); dialog = ExpenseInputDialog(
notifyParent: refresh,
);
case 1: case 1:
page = IncomePage(); page = IncomePage();
case 2: case 2:
@ -79,49 +85,42 @@ class _HomePageState extends State<HomePage> {
return LayoutBuilder(builder: (context, constraints) { return LayoutBuilder(builder: (context, constraints) {
return Scaffold( return Scaffold(
// TODO: Add a drawer instead of nav rail. appBar: AppBar(title: Text("Expense Tracker")),
body: Row( drawer: NavigationRail(
children: [ extended: constraints.maxWidth >= 800,
SafeArea( destinations: [
child: NavigationRail( NavigationRailDestination(
extended: constraints.maxWidth >= 800, icon: Icon(Icons.payment),
destinations: [ label: Text('Expenses'),
NavigationRailDestination(
icon: Icon(Icons.payment),
label: Text('Expenses'),
),
NavigationRailDestination(
icon: Icon(Icons.account_balance),
label: Text('Income'),
),
NavigationRailDestination(
icon: Icon(Icons.attach_money),
label: Text('Liquid Assets'),
),
NavigationRailDestination(
icon: Icon(Icons.bar_chart),
label: Text('Projections'),
),
NavigationRailDestination(
icon: Icon(Icons.settings),
label: Text('Settings'),
),
],
selectedIndex: pageSelected,
onDestinationSelected: (value) {
setState(() {
pageSelected = value;
});
},
),
), ),
Expanded( NavigationRailDestination(
child: Container( icon: Icon(Icons.account_balance),
color: Theme.of(context).colorScheme.primaryContainer, label: Text('Income'),
child: page, ),
), NavigationRailDestination(
icon: Icon(Icons.attach_money),
label: Text('Liquid Assets'),
),
NavigationRailDestination(
icon: Icon(Icons.bar_chart),
label: Text('Reports'),
),
NavigationRailDestination(
icon: Icon(Icons.settings),
label: Text('Settings'),
), ),
], ],
selectedIndex: pageSelected,
onDestinationSelected: (value) {
setState(() {
pageSelected = value;
Navigator.pop(context);
});
},
),
body: Container(
color: Theme.of(context).colorScheme.primaryContainer,
child: Center(child: page),
), ),
floatingActionButton: floatingButton, floatingActionButton: floatingButton,
); );

View File

@ -12,48 +12,39 @@ class ExpensePage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ListView.builder( return expenses.isEmpty
itemCount: expenses.length, ? Text("Add expenses to get started!")
itemBuilder: (_, index) { : ListView.builder(
final Expense curr = expenses[index]; itemCount: expenses.length,
return Center( itemBuilder: (_, index) {
child: Padding( final Expense curr = expenses[index];
padding: const EdgeInsets.all(4.0), return Center(
child: Container( child: Padding(
decoration: BoxDecoration( padding: const EdgeInsets.all(4.0),
borderRadius: BorderRadius.circular(4), child: Container(
color: Colors.greenAccent, decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4),
color: Colors.greenAccent,
),
child: Column(
children: [
Text(curr.name),
Text("${curr.cost.toString()} ${curr.frequency.title}"),
],
),
),
), ),
child: Column( );
children: [ },
Text(curr.name),
Text("${curr.cost.toString()} ${curr.frequency.title}"),
],
),
),
),
); );
});
/*
return ListView(
children: [
ListTile(
title: Text("Fake Item 1"),
subtitle: Text("30.00 / month"),
),
ListTile(
title: Text("Fake Item 2"),
subtitle: Text("180.00 / year"),
),
],
);
*/
} }
} }
class ExpenseInputDialog extends StatefulWidget { class ExpenseInputDialog extends StatefulWidget {
final Function() notifyParent;
const ExpenseInputDialog({ const ExpenseInputDialog({
super.key, super.key,
required this.notifyParent,
}); });
@override @override
@ -70,9 +61,6 @@ class _ExpenseInputDialogState extends State<ExpenseInputDialog> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
const inputWidth = 300.0;
const inputHeight = 50.0;
List<DropdownMenuItem> freqValues = []; List<DropdownMenuItem> freqValues = [];
for (var freq in Frequency.values) { for (var freq in Frequency.values) {
freqValues.add(DropdownMenuItem(value: freq, child: Text(freq.title))); freqValues.add(DropdownMenuItem(value: freq, child: Text(freq.title)));
@ -83,130 +71,112 @@ class _ExpenseInputDialogState extends State<ExpenseInputDialog> {
title: Center(child: Text("Add New Expense")), title: Center(child: Text("Add New Expense")),
content: Form( content: Form(
key: _expenseFormKey, key: _expenseFormKey,
autovalidateMode: AutovalidateMode.onUserInteraction, //autovalidateMode: AutovalidateMode.onUserInteraction,
child: Column(mainAxisSize: MainAxisSize.min, spacing: 10, children: [ child: Column(mainAxisSize: MainAxisSize.min, spacing: 10, children: [
SizedBox( TextFormField(
width: inputWidth, keyboardType: TextInputType.text,
height: inputHeight, decoration: InputDecoration(
child: TextFormField( labelText: "Name",
keyboardType: TextInputType.text, hintText: "Example: Red Pocket Phone Bill",
decoration: InputDecoration(
labelText: "Name",
hintText: "Example: Red Pocket Phone Bill",
),
validator: (value) {
if (value!.isEmpty) {
return "Name must be provided.";
}
return null;
},
onSaved: (newValue) {
_name = newValue!;
},
), ),
validator: (value) {
if (value!.isEmpty) {
return "Name must be provided.";
}
return null;
},
onSaved: (newValue) {
_name = newValue!;
},
), ),
SizedBox( TextFormField(
width: inputWidth, keyboardType: TextInputType.numberWithOptions(decimal: true),
height: inputHeight, decoration:
child: TextFormField( InputDecoration(labelText: "Cost", hintText: "Example: 10.00"),
keyboardType: TextInputType.numberWithOptions(decimal: true), validator: (value) {
decoration: InputDecoration( if (value!.isEmpty) {
labelText: "Cost", hintText: "Example: 10.00"), return "Cost must be provided.";
validator: (value) { }
if (value!.isEmpty) { if (double.tryParse(value) == null) {
return "Cost must be provided."; return "Cost must be a valid number.";
} }
if (double.tryParse(value) == null) { return null;
return "Cost must be a valid number."; },
} onSaved: (newValue) {
return null; _cost = double.parse(newValue!);
}, },
onSaved: (newValue) {
_cost = double.parse(newValue!);
},
),
), ),
SizedBox( DropdownButtonFormField(
width: inputWidth, items: freqValues,
height: inputHeight, decoration: InputDecoration(
child: DropdownButtonFormField( labelText: "Recurrence", hintText: "Example: Monthly"),
items: freqValues, validator: (value) {
decoration: InputDecoration( if (value == null) {
labelText: "Recurrence", hintText: "Example: Monthly"), return "Frequency must be provided.";
validator: (value) { }
if (value == null) { if (!Frequency.values.contains(value)) {
return "Frequency must be provided."; return "Value not valid.";
} }
if (!Frequency.values.contains(value)) { return null;
return "Value not valid."; },
} onChanged: (newValue) {
return null; _freq = newValue;
}, },
onChanged: (newValue) {
_freq = newValue;
},
),
), ),
SizedBox( TextFormField(
width: inputWidth, keyboardType: TextInputType.text,
height: inputHeight, decoration: InputDecoration(
child: TextFormField( labelText: "Description",
keyboardType: TextInputType.text, hintText: "Example: 1GB data with unlimited talk & text."),
decoration: InputDecoration( validator: (value) {
labelText: "Description", return null;
hintText: "Example: 1GB data with unlimited talk & text."), },
validator: (value) { onSaved: (newValue) {
return null; _desc = newValue!;
}, },
onSaved: (newValue) {
_desc = newValue!;
},
),
), ),
]), ]),
), ),
actions: [ actions: [
SizedBox( Row(
width: inputWidth, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
height: inputHeight, crossAxisAlignment: CrossAxisAlignment.center,
child: Row( children: [
mainAxisAlignment: MainAxisAlignment.spaceEvenly, ElevatedButton.icon(
crossAxisAlignment: CrossAxisAlignment.center, onPressed: () {
children: [ print("TODO: Clear fields!");
ElevatedButton.icon( Navigator.of(context).pop();
onPressed: () { },
print("TODO: Clear fields!"); icon: Icon(Icons.cancel),
Navigator.of(context).pop(); label: Text('Cancel'),
}, ),
icon: Icon(Icons.cancel), ElevatedButton.icon(
label: Text('Cancel'), onPressed: () {
), print("TODO: Save expense!");
ElevatedButton.icon( if (_expenseFormKey.currentState!.validate()) {
onPressed: () { _expenseFormKey.currentState!.save();
print("TODO: Save expense!"); setState(() {
if (_expenseFormKey.currentState!.validate()) { expenses.add(
_expenseFormKey.currentState!.save(); Expense(
setState(() { name: _name,
expenses.add( cost: _cost,
Expense( frequency: _freq,
name: _name, description: _desc),
cost: _cost, );
frequency: _freq, });
description: _desc), widget.notifyParent();
);
}); print(expenses.toString());
print(expenses.toString()); for (var expense in expenses) {
for (var expense in expenses) { print(expense.toString());
print(expense.toString());
}
Navigator.of(context).pop();
} }
}, Navigator.of(context).pop();
icon: Icon(Icons.save), }
label: Text('Submit'), },
), icon: Icon(Icons.save),
], label: Text('Submit'),
), ),
],
) )
], ],
); );

View File

@ -5,6 +5,8 @@
import FlutterMacOS import FlutterMacOS
import Foundation import Foundation
import sqflite_darwin
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
} }

View File

@ -131,6 +131,22 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.0" version: "1.9.0"
platform:
dependency: transitive
description:
name: platform
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
version: "3.1.6"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
url: "https://pub.dev"
source: hosted
version: "2.1.8"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -144,6 +160,46 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.10.0" version: "1.10.0"
sqflite:
dependency: "direct main"
description:
name: sqflite
sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
sqflite_android:
dependency: transitive
description:
name: sqflite_android
sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
sqflite_common:
dependency: transitive
description:
name: sqflite_common
sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709"
url: "https://pub.dev"
source: hosted
version: "2.5.4+6"
sqflite_darwin:
dependency: transitive
description:
name: sqflite_darwin
sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c"
url: "https://pub.dev"
source: hosted
version: "2.4.1+1"
sqflite_platform_interface:
dependency: transitive
description:
name: sqflite_platform_interface
sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@ -168,6 +224,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.0" version: "1.3.0"
synchronized:
dependency: transitive
description:
name: synchronized
sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
url: "https://pub.dev"
source: hosted
version: "3.3.0+3"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
@ -202,4 +266,4 @@ packages:
version: "14.3.0" version: "14.3.0"
sdks: sdks:
dart: ">=3.6.1 <4.0.0" dart: ">=3.6.1 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54" flutter: ">=3.24.0"

View File

@ -9,6 +9,7 @@ environment:
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
sqflite: ^2.4.1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: