Shorten the title.

Redo how the frequencies are generated. Clean up old print statements.
Begin working on the database.
2025-02-05 16:45:55 -07:00 · 2025-02-05 16:41:58 -07:00 · 2025-02-05 14:43:06 -07:00 · 2025-02-05 14:17:29 -07:00 · 2025-02-05 14:16:49 -07:00 · 2025-02-05 14:04:35 -07:00
6 changed files with 233 additions and 154 deletions
--- a/lib/db.dart
+++ b/lib/db.dart
@ -0,0 +1,45 @@
+// https://docs.flutter.dev/cookbook/persistence/sqlite
+
+// SQLite
+import 'dart:async';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_expense_tracker/models/frequency.dart';
+import 'package:path/path.dart';
+import 'package:sqflite/sqflite.dart';
+
+// Local
+import '/models/expense.dart';
+
+void loadDB() async {
+  // Avoid errors caused by flutter upgrade.
+  WidgetsFlutterBinding.ensureInitialized();
+
+  final String frequencies =
+      "'${Frequency.values.map((freq) => freq.title).join("','")}'";
+  print(frequencies);
+
+  // Open the database and store the reference.
+  final database = openDatabase(
+    // Set the path to the database. Note: Using the `join` function from the
+    // `path` package is best practice to ensure the path is correctly
+    // constructed for each platform.
+    join(await getDatabasesPath(), 'expense_tracker.db'),
+
+    onCreate: (db, version) {
+      // Run the CREATE TABLE statement on the database.
+      return db.execute(
+        """
+        CREATE TABLE expense
+          ( id INTEGER PRIMARY KEY
+          , name TEXT
+          , cost DOUBLE
+          , frequency TEXT CHECK(frequency IN ($frequencies) )
+          , description TEXT
+        )""",
+      );
+    },
+    // Set the version. This executes the onCreate function and provides a
+    // path to perform database upgrades and downgrades.
+    version: 1,
+  );
+}
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,15 +1,16 @@
-// Helpful guides:
-// - https://flutter.dev/docs/cookbook/forms/validation
-
+// Flutter
 import 'package:flutter/material.dart';

+// Local
 import '/pages/expense.dart';
 import '/pages/income.dart';
 import '/pages/asset.dart';
 import '/pages/report.dart';
 import '/pages/settings.dart';
+import '/db.dart';

 void main() {
+  loadDB();
  runApp(const MainApp());
 }

