Rename todo to scratch

lib/db.dart

@@ -21,13 +21,13 @@ CREATE UNIQUE INDEX IF NOT EXISTS idx_notes_date_unique ON notes (date);
 -- ie. they're not really a list but instead a string
 -- But we will also keep a history of all todos
 -- Because we might as well
-CREATE TABLE IF NOT EXISTS todos (
+CREATE TABLE IF NOT EXISTS scratches (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   date TEXT DEFAULT CURRENT_TIMESTAMP,
   content TEXT NOT NULL
 );
-CREATE INDEX IF NOT EXISTS idx_todos_date ON todos (date);
+CREATE INDEX IF NOT EXISTS idx_scratches_date ON scratches (date);
-CREATE UNIQUE INDEX IF NOT EXISTS idx_todos_date_unique ON todos (date);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_scratches_date_unique ON scratches (date);
 ''';
 
   static Future<String> _getDatabasePath() async {

lib/main.dart

@@ -11,6 +11,7 @@ import 'package:audioplayers/audioplayers.dart';
 // TODO: Add an entry field for the duration ie. the interval of apperance
 // TODO: Also the sound file, if possible...
 // TODO: Cram the above into the database
+// TODO: Implement some sort of scroll through notes
 
 const Duration popupInterval = Duration(minutes: 20);
 const String notificationSound = 'MeetTheSniper.mp3';
@@ -38,9 +39,6 @@ void main() async {
 class JournalerApp extends StatelessWidget {
   const JournalerApp({super.key});
 
-  static final GlobalKey<MainPageState> _mainPageKey =
-      GlobalKey<MainPageState>();
-
   static final TextTheme _baseTextTheme = const TextTheme(
     bodyMedium: TextStyle(fontSize: 24),
   );
@@ -114,30 +112,7 @@ class JournalerApp extends StatelessWidget {
       theme: lightTheme,
       darkTheme: darkTheme,
       themeMode: ThemeMode.system,
-      home: Focus(
+      home: const MainPage(),
-        // Using RawKeyboardListener despite deprecation because KeyboardListener
-        // and Shortcuts/Actions didn't reliably capture the Escape key press
-        // before the TextField handled it for unfocusing, requiring two presses.
-        // RawKeyboardListener intercepts the event earlier.
-        child: RawKeyboardListener(
-          // Revert to RawKeyboardListener
-          focusNode: FocusNode(),
-          onKey: (RawKeyEvent event) {
-            // Revert to onKey and RawKeyEvent
-            if (event is RawKeyDownEvent && // Revert to RawKeyDownEvent
-                event.logicalKey == LogicalKeyboardKey.escape) {
-              debugPrint("Escape pressed (RawKeyboardListener - Workaround)");
-              final state = _mainPageKey.currentState;
-              if (state != null) {
-                // Re-add unfocus, as it seemed necessary with Raw listener
-                FocusManager.instance.primaryFocus?.unfocus();
-                state.onWindowClose();
-              }
-            }
-          },
-          child: MainPage(key: _mainPageKey),
-        ),
-      ),
       debugShowCheckedModeBanner: false,
     );
   }
@@ -159,7 +134,7 @@ class MainPageState extends State<MainPage> with WindowListener {
       TextEditingController();
   final TextEditingController _currentEntryController = TextEditingController();
   final FocusNode _currentEntryFocusNode = FocusNode();
-  final TextEditingController _todoController = TextEditingController();
+  final TextEditingController _scratchController = TextEditingController();
 
   Note? previousNote;
 
@@ -185,7 +160,7 @@ class MainPageState extends State<MainPage> with WindowListener {
     _previousEntryController.dispose();
     _currentEntryController.dispose();
     _currentEntryFocusNode.dispose();
-    _todoController.dispose();
+    _scratchController.dispose();
     _audioPlayer.dispose();
     super.dispose();
   }
@@ -258,25 +233,27 @@ class MainPageState extends State<MainPage> with WindowListener {
     previousNote = note;
     _previousEntryController.text = note?.content ?? "";
 
-    final todo = await getLatestTodo();
+    final scratch = await getLatestScratch();
-    _todoController.text = todo?.content ?? "";
+    _scratchController.text = scratch?.content ?? "";
     _currentEntryController.text = "";
 
-    debugPrint("Data loaded (placeholder).");
+    debugPrint("Data loaded.");
   }
 
   void _saveData() async {
     String previousEntry = _previousEntryController.text;
     String currentEntry = _currentEntryController.text;
-    String todoList = _todoController.text;
+    String scratchContent = _scratchController.text;
 
     await createNote(currentEntry);
-    await createTodo(todoList);
+    await createScratch(scratchContent);
-    previousNote!.content = previousEntry;
+    if (previousNote != null) {
-    await updateNote(previousNote!);
+      previousNote!.content = previousEntry;
+      await updateNote(previousNote!);
+    }
 
     debugPrint(
-      "Saving data (placeholder)... Current Entry: [${currentEntry.length} chars], Todo: [${todoList.length} chars]",
+      "Saving data... Current Entry: [${currentEntry.length} chars], Scratch: [${scratchContent.length} chars]",
     );
   }
 
@@ -286,66 +263,81 @@ class MainPageState extends State<MainPage> with WindowListener {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    // Wrap Scaffold with RawKeyboardListener as workaround for Escape key
-      appBar: AppBar(title: const Text('Journaler'), actions: const []),
+    return RawKeyboardListener(
-      body: Padding(
+      focusNode: FocusNode(), // Needs its own node
-        padding: const EdgeInsets.all(8.0),
+      onKey: (RawKeyEvent event) {
-        child: Row(
+        if (event is RawKeyDownEvent &&
-          crossAxisAlignment: CrossAxisAlignment.stretch,
+            event.logicalKey == LogicalKeyboardKey.escape) {
-          children: [
+          debugPrint(
-            Expanded(
+            "Escape pressed inside MainPage (RawKeyboardListener - Workaround)",
-              flex: 9,
+          );
-              child: Column(
+          // Call method directly since we are in the state
-                crossAxisAlignment: CrossAxisAlignment.stretch,
+          FocusManager.instance.primaryFocus?.unfocus(); // Keep unfocus attempt
-                children: [
+          onWindowClose();
-                  Expanded(
+        }
-                    child: TextField(
+      },
-                      controller: _previousEntryController,
+      child: Scaffold(
-                      maxLines: null,
+        appBar: AppBar(title: const Text('Journaler'), actions: const []),
-                      expands: true,
+        body: Padding(
-                      style: Theme.of(context).textTheme.bodyMedium,
+          padding: const EdgeInsets.all(8.0),
-                      decoration: const InputDecoration(
+          child: Row(
-                        labelText: 'Previous Entry',
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Expanded(
+                flex: 9,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Expanded(
+                      child: TextField(
+                        controller: _previousEntryController,
+                        maxLines: null,
+                        expands: true,
+                        style: Theme.of(context).textTheme.bodyMedium,
+                        decoration: const InputDecoration(
+                          labelText: 'Previous Entry',
+                        ),
                       ),
                     ),
-                  ),
+                    const SizedBox(height: 8),
-                  const SizedBox(height: 8),
+                    Expanded(
-                  Expanded(
+                      child: TextField(
-                    child: TextField(
+                        controller: _currentEntryController,
-                      controller: _currentEntryController,
+                        focusNode: _currentEntryFocusNode,
-                      focusNode: _currentEntryFocusNode,
+                        maxLines: null,
-                      maxLines: null,
+                        expands: true,
-                      expands: true,
+                        autofocus: true,
-                      autofocus: true,
+                        style: Theme.of(context).textTheme.bodyMedium,
-                      style: Theme.of(context).textTheme.bodyMedium,
+                        decoration: const InputDecoration(
-                      decoration: const InputDecoration(
+                          labelText: 'Current Entry (What\'s on your mind?)',
-                        labelText: 'Current Entry (What\'s on your mind?)',
+                        ),
+                        onChanged: (text) {},
                       ),
-                      onChanged: (text) {},
                     ),
-                  ),
+                  ],
-                ],
-              ),
-            ),
-            const SizedBox(width: 8),
-            Expanded(
-              flex: 3,
-              child: TextField(
-                controller: _todoController,
-                maxLines: null,
-                expands: true,
-                style:
-                    Theme.of(
-                      context,
-                    ).textTheme.bodyMedium, // Apply theme text style
-                decoration: const InputDecoration(
-                  labelText: 'Todo',
-                  // border: OutlineInputBorder(), // Handled by theme
-                  // contentPadding: EdgeInsets.all(8.0), // Handled by theme or default
                 ),
               ),
-            ),
+              const SizedBox(width: 8),
-          ],
+              Expanded(
+                flex: 3,
+                child: TextField(
+                  controller: _scratchController,
+                  maxLines: null,
+                  expands: true,
+                  style:
+                      Theme.of(
+                        context,
+                      ).textTheme.bodyMedium, // Apply theme text style
+                  decoration: const InputDecoration(
+                    labelText: 'Scratch',
+                    // border: OutlineInputBorder(), // Handled by theme
+                    // contentPadding: EdgeInsets.all(8.0), // Handled by theme or default
+                  ),
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );

lib/notes.dart

@@ -7,11 +7,11 @@ class Note {
   Note({required this.date, required this.content});
 }
 
-class Todo {
+class Scratch {
   final String date;
-  final String content;
+  String content;
 
-  Todo({required this.date, required this.content});
+  Scratch({required this.date, required this.content});
 }
 
 Future<Note?> getLatestNote() async {
@@ -43,22 +43,21 @@ Future<void> updateNote(Note note) async {
   );
 }
 
-Future<Todo?> getLatestTodo() async {
+Future<Scratch?> getLatestScratch() async {
-  final todo = await DB.db.rawQuery(
+  final scratch = await DB.db.rawQuery(
-    'SELECT content, date FROM todos ORDER BY date DESC LIMIT 1',
+    'SELECT content, date FROM scratches ORDER BY date DESC LIMIT 1',
   );
-  if (todo.isEmpty) {
+
+  if (scratch.isEmpty) {
     return null;
+  } else {
+    return Scratch(
+      date: scratch[0]['date'] as String,
+      content: scratch[0]['content'] as String,
+    );
   }
-  return Todo(
-    date: todo[0]['date'] as String,
-    content: todo[0]['content'] as String,
-  );
 }
 
-Future<void> createTodo(String content) async {
+Future<void> createScratch(String content) async {
-  if (content.isEmpty) {
+  await DB.db.insert('scratches', {'content': content});
-    return;
-  }
-  await DB.db.insert('todos', {'content': content});
 }