From 72e0c4ceb50264c40b5923a235d8426e38938a58 Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Sat, 30 Dec 2023 17:26:30 -0800
Subject: [PATCH 01/12] added attributes to database.dart (location and status)

---
 .idea/workspace.xml        | 24 ++++++++++--------------
 lib/services/database.dart | 11 +++++++++--
 pubspec.lock               | 26 +++++++++++++-------------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d75d924..5c2af25 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,7 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1a0389d7-139f-430b-9da0-868ef20db781" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/services/database.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/services/database.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/ui/HomePage.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/HomePage.dart" afterDir="false" />
-    </list>
+    <list default="true" id="1a0389d7-139f-430b-9da0-868ef20db781" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -36,16 +32,16 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/fifte/.vscode/OptixToolkit&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "barcode-scanner",
+    "last_opened_file_path": "C:/Users/fifte/.vscode/OptixToolkit"
   }
-}</component>
+}]]></component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
diff --git a/lib/services/database.dart b/lib/services/database.dart
index 49a127b..76e212c 100644
--- a/lib/services/database.dart
+++ b/lib/services/database.dart
@@ -834,18 +834,25 @@ class Inventory {
   final String? description;
   final int count;
   final String barcodeId;
+  final String status;
+  final String location;
   Inventory(
       {required this.name,
       required this.count,
       required this.barcodeId,
-      required this.description});
+      required this.description,
+      required this.status,
+      required this.location
+      });
 
   factory Inventory.fromJson(Map<String, dynamic> json) {
     return Inventory(
         name: json['name'] as String,
         count: json['count'] as int,
         barcodeId: json['barcodeId'] as String,
-        description: json['description'] as String?);
+        description: json['description'] as String,
+        status: json['status'] as String,
+        location: json['location'] as String);
   }
 
   String toString() {
diff --git a/pubspec.lock b/pubspec.lock
index ad41b2a..53835e2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -85,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   cross_file:
     dependency: transitive
     description:
@@ -356,10 +356,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   nested:
     dependency: transitive
     description:
@@ -545,18 +545,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -577,10 +577,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   tint:
     dependency: transitive
     description:
@@ -609,10 +609,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   win32:
     dependency: transitive
     description:
@@ -638,5 +638,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.0.0"

From 37898c9b0c622155667a7b2bde394f9081687bd7 Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Mon, 1 Jan 2024 12:36:48 -0800
Subject: [PATCH 02/12] barcoderesultpage now references attributes of each
 tool

---
 lib/ui/BarcodeResultPage.dart | 52 +++++++++++++++++++++++++++++++++++
 lib/ui/tools/ToolsPage.dart   | 36 ++++++++++++++----------
 2 files changed, 73 insertions(+), 15 deletions(-)
 create mode 100644 lib/ui/BarcodeResultPage.dart

diff --git a/lib/ui/BarcodeResultPage.dart b/lib/ui/BarcodeResultPage.dart
new file mode 100644
index 0000000..7fa1b2f
--- /dev/null
+++ b/lib/ui/BarcodeResultPage.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:OptixToolkit/services/database.dart';
+
+class BarcodeResultPage extends StatelessWidget {
+  final String barcodeValue;
+  final Inventory inventory;
+
+  const BarcodeResultPage({Key? key, required this.barcodeValue, required this.inventory})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Barcode Result'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Barcode Value: $barcodeValue',
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            ),
+            SizedBox(height: 16),
+            Text( //name
+              'Tool Name: ${inventory.name}',
+              style: TextStyle(fontSize: 18),
+            ),
+            Text( //description
+              'Tool Description: ${inventory.description}',
+              style: TextStyle(fontSize: 18),
+            ),
+            Text(  //status
+              'Tool Status: ${inventory.status}',
+              style: TextStyle(fontSize: 18),
+            ),
+            Text( //count
+              'Tool Count ${inventory.count}',
+              style: TextStyle(fontSize: 18),
+            ),
+            Text( //location
+              'Tool Location ${inventory.location}',
+              style: TextStyle(fontSize: 18),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/ui/tools/ToolsPage.dart b/lib/ui/tools/ToolsPage.dart
index 4547152..5f25a21 100644
--- a/lib/ui/tools/ToolsPage.dart
+++ b/lib/ui/tools/ToolsPage.dart
@@ -313,26 +313,32 @@ class _toolState extends State<ToolWidget> with RouteAware {
 
   // Function to handle barcode scanning
   Future _scanBarcode(BuildContext context) async {
-    try {
-      String barcodeValue = (await BarcodeScanner.scan()).rawContent;
+  try {
+    String barcodeValue = (await BarcodeScanner.scan()).rawContent;
 
-      Inventory? inv = await Database.getInventory(idToken, barcodeValue, context);
+    Inventory? inv = await Database.getInventory(idToken, barcodeValue, context);
 
-      if (inv != null) {
-        _showBarcodeModal(context, inv);
-      }
-    } on PlatformException catch (e) {
-      if (e.code == BarcodeScanner.cameraAccessDenied) {
-        print('Camera permission not granted');
-      } else {
-        print('Unknown Error: $e');
-      }
-    } on FormatException catch (e) {
-      print('User pressed back button before scanning');
-    } catch (e) {
+    if (inv != null) {
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (context) => BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
+        ),
+      );
+    }
+  } on PlatformException catch (e) {
+    if (e.code == BarcodeScanner.cameraAccessDenied) {
+      print('Camera permission not granted');
+    } else {
       print('Unknown Error: $e');
     }
+  } on FormatException catch (e) {
+    print('User pressed back button before scanning');
+  } catch (e) {
+    print('Unknown Error: $e');
   }
+}
+
 
   // Function to show a modal
   void _showBarcodeModal(BuildContext context, Inventory inv) {

From b0f9ba8446c53e3772c87a1e6268617d441f0daf Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Mon, 1 Jan 2024 13:09:15 -0800
Subject: [PATCH 03/12] buttons are fixed, + method for manual entry is added

---
 .idea/workspace.xml         |  22 ++---
 lib/ui/tools/ToolsPage.dart | 160 +++++++++++++++++++++++++-----------
 2 files changed, 123 insertions(+), 59 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5c2af25..8064797 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,9 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1a0389d7-139f-430b-9da0-868ef20db781" name="Default Changelist" comment="" />
+    <list default="true" id="1a0389d7-139f-430b-9da0-868ef20db781" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/lib/ui/tools/ToolsPage.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/tools/ToolsPage.dart" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -32,16 +34,16 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "barcode-scanner",
-    "last_opened_file_path": "C:/Users/fifte/.vscode/OptixToolkit"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;barcode-scanner&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/fifte/.vscode/OptixToolkit&quot;
   }
-}]]></component>
+}</component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
diff --git a/lib/ui/tools/ToolsPage.dart b/lib/ui/tools/ToolsPage.dart
index 5f25a21..d90ef12 100644
--- a/lib/ui/tools/ToolsPage.dart
+++ b/lib/ui/tools/ToolsPage.dart
@@ -1,4 +1,5 @@
 // Flutter imports:
+import 'package:OptixToolkit/ui/BarcodeResultPage.dart';
 import 'package:OptixToolkit/ui/tools/ToolModal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -183,31 +184,31 @@ class _toolState extends State<ToolWidget> with RouteAware {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: <Widget>[
-                  ButtonTheme(
-                    minWidth: MediaQuery.of(context).size.width * 0.43,
-                    height: 55,
-                    shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(7.0)),
-                    child: ElevatedButton(
-                      onPressed: () {
-                        checkOutScan().catchError((e) {
-                          _showDialog(context);
-                        });
-                        refreshTools();
-                      },
-                      child: Text(
-                        'CHECK OUT',
-                        style: GoogleFonts.rubik(
-                          fontWeight: FontWeight.bold,
-                          fontSize: 20.0,
-                          color: Colors.white,
-                        ),
-                      ),
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: Color(0xff159deb),
-                      ),
-                    ),
-                  ),
+                  // ButtonTheme(
+                  //   minWidth: MediaQuery.of(context).size.width * 0.43,
+                  //   height: 55,
+                  //   shape: RoundedRectangleBorder(
+                  //       borderRadius: BorderRadius.circular(7.0)),
+                  //   child: ElevatedButton(
+                  //     onPressed: () {
+                  //       checkOutScan().catchError((e) {
+                  //         _showDialog(context);
+                  //       });
+                  //       refreshTools();
+                  //     },
+                  //     child: Text(
+                  //       'CHECK OUT',
+                  //       style: GoogleFonts.rubik(
+                  //         fontWeight: FontWeight.bold,
+                  //         fontSize: 20.0,
+                  //         color: Colors.white,
+                  //       ),
+                  //     ),
+                  //     style: ElevatedButton.styleFrom(
+                  //       backgroundColor: Color(0xff159deb),
+                  //     ),
+                  //   ),
+                  // ),
                   ElevatedButton(
                     onPressed: () {
                       _scanBarcode(
@@ -225,31 +226,44 @@ class _toolState extends State<ToolWidget> with RouteAware {
                       backgroundColor: Color(0xff159deb),
                     ),
                   ),
-                  ButtonTheme(
-                    minWidth: MediaQuery.of(context).size.width * 0.43,
-                    height: 55,
-                    shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(7.0)),
-                    child: ElevatedButton(
-                      onPressed: () {
-                        returnScan().catchError((e) {
-                          _showDialog(context);
-                        });
-                        refreshTools();
-                      },
-                      child: Text(
-                        'RETURN',
-                        style: GoogleFonts.rubik(
-                          fontWeight: FontWeight.bold,
-                          fontSize: 20.0,
-                          color: Colors.white,
-                        ),
-                      ),
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: Color(0xff159deb),
-                      ),
-                    ),
+                  ElevatedButton(  
+                    onPressed: () {
+                      _showManualEntryDialog(context);
+                    },
+                    child: Text(
+                      'Manual Entry' ,
+                      style: GoogleFonts.rubik(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 20.0,
+                        color: Colors.white
+                      )
+                    )
                   )
+                  // ButtonTheme(
+                  //   minWidth: MediaQuery.of(context).size.width * 0.43,
+                  //   height: 55,
+                  //   shape: RoundedRectangleBorder(
+                  //       borderRadius: BorderRadius.circular(7.0)),
+                  //   child: ElevatedButton(
+                  //     onPressed: () {
+                  //       returnScan().catchError((e) {
+                  //         _showDialog(context);
+                  //       });
+                  //       refreshTools();
+                  //     },
+                  //     child: Text(
+                  //       'RETURN',
+                  //       style: GoogleFonts.rubik(
+                  //         fontWeight: FontWeight.bold,
+                  //         fontSize: 20.0,
+                  //         color: Colors.white,
+                  //       ),
+                  //     ),
+                  //     style: ElevatedButton.styleFrom(
+                  //       backgroundColor: Color(0xff159deb),
+                  //     ),
+                  //   ),
+                  // )
                 ],
               ),
             ),
@@ -339,6 +353,51 @@ class _toolState extends State<ToolWidget> with RouteAware {
   }
 }
 
+  void _showManualEntryDialog(BuildContext context) {
+    TextEditingController barcodeController = TextEditingController();
+
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text('Manual Barcode Entry'),
+          content: TextField(
+            controller: barcodeController,
+            keyboardType: TextInputType.text,
+            decoration: InputDecoration(labelText: 'Enter Barcode ID'),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop(); // Close the dialog
+              },
+              child: Text('Cancel'),
+            ),
+            TextButton(
+              onPressed: () {
+                String enteredBarcode = barcodeController.text.trim();
+                if (enteredBarcode.isNotEmpty) {
+                  _handleManualBarcodeEntry(context, enteredBarcode);
+                } else {
+                  print("This is not a valid barcode ID");
+                }
+              },
+              child: Text('Submit'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+void _handleManualBarcodeEntry(BuildContext context, String enteredBarcode) {
+  Navigator.push(
+    context,
+    MaterialPageRoute(
+          builder: (context) => BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
+    ),
+  );
+}
 
   // Function to show a modal
   void _showBarcodeModal(BuildContext context, Inventory inv) {
@@ -351,3 +410,6 @@ class _toolState extends State<ToolWidget> with RouteAware {
     );
   }
 }
+
+// final Color buttonColor = Color(0xff159deb);
+

From 2c287a9ed7743f80364bcac810eca5186fd0e3f1 Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Mon, 1 Jan 2024 13:50:06 -0800
Subject: [PATCH 04/12] button color is different, manual entry button doesnt
 open cam

---
 .idea/workspace.xml         | 20 +++++++++++---------
 lib/ui/tools/ToolsPage.dart | 27 ++++++++++++++++-----------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8064797..805fe6f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1a0389d7-139f-430b-9da0-868ef20db781" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/ui/tools/ToolsPage.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/tools/ToolsPage.dart" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -34,16 +35,17 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;barcode-scanner&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/fifte/.vscode/OptixToolkit&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "barcode-scanner",
+    "last_opened_file_path": "C:/Users/fifte/.vscode/OptixToolkit",
+    "settings.editor.selected.configurable": "emulator"
   }
-}</component>
+}]]></component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
diff --git a/lib/ui/tools/ToolsPage.dart b/lib/ui/tools/ToolsPage.dart
index d90ef12..fc19470 100644
--- a/lib/ui/tools/ToolsPage.dart
+++ b/lib/ui/tools/ToolsPage.dart
@@ -237,9 +237,12 @@ class _toolState extends State<ToolWidget> with RouteAware {
                         fontSize: 20.0,
                         color: Colors.white
                       )
+                    ),
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: Color(0xff159deb),
                     )
                   )
-                  // ButtonTheme(
+                  // ButtonTheme(      
                   //   minWidth: MediaQuery.of(context).size.width * 0.43,
                   //   height: 55,
                   //   shape: RoundedRectangleBorder(