@ -41,6 +42,10 @@ class HomePage extends StatefulWidget {
 class _HomePageState extends State<HomePage> {
  var pageSelected = 0;

+  refresh() {
+    setState(() {});
+  }
+
  @override
  Widget build(BuildContext context) {
    Widget page;
@ -48,7 +53,9 @@ class _HomePageState extends State<HomePage> {
    switch (pageSelected) {
      case 0:
        page = ExpensePage();
-        dialog = ExpenseInputDialog();
+        dialog = ExpenseInputDialog(
+          notifyParent: refresh,
+        );
      case 1:
        page = IncomePage();
      case 2:
@ -79,49 +86,42 @@ class _HomePageState extends State<HomePage> {

    return LayoutBuilder(builder: (context, constraints) {
      return Scaffold(
-        // TODO: Add a drawer instead of nav rail.
-        body: Row(
-          children: [
-            SafeArea(
-              child: NavigationRail(
-                extended: constraints.maxWidth >= 800,
-                destinations: [
-                  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;
-                  });
-                },
-              ),
+        appBar: AppBar(title: Text("Expense Tracker")),
+        drawer: NavigationRail(
+          extended: constraints.maxWidth >= 800,
+          destinations: [
+            NavigationRailDestination(
+              icon: Icon(Icons.payment),
+              label: Text('Expenses'),
            ),
-            Expanded(
-              child: Container(
-                color: Theme.of(context).colorScheme.primaryContainer,
-                child: page,
-              ),
+            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('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,
      );
--- a/lib/pages/expense.dart
+++ b/lib/pages/expense.dart
@ -1,5 +1,7 @@
+// Flutter
 import 'package:flutter/material.dart';

+// Local
 import '/models/expense.dart';
 import '/models/frequency.dart';

@ -12,48 +14,39 @@ class ExpensePage extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return ListView.builder(
-        itemCount: expenses.length,
-        itemBuilder: (_, index) {
-          final Expense curr = expenses[index];
-          return Center(
-            child: Padding(
-              padding: const EdgeInsets.all(4.0),
-              child: Container(
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(4),
-                  color: Colors.greenAccent,
+    return expenses.isEmpty
+        ? Text("Add expenses to get started!")
+        : ListView.builder(
+            itemCount: expenses.length,
+            itemBuilder: (_, index) {
+              final Expense curr = expenses[index];
+              return Center(
+                child: Padding(
+                  padding: const EdgeInsets.all(4.0),
+                  child: Container(
+                    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 {
+  final Function() notifyParent;
  const ExpenseInputDialog({
    super.key,
+    required this.notifyParent,
  });

  @override
@ -70,25 +63,18 @@ class _ExpenseInputDialogState extends State<ExpenseInputDialog> {

  @override
  Widget build(BuildContext context) {
-    const inputWidth = 300.0;
-    const inputHeight = 50.0;
-
-    List<DropdownMenuItem> freqValues = [];
-    for (var freq in Frequency.values) {
-      freqValues.add(DropdownMenuItem(value: freq, child: Text(freq.title)));
-    }
-    ;
-
    return AlertDialog(
-      title: Center(child: Text("Add New Expense")),
+      title: Center(
+        child: Text("New Expense"),
+      ),
      content: Form(
        key: _expenseFormKey,
-        autovalidateMode: AutovalidateMode.onUserInteraction,
-        child: Column(mainAxisSize: MainAxisSize.min, spacing: 10, children: [
-          SizedBox(
-            width: inputWidth,
-            height: inputHeight,
-            child: TextFormField(
+        //autovalidateMode: AutovalidateMode.onUserInteraction,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          //spacing: 10,
+          children: [
+            TextFormField(
              keyboardType: TextInputType.text,
              decoration: InputDecoration(
                labelText: "Name",
@ -104,11 +90,7 @@ class _ExpenseInputDialogState extends State<ExpenseInputDialog> {
                _name = newValue!;
              },
            ),
-          ),
-          SizedBox(
-            width: inputWidth,
-            height: inputHeight,
-            child: TextFormField(
+            TextFormField(
              keyboardType: TextInputType.numberWithOptions(decimal: true),
              decoration: InputDecoration(
                  labelText: "Cost", hintText: "Example: 10.00"),
@ -125,12 +107,10 @@ class _ExpenseInputDialogState extends State<ExpenseInputDialog> {
                _cost = double.parse(newValue!);
              },
            ),
-          ),
-          SizedBox(
-            width: inputWidth,
-            height: inputHeight,
-            child: DropdownButtonFormField(
-              items: freqValues,
+            DropdownButtonFormField(
+              items: (Frequency.values.map((freq) =>
+                      DropdownMenuItem(value: freq, child: Text(freq.title))))
+                  .toList(),
              decoration: InputDecoration(
                  labelText: "Recurrence", hintText: "Example: Monthly"),
              validator: (value) {
@ -143,14 +123,10 @@ class _ExpenseInputDialogState extends State<ExpenseInputDialog> {
                return null;
              },
              onChanged: (newValue) {
-                _freq = newValue;
+                _freq = newValue!;
              },
            ),
-          ),
-          SizedBox(
-            width: inputWidth,
-            height: inputHeight,
-            child: TextFormField(
+            TextFormField(
              keyboardType: TextInputType.text,
              decoration: InputDecoration(
                  labelText: "Description",
@ -162,51 +138,42 @@ class _ExpenseInputDialogState extends State<ExpenseInputDialog> {
                _desc = newValue!;
              },
            ),
-          ),
-        ]),
+          ],
+        ),
      ),
      actions: [
-        SizedBox(
-          width: inputWidth,
-          height: inputHeight,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              ElevatedButton.icon(
-                onPressed: () {
-                  print("TODO: Clear fields!");
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            ElevatedButton.icon(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              icon: Icon(Icons.cancel),
+              label: Text('Cancel'),
+            ),
+            ElevatedButton.icon(
+              onPressed: () {
+                if (_expenseFormKey.currentState!.validate()) {
+                  _expenseFormKey.currentState!.save();
+                  setState(() {
+                    expenses.add(
+                      Expense(
+                          name: _name,
+                          cost: _cost,
+                          frequency: _freq,
+                          description: _desc),
+                    );
+                  });
+                  widget.notifyParent();
                  Navigator.of(context).pop();
-                },
-                icon: Icon(Icons.cancel),
-                label: Text('Cancel'),
-              ),
-              ElevatedButton.icon(
-                onPressed: () {
-                  print("TODO: Save expense!");
-                  if (_expenseFormKey.currentState!.validate()) {
-                    _expenseFormKey.currentState!.save();
-                    setState(() {
-                      expenses.add(
-                        Expense(
-                            name: _name,
-                            cost: _cost,
-                            frequency: _freq,
-                            description: _desc),
-                      );
-                    });
-                    print(expenses.toString());
-                    for (var expense in expenses) {
-                      print(expense.toString());
-                    }
-                    Navigator.of(context).pop();
-                  }
-                },
-                icon: Icon(Icons.save),
-                label: Text('Submit'),
-              ),
-            ],
-          ),
+                }
+              },
+              icon: Icon(Icons.save),
+              label: Text('Submit'),
+            ),
+          ],
        )
      ],
    );
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -5,6 +5,8 @@
 import FlutterMacOS
 import Foundation

+import sqflite_darwin

 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@ -131,6 +131,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    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:
    dependency: transitive
    description: flutter
@ -144,6 +160,46 @@ packages:
      url: "https://pub.dev"
    source: hosted
    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:
    dependency: transitive
    description:
@ -168,6 +224,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    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:
    dependency: transitive
    description:
@ -202,4 +266,4 @@ packages:
    version: "14.3.0"
 sdks:
  dart: ">=3.6.1 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
+  flutter: ">=3.24.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -9,6 +9,7 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
+  sqflite: ^2.4.1

 dev_dependencies:
  flutter_test:
Author	SHA1	Message	Date
Hyperling	54cd86c34b	Shorten the title.	2025-02-05 16:45:55 -07:00
Hyperling	66fd966de8	Redo how the frequencies are generated. Clean up old print statements.	2025-02-05 16:41:58 -07:00
Hyperling	5561f50736	Begin working on the database.	2025-02-05 14:43:06 -07:00
Hyperling	6b25e6e552	Add sqlite dependency with `flutter pub add sqflite`.	2025-02-05 14:17:29 -07:00
Hyperling	360a36f024	Fix the layout when there are no items.	2025-02-05 14:16:49 -07:00
Hyperling	ecbac615e9	Finished drawer and also now showing expenses as they are added!	2025-02-05 14:04:35 -07:00