lib/db.dart

@@ -3,13 +3,13 @@
 // SQLite
 import 'dart:io';
 import 'dart:async';
+import 'package:flutter_expense_tracker/models/recurring_tracked_type.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:sqflite/sqflite.dart';
 
 // Local
 import '/models/expense.dart';
-import '/models/tracked_type_recurring.dart';
 
 // Leaned on this example:
 //   https://learnflutterwithme.com/sqlite

lib/models/expense.dart

@@ -1,5 +1,4 @@
-// Local
+import '/models/recurring_tracked_type.dart';
-import '/models/tracked_type_recurring.dart';
 import '/models/frequency.dart';
 
 class Expense extends RecurringTrackedType {

lib/models/income.dart

@@ -1,5 +1,4 @@
-// Local
+import '/models/recurring_tracked_type.dart';
-import '/models/tracked_type_recurring.dart';
 import '/models/frequency.dart';
 
 class Income extends RecurringTrackedType {

lib/pages/expense.dart

@@ -1,12 +1,12 @@
 // Flutter
 import 'package:flutter/material.dart';
+import 'package:flutter_expense_tracker/db.dart';
+import 'package:flutter_expense_tracker/models/recurring_tracked_type.dart';
+import 'package:flutter_expense_tracker/models/tracked_type.dart';
 
 // Local
-import '/models/tracked_type.dart';
-import '/models/tracked_type_recurring.dart';
 import '/models/expense.dart';
 import '/models/frequency.dart';
-import '/db.dart';
 
 // TODO: Make this a generic UI based on a superclass of Expense, Income, and Assets.
 

lib/pages/report.dart

@@ -1,13 +1,5 @@
 import 'package:flutter/material.dart';
 
-/// TODO:
-/// - Expenses (total number, totals by day / month / year)
-/// - Incomes (total number, totals by day / month / year)
-/// - Assets (total number, total by day / month / year)
-/// - Projected Assets in:
-///     - 1 week, 1 month, 1 quarter, 1 year
-///     - 1/2 year? 2 years? 5 years? Allow customization?
-
 class ProjectionPage extends StatelessWidget {
   const ProjectionPage({
     super.key,

lib/pages/settings.dart

@@ -1,11 +1,5 @@
 import 'package:flutter/material.dart';
 
-/// TODO:
-/// - Export DB (JSON?)
-/// - Import DB (JSON?)
-/// - Choose color scheme
-/// - Delete / Reset DB (pull code from `main`'s `if (testing)`)
-
 class SettingsPage extends StatelessWidget {
   const SettingsPage({
     super.key,