@@ -390,15 +393,20 @@ class _toolState extends State<ToolWidget> with RouteAware {
     );
   }
 
-void _handleManualBarcodeEntry(BuildContext context, String enteredBarcode) {
-  Navigator.push(
-    context,
-    MaterialPageRoute(
-          builder: (context) => BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
+Future _handleManualBarcodeEntry(BuildContext context, String enteredBarcode) async{
+
+  String barcodeValue = enteredBarcode;
+  Inventory? inv = await Database.getInventory(idToken, barcodeValue, context);
+  
+  if (inv != null) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+            builder: (context) => BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
     ),
-  );
+    );
+  }
 }
-
   // Function to show a modal
   void _showBarcodeModal(BuildContext context, Inventory inv) {
     showDialog(
@@ -410,6 +418,3 @@ void _handleManualBarcodeEntry(BuildContext context, String enteredBarcode) {
     );
   }
 }
-
-// final Color buttonColor = Color(0xff159deb);
-

From d6cdd0ea4b918332687f0868b735c07fbffe8b55 Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Mon, 1 Jan 2024 16:53:35 -0800
Subject: [PATCH 05/12] Added buttons to barcoderesultpage

---
 .idea/workspace.xml           |  22 +++----
 lib/services/database.dart    |   2 +-
 lib/ui/BarcodeResultPage.dart | 106 +++++++++++++++++++++++++++-------
 3 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 805fe6f..e272057 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a0389d7-139f-430b-9da0-868ef20db781" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/ui/tools/ToolsPage.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/tools/ToolsPage.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/ui/BarcodeResultPage.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/BarcodeResultPage.dart" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -35,17 +35,17 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "barcode-scanner",
-    "last_opened_file_path": "C:/Users/fifte/.vscode/OptixToolkit",
-    "settings.editor.selected.configurable": "emulator"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;barcode-scanner&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/fifte/.vscode/OptixToolkit&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;emulator&quot;
   }
-}]]></component>
+}</component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
diff --git a/lib/services/database.dart b/lib/services/database.dart
index 76e212c..16b9477 100644
--- a/lib/services/database.dart
+++ b/lib/services/database.dart
@@ -831,7 +831,7 @@ class User {
 
 class Inventory {
   final String name;
-  final String? description;
+  final String description;
   final int count;
   final String barcodeId;
   final String status;
diff --git a/lib/ui/BarcodeResultPage.dart b/lib/ui/BarcodeResultPage.dart
index 7fa1b2f..2b28d62 100644
--- a/lib/ui/BarcodeResultPage.dart
+++ b/lib/ui/BarcodeResultPage.dart
@@ -12,41 +12,105 @@ class BarcodeResultPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('Barcode Result'),
+        title: Center(
+          child: Text(
+            'Barcode Result',
+            style: TextStyle(
+              fontWeight: FontWeight.bold,
+              color: Colors.black,
+              backgroundColor: Colors.blue  //Must fix
+            ),
+          ),
+        ),
       ),
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(
-              'Barcode Value: $barcodeValue',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            Center(
+              child: Text(
+                'Barcode Value: $barcodeValue',
+                style: TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.w500,
+                  color: Colors.black,
+                ),
+                textAlign: TextAlign.center,
+              ),
             ),
             SizedBox(height: 16),
-            Text( //name
-              'Tool Name: ${inventory.name}',
+            buildAttributeRow('Tool Name', inventory.name, context),
+            buildAttributeRow('Tool Description', inventory.description, context),
+            buildAttributeRow('Tool Status', inventory.status, context),
+            buildAttributeRow('Tool Count', inventory.count.toString(), context),
+            buildAttributeRow('Tool Location', inventory.location, context),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildAttributeRow(String attributeName, String attributeValue, BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Text(
+          '$attributeName:',
+          style: TextStyle(fontSize: 18),
+        ),
+        Row(
+          children: [
+            Text(
+              attributeValue,
               style: TextStyle(fontSize: 18),
             ),
-            Text( //description
-              'Tool Description: ${inventory.description}',
-              style: TextStyle(fontSize: 18),
+            TextButton(
+              onPressed: () => _handleAttributeChange(context, attributeName, attributeValue),
+              child: Text('Change'),
             ),
-            Text(  //status
-              'Tool Status: ${inventory.status}',
-              style: TextStyle(fontSize: 18),
+          ],
+        ),
+      ],
+    );
+  }
+
+  void _handleAttributeChange(BuildContext context, String attributeName, String currentValue) async {
+    TextEditingController newValueController = TextEditingController();
+
+    await showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text('Change $attributeName'),
+          content: TextField(
+            controller: newValueController,
+            keyboardType: TextInputType.text,
+            decoration: InputDecoration(labelText: 'Enter new $attributeName'),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop(); // Close the dialog
+              },
+              child: Text('Cancel'),
             ),
-            Text( //count
-              'Tool Count ${inventory.count}',
-              style: TextStyle(fontSize: 18),
+            TextButton(
+              onPressed: () {
+                String newValue = newValueController.text.trim();
+                if (newValue.isNotEmpty) {
+                  // You can add logic here to update the attribute in the database or any other action
+                  print('New $attributeName: $newValue');
+                  Navigator.of(context).pop(); // Close the dialog
+                } else {
+                  print("Please enter a valid value");
+                }
+              },
+              child: Text('Submit'),
             ),
-            Text( //location
-              'Tool Location ${inventory.location}',
-              style: TextStyle(fontSize: 18),
-            )
           ],
-        ),
-      ),
+        );
+      },
     );
   }
 }

From 5bef7447dcb3faf198dbf0f7f7f1fe481af9ede8 Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Tue, 2 Jan 2024 08:14:35 -0800
Subject: [PATCH 06/12] change buttons for location and status

---
 lib/ui/BarcodeResultPage.dart | 122 +++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 53 deletions(-)

diff --git a/lib/ui/BarcodeResultPage.dart b/lib/ui/BarcodeResultPage.dart
index 2b28d62..ec6d44d 100644
--- a/lib/ui/BarcodeResultPage.dart
+++ b/lib/ui/BarcodeResultPage.dart
@@ -15,95 +15,111 @@ class BarcodeResultPage extends StatelessWidget {
         title: Center(
           child: Text(
             'Barcode Result',
-            style: TextStyle(
-              fontWeight: FontWeight.bold,
-              color: Colors.black,
-              backgroundColor: Colors.blue  //Must fix
-            ),
+            style: TextStyle(fontSize: 30,fontWeight: FontWeight.w800, color: Colors.black),
           ),
         ),
+        backgroundColor: Colors.blue,
       ),
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Center(
-              child: Text(
-                'Barcode Value: $barcodeValue',
-                style: TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.w500,
-                  color: Colors.black,
-                ),
-                textAlign: TextAlign.center,
-              ),
+            Text(  //Tool Name
+              'Tool Name: ${inventory.name}',
+              style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold, color: Colors.black ),
+            ),
+            Text( //Barcode Value
+              'Barcode ID: $barcodeValue',
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500, color: Colors.black),
             ),
-            SizedBox(height: 16),
-            buildAttributeRow('Tool Name', inventory.name, context),
-            buildAttributeRow('Tool Description', inventory.description, context),
-            buildAttributeRow('Tool Status', inventory.status, context),
-            buildAttributeRow('Tool Count', inventory.count.toString(), context),
-            buildAttributeRow('Tool Location', inventory.location, context),
-          ],
-        ),
-      ),
-    );
-  }
 
-  Widget buildAttributeRow(String attributeName, String attributeValue, BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Text(
-          '$attributeName:',
-          style: TextStyle(fontSize: 18),
-        ),
-        Row(
-          children: [
-            Text(
-              attributeValue,
-              style: TextStyle(fontSize: 18),
+            SizedBox(height: 30),
+
+            Text( // Tool Description
+              'Tool Description: ${inventory.description}',
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.black),
             ),
-            TextButton(
-              onPressed: () => _handleAttributeChange(context, attributeName, attributeValue),
-              child: Text('Change'),
+            SizedBox(height: 10),
+            Text( // Tool Count
+              'Tool Count: ${inventory.count}',
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.black),
+            ),
+            // Tool Status
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  'Tool Status: ${inventory.status}',
+                  style: TextStyle(fontSize: 18),
+                ),
+                ElevatedButton(
+                  onPressed: () {
+                    _handleChange('Tool Status', inventory.status, context);
+                  },
+                  child: Text('Change',
+                  style: TextStyle(color: Colors.black)),
+                  style: ElevatedButton.styleFrom(
+                    primary: Colors.blue, // Set the button color to blue
+                  ),
+                ),
+              ],
+            ),
+
+            // Tool Location
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  'Tool Location: ${inventory.location}',
+                  style: TextStyle(fontSize: 18),
+                ),
+                ElevatedButton(
+                  onPressed: () {
+                    _handleChange('Tool Location', inventory.location, context);
+                  },
+                  child: Text('Change',
+                  style: TextStyle(color: Colors.black)),
+                  style: ElevatedButton.styleFrom(
+                    primary: Colors.blue, // Set the button color to blue
+                  ),
+                ),
+              ],
             ),
           ],
         ),
-      ],
+      ),
     );
   }
 
-  void _handleAttributeChange(BuildContext context, String attributeName, String currentValue) async {
-    TextEditingController newValueController = TextEditingController();
+  //This is the function to handle changing tool attributes
+  void _handleChange(String attributeName, String currentValue, BuildContext context) async {
+    TextEditingController inputController = TextEditingController();
 
-    await showDialog(
+    showDialog(
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
           title: Text('Change $attributeName'),
           content: TextField(
-            controller: newValueController,
+            controller: inputController,
             keyboardType: TextInputType.text,
             decoration: InputDecoration(labelText: 'Enter new $attributeName'),
           ),
           actions: <Widget>[
             TextButton(
               onPressed: () {
-                Navigator.of(context).pop(); // Close the dialog
+                Navigator.of(context).pop();    
               },
               child: Text('Cancel'),
             ),
             TextButton(
               onPressed: () {
-                String newValue = newValueController.text.trim();
+                String newValue = inputController.text.trim();
                 if (newValue.isNotEmpty) {
-                  // You can add logic here to update the attribute in the database or any other action
-                  print('New $attributeName: $newValue');
-                  Navigator.of(context).pop(); // Close the dialog
+                  Navigator.of(context).pop(); 
                 } else {
-                  print("Please enter a valid value");
+                  print("Please enter a valid $attributeName");
                 }
               },
               child: Text('Submit'),

From c7d18ef852c2297ab0ca62a199792d5838cedd8a Mon Sep 17 00:00:00 2001
From: rjawesome <aonedtop@gmail.com>
Date: Tue, 2 Jan 2024 10:42:10 -0800
Subject: [PATCH 07/12] styling / organization

---
 lib/ui/BarcodeResultPage.dart       | 132 -----------------------
 lib/ui/tools/BarcodeResultPage.dart | 161 ++++++++++++++++++++++++++++
 lib/ui/tools/ToolsPage.dart         |   2 +-
 3 files changed, 162 insertions(+), 133 deletions(-)
 delete mode 100644 lib/ui/BarcodeResultPage.dart
 create mode 100644 lib/ui/tools/BarcodeResultPage.dart

diff --git a/lib/ui/BarcodeResultPage.dart b/lib/ui/BarcodeResultPage.dart
deleted file mode 100644
index ec6d44d..0000000
--- a/lib/ui/BarcodeResultPage.dart
+++ /dev/null
@@ -1,132 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:OptixToolkit/services/database.dart';
-
-class BarcodeResultPage extends StatelessWidget {
-  final String barcodeValue;
-  final Inventory inventory;
-
-  const BarcodeResultPage({Key? key, required this.barcodeValue, required this.inventory})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Center(
-          child: Text(
-            'Barcode Result',
-            style: TextStyle(fontSize: 30,fontWeight: FontWeight.w800, color: Colors.black),
-          ),
-        ),
-        backgroundColor: Colors.blue,
-      ),
-      body: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(  //Tool Name
-              'Tool Name: ${inventory.name}',
-              style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold, color: Colors.black ),
-            ),
-            Text( //Barcode Value
-              'Barcode ID: $barcodeValue',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500, color: Colors.black),
-            ),
-
-            SizedBox(height: 30),
-
-            Text( // Tool Description
-              'Tool Description: ${inventory.description}',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.black),
-            ),
-            SizedBox(height: 10),
-            Text( // Tool Count
-              'Tool Count: ${inventory.count}',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.black),
-            ),
-            // Tool Status
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(
-                  'Tool Status: ${inventory.status}',
-                  style: TextStyle(fontSize: 18),
-                ),
-                ElevatedButton(
-                  onPressed: () {
-                    _handleChange('Tool Status', inventory.status, context);
-                  },
-                  child: Text('Change',
-                  style: TextStyle(color: Colors.black)),
-                  style: ElevatedButton.styleFrom(
-                    primary: Colors.blue, // Set the button color to blue
-                  ),
-                ),
-              ],
-            ),
-
-            // Tool Location
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(
-                  'Tool Location: ${inventory.location}',
-                  style: TextStyle(fontSize: 18),
-                ),
-                ElevatedButton(
-                  onPressed: () {
-                    _handleChange('Tool Location', inventory.location, context);
-                  },
-                  child: Text('Change',
-                  style: TextStyle(color: Colors.black)),
-                  style: ElevatedButton.styleFrom(
-                    primary: Colors.blue, // Set the button color to blue
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  //This is the function to handle changing tool attributes
-  void _handleChange(String attributeName, String currentValue, BuildContext context) async {
-    TextEditingController inputController = TextEditingController();
-
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: Text('Change $attributeName'),
-          content: TextField(
-            controller: inputController,
-            keyboardType: TextInputType.text,
-            decoration: InputDecoration(labelText: 'Enter new $attributeName'),
-          ),
-          actions: <Widget>[
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop();    
-              },
-              child: Text('Cancel'),
-            ),
-            TextButton(
-              onPressed: () {
-                String newValue = inputController.text.trim();
-                if (newValue.isNotEmpty) {
-                  Navigator.of(context).pop(); 
-                } else {
-                  print("Please enter a valid $attributeName");
-                }
-              },
-              child: Text('Submit'),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
diff --git a/lib/ui/tools/BarcodeResultPage.dart b/lib/ui/tools/BarcodeResultPage.dart
new file mode 100644
index 0000000..44bb8d1
--- /dev/null
+++ b/lib/ui/tools/BarcodeResultPage.dart
@@ -0,0 +1,161 @@
+import 'package:flutter/material.dart';
+import 'package:OptixToolkit/services/database.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+class BarcodeResultPage extends StatelessWidget {
+  final String barcodeValue;
+  final Inventory inventory;
+
+  const BarcodeResultPage(
+      {Key? key, required this.barcodeValue, required this.inventory})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        backgroundColor: Color(0xff26292c),
+        appBar: AppBar(
+          centerTitle: true,
+          title: Text(
+            "BARCODE RESULT",
+            style: GoogleFonts.rubik(fontWeight: FontWeight.bold),
+            textAlign: TextAlign.center,
+          ),
+          backgroundColor: Color(0xff159deb),
+        ),
+        body: Container(
+          margin: EdgeInsets.only(left: 12, top: 20, right: 12, bottom: 0),
+          width: 400,
+          height: MediaQuery.of(context).size.height * 0.75,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(10.0),
+            color: Color(0xff3a3d41),
+          ),
+          child: Padding(
+            padding: EdgeInsets.all(15.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  //Tool Name
+                  'Tool Name: ${inventory.name}',
+                  style: TextStyle(
+                      fontSize: 25,
+                      fontWeight: FontWeight.bold,
+                      color: Colors.white),
+                ),
+                Text(
+                  //Barcode Value
+                  'Barcode ID: $barcodeValue',
+                  style: TextStyle(
+                      fontSize: 18,
+                      fontWeight: FontWeight.w500,
+                      color: Colors.white),
+                ),
+
+                SizedBox(height: 30),
+
+                Text(
+                  // Tool Description
+                  'Tool Description: ${inventory.description}',
+                  style: TextStyle(
+                      fontSize: 18,
+                      fontWeight: FontWeight.normal,
+                      color: Colors.white),
+                ),
+                SizedBox(height: 10),
+                Text(
+                  // Tool Count
+                  'Tool Count: ${inventory.count}',
+                  style: TextStyle(
+                      fontSize: 18,
+                      fontWeight: FontWeight.normal,
+                      color: Colors.white),
+                ),
+                // Tool Status
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(
+                      'Tool Status: ${inventory.status}',
+                      style: TextStyle(fontSize: 18, color: Colors.white),
+                    ),
+                    ElevatedButton(
+                      onPressed: () {
+                        _handleChange('Tool Status', inventory.status, context);
+                      },
+                      child:
+                          Text('Change', style: TextStyle(color: Colors.white)),
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: Colors.blue, // Set the button color to blue
+                      ),
+                    ),
+                  ],
+                ),
+
+                // Tool Location
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(
+                      'Tool Location: ${inventory.location}',
+                      style: TextStyle(fontSize: 18, color: Colors.white),
+                    ),
+                    ElevatedButton(
+                      onPressed: () {
+                        _handleChange(
+                            'Tool Location', inventory.location, context);
+                      },
+                      child:
+                          Text('Change', style: TextStyle(color: Colors.white)),
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: Colors.blue, // Set the button color to blue
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ));
+  }
+
+  //This is the function to handle changing tool attributes
+  void _handleChange(
+      String attributeName, String currentValue, BuildContext context) async {
+    TextEditingController inputController = TextEditingController();
+
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text('Change $attributeName'),
+          content: TextField(
+            controller: inputController,
+            keyboardType: TextInputType.text,
+            decoration: InputDecoration(labelText: 'Enter new $attributeName'),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: Text('Cancel'),
+            ),
+            TextButton(
+              onPressed: () {
+                String newValue = inputController.text.trim();
+                if (newValue.isNotEmpty) {
+                  Navigator.of(context).pop();
+                } else {
+                  print("Please enter a valid $attributeName");
+                }
+              },
+              child: Text('Submit'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
diff --git a/lib/ui/tools/ToolsPage.dart b/lib/ui/tools/ToolsPage.dart
index fc19470..0c5732e 100644
--- a/lib/ui/tools/ToolsPage.dart
+++ b/lib/ui/tools/ToolsPage.dart
@@ -1,5 +1,5 @@
 // Flutter imports:
-import 'package:OptixToolkit/ui/BarcodeResultPage.dart';
+import 'package:OptixToolkit/ui/tools/BarcodeResultPage.dart';
 import 'package:OptixToolkit/ui/tools/ToolModal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';

From 5d919638cde4410e5ac05500ad1666de6022cf55 Mon Sep 17 00:00:00 2001
From: rjawesome <aonedtop@gmail.com>
Date: Tue, 2 Jan 2024 10:56:46 -0800
Subject: [PATCH 08/12] make modificatrnios work

---
 lib/services/database.dart          | 35 +++++++++++++++
 lib/ui/tools/BarcodeResultPage.dart | 69 +++++++++++++++++++++++------
 lib/ui/tools/ToolsPage.dart         |  2 +
 3 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/lib/services/database.dart b/lib/services/database.dart
index 16b9477..f0de22b 100644
--- a/lib/services/database.dart
+++ b/lib/services/database.dart
@@ -712,6 +712,41 @@ class Database {
 
     return inventory;
   }
+
+  static Future<Inventory?> modifyInventory(firebase.IdTokenResult idToken,
+      String barcodeId, String? newStatus, String? newLocation, BuildContext context) async {
+    var client = http.Client();
+
+    Map data = {
+      'endpoint': 'modify-inventory',
+      'auth': idToken.token,
+      'barcodeId': barcodeId,
+      'status': newStatus,
+      'location': newLocation
+    };
+
+    var body = json.encode(data);
+
+    var result = await client.post(Uri.parse(Constants.SERVER_URL),
+        headers: {"Content-Type": "application/json"}, body: body);
+
+    if (result.statusCode != 200) {
+      Alert.showAlert(context, jsonDecode(result.body)['err']);
+      return null;
+    }
+
+    if (jsonDecode(result.body)['inventory'] == null) {
+      Alert.showAlert(context, "Inventoried tool does not exist!");
+      return null;
+    }
+
+    final parsed =
+        jsonDecode(result.body)['inventory'];
+
+    var inventory = Inventory.fromJson(parsed);
+
+    return inventory;
+  }
 }
 
 final Map<String, String> deliveryMap = {
diff --git a/lib/ui/tools/BarcodeResultPage.dart b/lib/ui/tools/BarcodeResultPage.dart
index 44bb8d1..6f87926 100644
--- a/lib/ui/tools/BarcodeResultPage.dart
+++ b/lib/ui/tools/BarcodeResultPage.dart
@@ -1,8 +1,10 @@
+import 'package:firebase_auth/firebase_auth.dart' as firebase;
 import 'package:flutter/material.dart';
 import 'package:OptixToolkit/services/database.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:provider/provider.dart';
 
-class BarcodeResultPage extends StatelessWidget {
+class BarcodeResultPage extends StatefulWidget {
   final String barcodeValue;
   final Inventory inventory;
 
@@ -10,6 +12,19 @@ class BarcodeResultPage extends StatelessWidget {
       {Key? key, required this.barcodeValue, required this.inventory})
       : super(key: key);
 
+  @override
+  State<BarcodeResultPage> createState() => _BarcodeResultPageState();
+}
+
+class _BarcodeResultPageState extends State<BarcodeResultPage> {
+  Inventory? inventory;
+
+  @override
+  void initState() {
+    super.initState();
+    inventory = widget.inventory;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -38,7 +53,7 @@ class BarcodeResultPage extends StatelessWidget {
               children: [
                 Text(
                   //Tool Name
-                  'Tool Name: ${inventory.name}',
+                  'Tool Name: ${inventory!.name}',
                   style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
@@ -46,7 +61,7 @@ class BarcodeResultPage extends StatelessWidget {
                 ),
                 Text(
                   //Barcode Value
-                  'Barcode ID: $barcodeValue',
+                  'Barcode ID: ${widget.barcodeValue}',
                   style: TextStyle(
                       fontSize: 18,
                       fontWeight: FontWeight.w500,
@@ -57,7 +72,7 @@ class BarcodeResultPage extends StatelessWidget {
 
                 Text(
                   // Tool Description
-                  'Tool Description: ${inventory.description}',
+                  'Tool Description: ${inventory!.description}',
                   style: TextStyle(
                       fontSize: 18,
                       fontWeight: FontWeight.normal,
@@ -66,7 +81,7 @@ class BarcodeResultPage extends StatelessWidget {
                 SizedBox(height: 10),
                 Text(
                   // Tool Count
-                  'Tool Count: ${inventory.count}',
+                  'Tool Count: ${inventory!.count}',
                   style: TextStyle(
                       fontSize: 18,
                       fontWeight: FontWeight.normal,
@@ -77,17 +92,19 @@ class BarcodeResultPage extends StatelessWidget {
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     Text(
-                      'Tool Status: ${inventory.status}',
+                      'Tool Status: ${inventory!.status}',
                       style: TextStyle(fontSize: 18, color: Colors.white),
                     ),
                     ElevatedButton(
                       onPressed: () {
-                        _handleChange('Tool Status', inventory.status, context);
+                        _handleChange(
+                            'Tool Status', widget.inventory.status, context);
                       },
                       child:
                           Text('Change', style: TextStyle(color: Colors.white)),
                       style: ElevatedButton.styleFrom(
-                        backgroundColor: Colors.blue, // Set the button color to blue
+                        backgroundColor:
+                            Colors.blue, // Set the button color to blue
                       ),
                     ),
                   ],
@@ -98,18 +115,19 @@ class BarcodeResultPage extends StatelessWidget {
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     Text(
-                      'Tool Location: ${inventory.location}',
+                      'Tool Location: ${inventory!.location}',
                       style: TextStyle(fontSize: 18, color: Colors.white),
                     ),
                     ElevatedButton(
                       onPressed: () {
-                        _handleChange(
-                            'Tool Location', inventory.location, context);
+                        _handleChange('Tool Location',
+                            widget.inventory.location, context);
                       },
                       child:
                           Text('Change', style: TextStyle(color: Colors.white)),
                       style: ElevatedButton.styleFrom(
-                        backgroundColor: Colors.blue, // Set the button color to blue
+                        backgroundColor:
+                            Colors.blue, // Set the button color to blue
                       ),
                     ),
                   ],
@@ -143,9 +161,34 @@ class BarcodeResultPage extends StatelessWidget {
               child: Text('Cancel'),
             ),
             TextButton(
-              onPressed: () {
+              onPressed: () async {
                 String newValue = inputController.text.trim();
                 if (newValue.isNotEmpty) {
+                  Inventory? newInventory;
+
+                  if (attributeName == "Tool Status") {
+                    newInventory = await Database.modifyInventory(
+                        Provider.of<firebase.IdTokenResult>(context, listen: false),
+                        widget.barcodeValue,
+                        newValue,
+                        null,
+                        context);
+                  }
+                  if (attributeName == "Tool Location") {
+                    newInventory = await Database.modifyInventory(
+                        Provider.of<firebase.IdTokenResult>(context, listen: false),
+                        widget.barcodeValue,
+                        null,
+                        newValue,
+                        context);
+                  }
+
+                  if (newInventory != null) {
+                    setState(() {
+                      inventory = newInventory;
+                    });
+                  }
+
                   Navigator.of(context).pop();
                 } else {
                   print("Please enter a valid $attributeName");
diff --git a/lib/ui/tools/ToolsPage.dart b/lib/ui/tools/ToolsPage.dart
index 0c5732e..6ebbaa0 100644
--- a/lib/ui/tools/ToolsPage.dart
+++ b/lib/ui/tools/ToolsPage.dart
@@ -399,6 +399,8 @@ Future _handleManualBarcodeEntry(BuildContext context, String enteredBarcode) as
   Inventory? inv = await Database.getInventory(idToken, barcodeValue, context);
   
   if (inv != null) {
+    Navigator.of(context).pop(); // Close the dialog
+
     Navigator.push(
       context,
       MaterialPageRoute(

From e2a7a4e3d5156629aa3e29781393b31a107e2c1e Mon Sep 17 00:00:00 2001
From: rjawesome <aonedtop@gmail.com>
Date: Tue, 2 Jan 2024 11:02:21 -0800
Subject: [PATCH 09/12] barcode post processing

---
 lib/ui/tools/ToolModal.dart | 106 ---------------------------------
 lib/ui/tools/ToolsPage.dart | 113 +++++++++++++++++-------------------
 2 files changed, 53 insertions(+), 166 deletions(-)
 delete mode 100644 lib/ui/tools/ToolModal.dart

diff --git a/lib/ui/tools/ToolModal.dart b/lib/ui/tools/ToolModal.dart
deleted file mode 100644
index f8c201d..0000000
--- a/lib/ui/tools/ToolModal.dart
+++ /dev/null
@@ -1,106 +0,0 @@
-// Flutter imports:
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:firebase_auth/firebase_auth.dart' as firebase;
-import 'package:OptixToolkit/services/database.dart';
-
-// Package imports:
-import 'package:google_fonts/google_fonts.dart';
-
-class ToolModal extends StatelessWidget {
-  final Inventory inventory;
-  const ToolModal({Key? key, required this.inventory}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final Color blue = Color(0xff159deb);
-    final Color green = Color(0xff15ee07);
-    final Color yellow = Color(0xffebe712);
-    final Color red = Color(0xffd5212c);
-    final Color orange = Color(0xffff9415);
-
-    final ButtonStyle buttonStyle = ElevatedButton.styleFrom(
-      textStyle: const TextStyle(fontSize: 20),
-    );
-
-    Widget doneButton = TextButton(
-      child: Text(
-        "Done",
-        style: GoogleFonts.rubik(
-          fontWeight: FontWeight.bold,
-          color: Color(0xff159deb),
-        ),
-      ),
-      onPressed: () {
-        Navigator.of(context).pop();
-      },
-    );
-
-    return AlertDialog(
-      title: Text(
-        'Tool: ${inventory.name}',
-        style: GoogleFonts.rubik(
-          fontSize: 25.0,
-          fontWeight: FontWeight.bold,
-          color: Color(0xff159deb),
-        ),
-      ),
-      backgroundColor: Color(0xff26292c),
-      content: SingleChildScrollView(
-        child: ListBody(
-          children: <Widget>[
-            RichText(
-              text: TextSpan(
-                children: <TextSpan>[
-                  TextSpan(
-                    text: 'Count: ${inventory.count}',
-                    style: GoogleFonts.rubik(
-                      fontWeight: FontWeight.bold,
-                      color: Colors.white,
-                      fontSize: 20.0,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            if (inventory.description != null)
-              RichText(
-                text: TextSpan(
-                  children: <TextSpan>[
-                    TextSpan(
-                      text: 'Description: ${inventory.description}',
-                      style: GoogleFonts.rubik(
-                        fontWeight: FontWeight.bold,
-                        color: Colors.white,
-                        fontSize: 15.0,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            const SizedBox(height: 20),
-            ElevatedButton(
-              style: ElevatedButton.styleFrom(
-                backgroundColor: Color(0xff159deb),
-              ),
-              onPressed: () async {},
-              child: RichText(
-                text: TextSpan(
-                  text: 'Use Tool',
-                  style: GoogleFonts.rubik(
-                    color: Colors.white,
-                    fontSize: 18.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        doneButton,
-      ],
-    );
-  }
-}
diff --git a/lib/ui/tools/ToolsPage.dart b/lib/ui/tools/ToolsPage.dart
index 6ebbaa0..d6d81aa 100644
--- a/lib/ui/tools/ToolsPage.dart
+++ b/lib/ui/tools/ToolsPage.dart
@@ -226,23 +226,19 @@ class _toolState extends State<ToolWidget> with RouteAware {
                       backgroundColor: Color(0xff159deb),
                     ),
                   ),
-                  ElevatedButton(  
-                    onPressed: () {
-                      _showManualEntryDialog(context);
-                    },
-                    child: Text(
-                      'Manual Entry' ,
-                      style: GoogleFonts.rubik(
-                        fontWeight: FontWeight.bold,
-                        fontSize: 20.0,
-                        color: Colors.white
-                      )
-                    ),
-                    style: ElevatedButton.styleFrom(
-                      backgroundColor: Color(0xff159deb),
-                    )
-                  )
-                  // ButtonTheme(      
+                  ElevatedButton(
+                      onPressed: () {
+                        _showManualEntryDialog(context);
+                      },
+                      child: Text('Manual Entry',
+                          style: GoogleFonts.rubik(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 20.0,
+                              color: Colors.white)),
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: Color(0xff159deb),
+                      ))
+                  // ButtonTheme(
                   //   minWidth: MediaQuery.of(context).size.width * 0.43,
                   //   height: 55,
                   //   shape: RoundedRectangleBorder(
@@ -330,31 +326,36 @@ class _toolState extends State<ToolWidget> with RouteAware {
 
   // Function to handle barcode scanning
   Future _scanBarcode(BuildContext context) async {
-  try {
-    String barcodeValue = (await BarcodeScanner.scan()).rawContent;
+    try {
+      String barcodeValue = (await BarcodeScanner.scan()).rawContent;
 
-    Inventory? inv = await Database.getInventory(idToken, barcodeValue, context);
+      // remove first and last digit of barcode
+      barcodeValue = barcodeValue.substring(1, barcodeValue.length - 1);
 
-    if (inv != null) {
-      Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
-        ),
-      );
-    }
-  } on PlatformException catch (e) {
-    if (e.code == BarcodeScanner.cameraAccessDenied) {
-      print('Camera permission not granted');
-    } else {
+      Inventory? inv =
+          await Database.getInventory(idToken, barcodeValue, context);
+
+      if (inv != null) {
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) =>
+                BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
+          ),
+        );
+      }
+    } on PlatformException catch (e) {
+      if (e.code == BarcodeScanner.cameraAccessDenied) {
+        print('Camera permission not granted');
+      } else {
+        print('Unknown Error: $e');
+      }
+    } on FormatException catch (e) {
+      print('User pressed back button before scanning');
+    } catch (e) {
       print('Unknown Error: $e');
     }
-  } on FormatException catch (e) {
-    print('User pressed back button before scanning');
-  } catch (e) {
-    print('Unknown Error: $e');
   }
-}
 
   void _showManualEntryDialog(BuildContext context) {
     TextEditingController barcodeController = TextEditingController();
@@ -393,30 +394,22 @@ class _toolState extends State<ToolWidget> with RouteAware {
     );
   }
 
-Future _handleManualBarcodeEntry(BuildContext context, String enteredBarcode) async{
+  Future _handleManualBarcodeEntry(
+      BuildContext context, String enteredBarcode) async {
+    String barcodeValue = enteredBarcode;
+    Inventory? inv =
+        await Database.getInventory(idToken, barcodeValue, context);
 
-  String barcodeValue = enteredBarcode;
-  Inventory? inv = await Database.getInventory(idToken, barcodeValue, context);
-  
-  if (inv != null) {
-    Navigator.of(context).pop(); // Close the dialog
+    if (inv != null) {
+      Navigator.of(context).pop(); // Close the dialog
 
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-            builder: (context) => BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
-    ),
-    );
-  }
-}
-  // Function to show a modal
-  void _showBarcodeModal(BuildContext context, Inventory inv) {
-    showDialog(
-      context: context, //tells flutter the context, or where we are in the app
-      builder: (BuildContext context) {
-        // return object of type Dialog
-        return ToolModal(inventory: inv);
-      },
-    );
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (context) =>
+              BarcodeResultPage(barcodeValue: barcodeValue, inventory: inv),
+        ),
+      );
+    }
   }
 }

From f2ad086e2c0172b04b8dac257cf0669dccb430ee Mon Sep 17 00:00:00 2001
From: rjawesome <aonedtop@gmail.com>
Date: Tue, 2 Jan 2024 11:03:44 -0800
Subject: [PATCH 10/12] fix import

---
 lib/ui/tools/ToolsPage.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ui/tools/ToolsPage.dart b/lib/ui/tools/ToolsPage.dart
index d6d81aa..c4a2925 100644
--- a/lib/ui/tools/ToolsPage.dart
+++ b/lib/ui/tools/ToolsPage.dart
@@ -1,6 +1,5 @@
 // Flutter imports:
 import 'package:OptixToolkit/ui/tools/BarcodeResultPage.dart';
-import 'package:OptixToolkit/ui/tools/ToolModal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:OptixToolkit/ui/tools/ToolCard.dart';

From 4fa6c6281f72db4bf69475d71c3b5e69360ffe27 Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Tue, 2 Jan 2024 12:23:54 -0800
Subject: [PATCH 11/12] stying for barcode result page

---
 lib/ui/BarcodeResultPage.dart | 133 +++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 65 deletions(-)

diff --git a/lib/ui/BarcodeResultPage.dart b/lib/ui/BarcodeResultPage.dart
index ec6d44d..aa375a3 100644
--- a/lib/ui/BarcodeResultPage.dart
+++ b/lib/ui/BarcodeResultPage.dart
@@ -15,78 +15,81 @@ class BarcodeResultPage extends StatelessWidget {
         title: Center(
           child: Text(
             'Barcode Result',
-            style: TextStyle(fontSize: 30,fontWeight: FontWeight.w800, color: Colors.black),
+            style: TextStyle(fontSize: 30, fontWeight: FontWeight.w800, color: Colors.black),
           ),
         ),
         backgroundColor: Colors.blue,
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(  //Tool Name
-              'Tool Name: ${inventory.name}',
-              style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold, color: Colors.black ),
-            ),
-            Text( //Barcode Value
-              'Barcode ID: $barcodeValue',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500, color: Colors.black),
-            ),
+      body: Container(
+        color: Color.fromARGB(255, 51, 44, 44), // Not sure if this is the right shade of gray
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text( //Tool Name
+                'Tool Name: ${inventory.name}',
+                style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold, color: Colors.white),
+              ),
+              Text( //Barcode Value
+                'Barcode ID: $barcodeValue',
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500, color: Colors.white),
+              ),
 
-            SizedBox(height: 30),
+              SizedBox(height: 30),
 
-            Text( // Tool Description
-              'Tool Description: ${inventory.description}',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.black),
-            ),
-            SizedBox(height: 10),
-            Text( // Tool Count
-              'Tool Count: ${inventory.count}',
-              style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.black),
-            ),
-            // Tool Status
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(
-                  'Tool Status: ${inventory.status}',
-                  style: TextStyle(fontSize: 18),
-                ),
-                ElevatedButton(
-                  onPressed: () {
-                    _handleChange('Tool Status', inventory.status, context);
-                  },
-                  child: Text('Change',
-                  style: TextStyle(color: Colors.black)),
-                  style: ElevatedButton.styleFrom(
-                    primary: Colors.blue, // Set the button color to blue
+              Text( // Tool Description
+                'Tool Description: ${inventory.description}',
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.white),
+              ),
+              SizedBox(height: 10),
+              Text( // Tool Count
+                'Tool Count: ${inventory.count}',
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.normal, color: Colors.white),
+              ),
+              // Tool Status
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(
+                    'Tool Status: ${inventory.status}',
+                    style: TextStyle(fontSize: 18, color: Colors.white),
                   ),
-                ),
-              ],
-            ),
+                  ElevatedButton(
+                    onPressed: () {
+                      _handleChange('Tool Status', inventory.status, context);
+                    },
+                    child: Text('Change',
+                        style: TextStyle(color: Colors.white)),
+                    style: ElevatedButton.styleFrom(
+                      primary: Colors.blue, // Set the button color to blue
+                    ),
+                  ),
+                ],
+              ),
 
-            // Tool Location
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(
-                  'Tool Location: ${inventory.location}',
-                  style: TextStyle(fontSize: 18),
-                ),
-                ElevatedButton(
-                  onPressed: () {
-                    _handleChange('Tool Location', inventory.location, context);
-                  },
-                  child: Text('Change',
-                  style: TextStyle(color: Colors.black)),
-                  style: ElevatedButton.styleFrom(
-                    primary: Colors.blue, // Set the button color to blue
+              // Tool Location
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(
+                    'Tool Location: ${inventory.location}',
+                    style: TextStyle(fontSize: 18, color: Colors.white),
                   ),
-                ),
-              ],
-            ),
-          ],
+                  ElevatedButton(
+                    onPressed: () {
+                      _handleChange('Tool Location', inventory.location, context);
+                    },
+                    child: Text('Change',
+                        style: TextStyle(color: Colors.white)),
+                    style: ElevatedButton.styleFrom(
+                      primary: Colors.blue, // Set the button color to blue
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
         ),
       ),
     );
@@ -109,7 +112,7 @@ class BarcodeResultPage extends StatelessWidget {
           actions: <Widget>[
             TextButton(
               onPressed: () {
-                Navigator.of(context).pop();    
+                Navigator.of(context).pop();
               },
               child: Text('Cancel'),
             ),
@@ -117,7 +120,7 @@ class BarcodeResultPage extends StatelessWidget {
               onPressed: () {
                 String newValue = inputController.text.trim();
                 if (newValue.isNotEmpty) {
-                  Navigator.of(context).pop(); 
+                  Navigator.of(context).pop();
                 } else {
                   print("Please enter a valid $attributeName");
                 }

From cdc9deaf48880f7d176092db64d96ea57d9e7b3d Mon Sep 17 00:00:00 2001
From: Tanav <fifteentanav@gmail.com>
Date: Thu, 4 Jan 2024 21:24:44 -0800
Subject: [PATCH 12/12] white title not working

---
 .idea/workspace.xml           | 20 ++++++++++----------
 lib/ui/BarcodeResultPage.dart | 13 +++++++------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e272057..405bce5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -35,17 +35,17 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;barcode-scanner&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/fifte/.vscode/OptixToolkit&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;emulator&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "barcode-scanner",
+    "last_opened_file_path": "C:/Users/fifte/.vscode/OptixToolkit",
+    "settings.editor.selected.configurable": "emulator"
   }
-}</component>
+}]]></component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
diff --git a/lib/ui/BarcodeResultPage.dart b/lib/ui/BarcodeResultPage.dart
index 0fa74b4..ed1c262 100644
--- a/lib/ui/BarcodeResultPage.dart
+++ b/lib/ui/BarcodeResultPage.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:OptixToolkit/services/database.dart';
+import 'package:google_fonts/google_fonts.dart';
 
 class BarcodeResultPage extends StatelessWidget {
   final String barcodeValue;
@@ -12,13 +13,13 @@ class BarcodeResultPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Center(
-          child: Text(
-            'Barcode Result',
-            style: TextStyle(fontSize: 30, fontWeight: FontWeight.w800, color: Color.fromARGB(255, 255, 255, 255)),
-          ),
+        centerTitle: true,
+        title: Text(
+          "BARCODE RESULT",
+          style: GoogleFonts.rubik(fontWeight: FontWeight.bold),
+          textAlign: TextAlign.center,
         ),
-        backgroundColor: Colors.blue,
+        backgroundColor: Color(0xff159deb),
       ),
       body: Container(
         color: Color.fromARGB(255, 51, 44, 44), // Not sure if this is the right shade of gray