From 7a1c2617dba9d0ed5e7f772a37f907539749c26d Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Tue, 7 Mar 2023 00:04:54 -0500
Subject: [PATCH 01/36] chetan stuff

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../com/example/inventory/AddItemFragment.kt  |  6 ++-
 .../example/inventory/InventoryViewModel.kt   | 24 +++++++-----
 .../java/com/example/inventory/data/Item.kt   |  2 +
 app/src/main/res/layout/fragment_add_item.xml | 39 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  3 +-
 6 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5d86cc63..8125aa87 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
     <application
         android:name="com.example.inventory.InventoryApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 6fd3e38f..0d969f60 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -69,6 +69,7 @@ class AddItemFragment : Fragment() {
             binding.itemName.text.toString(),
             binding.itemPrice.text.toString(),
             binding.itemCount.text.toString(),
+            binding.itemSum.text.toString(),
         )
     }
 
@@ -81,6 +82,7 @@ class AddItemFragment : Fragment() {
             itemName.setText(item.itemName, TextView.BufferType.SPANNABLE)
             itemPrice.setText(price, TextView.BufferType.SPANNABLE)
             itemCount.setText(item.quantityInStock.toString(), TextView.BufferType.SPANNABLE)
+            itemSum.setText(item.itemSum, TextView.BufferType.SPANNABLE)
             saveAction.setOnClickListener { updateItem() }
         }
     }
@@ -94,6 +96,7 @@ class AddItemFragment : Fragment() {
                 binding.itemName.text.toString(),
                 binding.itemPrice.text.toString(),
                 binding.itemCount.text.toString(),
+                binding.itemSum.text.toString(),
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
             findNavController().navigate(action)
@@ -109,7 +112,8 @@ class AddItemFragment : Fragment() {
                 this.navigationArgs.itemId,
                 this.binding.itemName.text.toString(),
                 this.binding.itemPrice.text.toString(),
-                this.binding.itemCount.text.toString()
+                this.binding.itemCount.text.toString(),
+                this.binding.itemSum.text.toString()
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
             findNavController().navigate(action)
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index a04d5264..0bb24269 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -48,9 +48,10 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         itemId: Int,
         itemName: String,
         itemPrice: String,
-        itemCount: String
+        itemCount: String,
+        itemSum: String,
     ) {
-        val updatedItem = getUpdatedItemEntry(itemId, itemName, itemPrice, itemCount)
+        val updatedItem = getUpdatedItemEntry(itemId, itemName, itemPrice, itemCount, itemSum)
         updateItem(updatedItem)
     }
 
@@ -78,8 +79,8 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Inserts the new Item into database.
      */
-    fun addNewItem(itemName: String, itemPrice: String, itemCount: String) {
-        val newItem = getNewItemEntry(itemName, itemPrice, itemCount)
+    fun addNewItem(itemName: String, itemPrice: String, itemCount: String, itemSum: String) {
+        val newItem = getNewItemEntry(itemName, itemPrice, itemCount, itemSum)
         insertItem(newItem)
     }
 
@@ -111,8 +112,8 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Returns true if the EditTexts are not empty
      */
-    fun isEntryValid(itemName: String, itemPrice: String, itemCount: String): Boolean {
-        if (itemName.isBlank() || itemPrice.isBlank() || itemCount.isBlank()) {
+    fun isEntryValid(itemName: String, itemPrice: String, itemCount: String, itemSum: String): Boolean {
+        if (itemName.isBlank() || itemPrice.isBlank() || itemCount.isBlank() || itemSum.isBlank()) {
             return false
         }
         return true
@@ -122,11 +123,12 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
      * Returns an instance of the [Item] entity class with the item info entered by the user.
      * This will be used to add a new entry to the Inventory database.
      */
-    private fun getNewItemEntry(itemName: String, itemPrice: String, itemCount: String): Item {
+    private fun getNewItemEntry(itemName: String, itemPrice: String, itemCount: String, itemSum: String): Item {
         return Item(
             itemName = itemName,
             itemPrice = itemPrice.toDouble(),
-            quantityInStock = itemCount.toInt()
+            quantityInStock = itemCount.toInt(),
+            itemSum = itemSum.toInt()
         )
     }
 
@@ -138,13 +140,15 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         itemId: Int,
         itemName: String,
         itemPrice: String,
-        itemCount: String
+        itemCount: String,
+        itemSum: String,
     ): Item {
         return Item(
             id = itemId,
             itemName = itemName,
             itemPrice = itemPrice.toDouble(),
-            quantityInStock = itemCount.toInt()
+            quantityInStock = itemCount.toInt(),
+            itemSum = itemSum.toInt()
         )
     }
 }
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 25440b4e..79a694d7 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -33,6 +33,8 @@ data class Item(
     val itemPrice: Double,
     @ColumnInfo(name = "quantity")
     val quantityInStock: Int,
+    @ColumnInfo(name = "sum")
+    val itemSum: Int,
 )
 /**
  * Returns the passed in price in currency format.
diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
index 051ef747..551a2f8f 100644
--- a/app/src/main/res/layout/fragment_add_item.xml
+++ b/app/src/main/res/layout/fragment_add_item.xml
@@ -42,6 +42,7 @@
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
+
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/item_price_label"
             android:layout_width="0dp"
@@ -67,7 +68,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
             android:hint="@string/quantity_req"
-            app:layout_constraintBottom_toTopOf="@+id/save_action"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/item_price_label">
@@ -80,15 +80,48 @@
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/item_sum_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin"
+            android:hint="Sum in Stock *"
+            app:layout_constraintBottom_toTopOf="@+id/save_action"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/item_count_label">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/item_sum"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:inputType="number"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+<!--        <Spinner-->
+<!--            android:id="@+id/label_spinner"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="@dimen/margin"-->
+<!--            android:spinnerMode="dialog"-->
+<!--            android:prompt="@string/select_label"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintTop_toBottomOf="@+id/item_count_label"/>-->
+
+
         <Button
             android:id="@+id/save_action"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="16dp"
             android:text="@string/save_action"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_count_label" />
+            app:layout_constraintTop_toBottomOf="@+id/item_sum_label" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 37db6639..d165e9f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="sell">Sell</string>
     <string name="quantity">Quantity in Stock:</string>
     <string name="quantity_req">Quantity in Stock <font color='#FF0000'>*</font></string>
-    <string name="item_name_req">Item Name <font color='#FF0000'>*</font></string>
+    <string name="item_name_req">Ingredient Name <font color='#FF0000'>*</font></string>
     <string name="item_price_req">Item Price <font color='#FF0000'>*</font></string>
     <string name="save_action">Save</string>
     <string name="item_detail_fragment_title">Item Details</string>
@@ -34,4 +34,5 @@
     <string name="currency_symbol">$</string>
     <string name="edit_item">Edit Item</string>
     <string name="add_new_item">Add new item</string>
+    <string name="select_label">Select Label</string>
 </resources>
\ No newline at end of file

From bb0d16cd598da4a3d579960d544a0c98d1e258b1 Mon Sep 17 00:00:00 2001
From: SIDDHANT SINGHAL <s8singha@uwaterloo.ca>
Date: Wed, 8 Mar 2023 08:04:42 -0500
Subject: [PATCH 02/36] Created barebones front end for Search and Filter

---
 .../main/res/layout/item_list_fragment.xml    | 195 ++++++++++++++++++
 1 file changed, 195 insertions(+)

diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index ab8654b8..06352749 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -86,4 +86,199 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:tint="@android:color/white" />
 
+    <View
+        android:id="@+id/divider1"
+        style="@style/Divider"
+        android:layout_marginTop="@dimen/margin_between_elements"
+        app:layout_constraintBottom_toTopOf="@+id/SFContainerView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/recyclerView" />
+
+    <LinearLayout
+        android:id="@+id/SFContainerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="vertical"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/floatingActionButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/recyclerView">
+
+        <androidx.appcompat.widget.SearchView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/grocerySearchView"
+            android:iconifiedByDefault="false"
+            android:queryHint="GroceryName"/>
+
+        <View
+            android:id="@+id/divider1"
+            style="@style/Divider"
+            android:layout_marginTop="@dimen/margin_between_elements"
+            android:layout_marginBottom="@dimen/margin_between_elements"
+            app:layout_constraintBottom_toTopOf="@+id/SFContainerView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/grocerySearchView" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/All"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="All"
+                android:onClick="filterAll"/>
+
+            <Button
+                android:id="@+id/Fruits"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Fruits"
+                android:onClick="filterFruits"/>
+
+            <Button
+                android:id="@+id/Vegetables"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Vegetables"
+                android:onClick="filterVegetables"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/Canned"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Canned Goods"
+                android:onClick="filterCanned"/>
+
+            <Button
+                android:id="@+id/Dairy"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Dairy"
+                android:onClick="filterDairy"/>
+
+            <Button
+                android:id="@+id/Meat"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Meat"
+                android:onClick="filterMeat"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/Seafood"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Seafood"
+                android:onClick="filterSeafood"/>
+
+            <Button
+                android:id="@+id/Deli"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Deli"
+                android:onClick="filterDeli"/>
+
+            <Button
+                android:id="@+id/Condiments"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Condiments"
+                android:onClick="filterCondiments"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/Snacks"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Snacks"
+                android:onClick="filterSnacks"/>
+
+            <Button
+                android:id="@+id/Bakery"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Bakery"
+                android:onClick="filterBakery"/>
+
+            <Button
+                android:id="@+id/Beverages"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Beverages"
+                android:onClick="filterBeverages"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/PRC"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Pasta, Rice and Cereal"
+                android:onClick="filterPRC"/>
+
+            <Button
+                android:id="@+id/Frozen"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Frozen"
+                android:onClick="filterFrozen"/>
+
+            <Button
+                android:id="@+id/PersonalCare"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:text="Personal Care"
+                android:onClick="filterPersonalCare"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From d22b5fc6902e5e788039917a747f4387f76a9c5a Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Wed, 8 Mar 2023 12:47:19 -0500
Subject: [PATCH 03/36] got an additional itemSum field working on all screens.

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../com/example/inventory/AddItemFragment.kt  |  2 +-
 .../example/inventory/ItemDetailFragment.kt   |  1 +
 .../com/example/inventory/ItemListAdapter.kt  |  1 +
 .../inventory/data/ItemRoomDatabase.kt        |  2 +-
 .../main/res/layout/fragment_item_detail.xml  | 11 +++++++++-
 .../main/res/layout/item_list_fragment.xml    | 16 +++++++++++++--
 app/src/main/res/layout/item_list_item.xml    | 20 +++++++++++++++----
 8 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8125aa87..5d86cc63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
     <application
         android:name="com.example.inventory.InventoryApplication"
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 0d969f60..5e3db5da 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -82,7 +82,7 @@ class AddItemFragment : Fragment() {
             itemName.setText(item.itemName, TextView.BufferType.SPANNABLE)
             itemPrice.setText(price, TextView.BufferType.SPANNABLE)
             itemCount.setText(item.quantityInStock.toString(), TextView.BufferType.SPANNABLE)
-            itemSum.setText(item.itemSum, TextView.BufferType.SPANNABLE)
+            itemSum.setText(item.itemSum.toString(), TextView.BufferType.SPANNABLE)
             saveAction.setOnClickListener { updateItem() }
         }
     }
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index 9264b290..f54ba936 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -62,6 +62,7 @@ class ItemDetailFragment : Fragment() {
             itemName.text = item.itemName
             itemPrice.text = item.getFormattedPrice()
             itemCount.text = item.quantityInStock.toString()
+            itemSum.text = item.itemSum.toString()
             sellItem.isEnabled = viewModel.isStockAvailable(item)
             sellItem.setOnClickListener { viewModel.sellItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
diff --git a/app/src/main/java/com/example/inventory/ItemListAdapter.kt b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
index 0b9ae923..9a13d9fc 100644
--- a/app/src/main/java/com/example/inventory/ItemListAdapter.kt
+++ b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
@@ -56,6 +56,7 @@ class ItemListAdapter(private val onItemClicked: (Item) -> Unit) :
             binding.itemName.text = item.itemName
             binding.itemPrice.text = item.getFormattedPrice()
             binding.itemQuantity.text = item.quantityInStock.toString()
+            binding.itemSum.text = item.itemSum.toString()
         }
     }
 
diff --git a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
index f0a0d010..96bbbff4 100644
--- a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
@@ -24,7 +24,7 @@ import androidx.room.RoomDatabase
 /**
  * Database class with a singleton INSTANCE object.
  */
-@Database(entities = [Item::class], version = 1, exportSchema = false)
+@Database(entities = [Item::class], version = 2, exportSchema = false)
 abstract class ItemRoomDatabase : RoomDatabase() {
 
     abstract fun itemDao(): ItemDao
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index c6a48052..8eae0750 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -60,6 +60,15 @@
         app:layout_constraintTop_toBottomOf="@+id/item_price"
         tools:text="5" />
 
+    <TextView
+        android:id="@+id/item_sum"
+        style="@style/Widget.Inventory.TextView"
+        android:layout_width="0dp"
+        android:layout_marginTop="@dimen/margin"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/item_count_label"
+        tools:text="Item Sum" />
+
     <Button
         android:id="@+id/sell_item"
         android:layout_width="0dp"
@@ -69,7 +78,7 @@
         app:layout_constraintBottom_toTopOf="@+id/delete_item"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_count" />
+        app:layout_constraintTop_toBottomOf="@+id/item_sum" />
 
     <Button
         android:id="@+id/delete_item"
diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index ab8654b8..3841adbf 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -39,11 +39,23 @@
         android:layout_marginStart="@dimen/margin_between_elements"
         android:text="@string/price"
         android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
+        app:layout_constraintEnd_toStartOf="@+id/item_sum"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_name"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/item_sum"
+        style="@style/Widget.Inventory.Header"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="@dimen/margin_between_elements"
+        android:text="Sum in Stock"
+        android:textAlignment="center"
+        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintStart_toEndOf="@+id/item_price"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/item_quantity"
         style="@style/Widget.Inventory.Header"
@@ -53,7 +65,7 @@
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@+id/item_price"
+        app:layout_constraintStart_toEndOf="@+id/item_sum"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
diff --git a/app/src/main/res/layout/item_list_item.xml b/app/src/main/res/layout/item_list_item.xml
index 27ac3bbd..c7d7cb9f 100644
--- a/app/src/main/res/layout/item_list_item.xml
+++ b/app/src/main/res/layout/item_list_item.xml
@@ -25,13 +25,12 @@
     <TextView
         android:id="@+id/item_name"
         style="@style/Widget.Inventory.ListItemTextView"
-        android:layout_width="180dp"
-        android:layout_marginStart="@dimen/margin_between_elements"
+        android:layout_width="wrap_content"
         android:fontFamily="sans-serif"
         app:layout_constraintEnd_toStartOf="@+id/item_price"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Cogs and Widgets" />
+        tools:text="Cogs" />
 
     <TextView
         android:id="@+id/item_price"
@@ -41,12 +40,25 @@
         android:layout_marginStart="@dimen/margin_between_elements"
         android:fontFamily="sans-serif-medium"
         android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
+        app:layout_constraintEnd_toStartOf="@+id/item_sum"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_name"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="$4.99" />
 
+    <TextView
+        android:id="@+id/item_sum"
+        style="@style/Widget.Inventory.ListItemTextView"
+        android:layout_width="100dp"
+        android:layout_marginStart="@dimen/margin_between_elements"
+        android:fontFamily="sans-serif-medium"
+        android:textAlignment="center"
+        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintStart_toEndOf="@+id/item_price"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="15" />
+
     <TextView
         android:id="@+id/item_quantity"
         style="@style/Widget.Inventory.ListItemTextView"

From e7d68346929b4392f9604d7c0febb732e919fb6e Mon Sep 17 00:00:00 2001
From: SIDDHANT SINGHAL <s8singha@uwaterloo.ca>
Date: Wed, 8 Mar 2023 16:30:13 -0500
Subject: [PATCH 04/36] Added Search Bar and Filter Buttons to Home page

---
 .../main/res/layout/item_list_fragment.xml    | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index 06352749..a5c69484 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -114,7 +114,7 @@
             android:queryHint="GroceryName"/>
 
         <View
-            android:id="@+id/divider1"
+            android:id="@+id/divider2"
             style="@style/Divider"
             android:layout_marginTop="@dimen/margin_between_elements"
             android:layout_marginBottom="@dimen/margin_between_elements"
@@ -134,24 +134,24 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="All"
-                android:onClick="filterAll"/>
+                android:text="All"/>
+<!--                android:onClick="filterAll"/>-->
 
             <Button
                 android:id="@+id/Fruits"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Fruits"
-                android:onClick="filterFruits"/>
+                android:text="Fruits"/>
+<!--                android:onClick="filterFruits"/>-->
 
             <Button
                 android:id="@+id/Vegetables"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Vegetables"
-                android:onClick="filterVegetables"/>
+                android:text="Vegetables"/>
+<!--                android:onClick="filterVegetables"/>-->
 
         </LinearLayout>
 
@@ -165,24 +165,24 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Canned Goods"
-                android:onClick="filterCanned"/>
+                android:text="Canned Goods"/>
+<!--                android:onClick="filterCanned"/>-->
 
             <Button
                 android:id="@+id/Dairy"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Dairy"
-                android:onClick="filterDairy"/>
+                android:text="Dairy"/>
+<!--                android:onClick="filterDairy"/>-->
 
             <Button
                 android:id="@+id/Meat"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Meat"
-                android:onClick="filterMeat"/>
+                android:text="Meat"/>
+<!--                android:onClick="filterMeat"/>-->
 
         </LinearLayout>
 
@@ -196,24 +196,24 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Seafood"
-                android:onClick="filterSeafood"/>
+                android:text="Seafood"/>
+<!--                android:onClick="filterSeafood"/>-->
 
             <Button
                 android:id="@+id/Deli"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Deli"
-                android:onClick="filterDeli"/>
+                android:text="Deli"/>
+<!--                android:onClick="filterDeli"/>-->
 
             <Button
                 android:id="@+id/Condiments"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Condiments"
-                android:onClick="filterCondiments"/>
+                android:text="Condiments"/>
+<!--                android:onClick="filterCondiments"/>-->
 
         </LinearLayout>
 
@@ -227,24 +227,24 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Snacks"
-                android:onClick="filterSnacks"/>
+                android:text="Snacks"/>
+<!--                android:onClick="filterSnacks"/>-->
 
             <Button
                 android:id="@+id/Bakery"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Bakery"
-                android:onClick="filterBakery"/>
+                android:text="Bakery"/>
+<!--                android:onClick="filterBakery"/>-->
 
             <Button
                 android:id="@+id/Beverages"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Beverages"
-                android:onClick="filterBeverages"/>
+                android:text="Beverages"/>
+<!--                android:onClick="filterBeverages"/>-->
 
         </LinearLayout>
 
@@ -258,24 +258,24 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Pasta, Rice and Cereal"
-                android:onClick="filterPRC"/>
+                android:text="Pasta, Rice and Cereal"/>
+<!--                android:onClick="filterPRC"/>-->
 
             <Button
                 android:id="@+id/Frozen"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Frozen"
-                android:onClick="filterFrozen"/>
+                android:text="Frozen"/>
+<!--                android:onClick="filterFrozen"/>-->
 
             <Button
                 android:id="@+id/PersonalCare"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:text="Personal Care"
-                android:onClick="filterPersonalCare"/>
+                android:text="Personal Care"/>
+<!--                android:onClick="filterPersonalCare"/>-->
 
         </LinearLayout>
 

From a3396f98cda512cc1b11fea44f5b51fbe891b608 Mon Sep 17 00:00:00 2001
From: SIDDHANT SINGHAL <s8singha@uwaterloo.ca>
Date: Wed, 8 Mar 2023 16:59:08 -0500
Subject: [PATCH 05/36] Search Bar and harizontal filters Front End

---
 .../main/res/layout/item_list_fragment.xml    | 273 ++++++++----------
 1 file changed, 118 insertions(+), 155 deletions(-)

diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index a5c69484..ee82a2da 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -92,8 +92,7 @@
         android:layout_marginTop="@dimen/margin_between_elements"
         app:layout_constraintBottom_toTopOf="@+id/SFContainerView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/recyclerView" />
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <LinearLayout
         android:id="@+id/SFContainerView"
@@ -123,161 +122,125 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/grocerySearchView" />
 
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/All"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="All"/>
-<!--                android:onClick="filterAll"/>-->
-
-            <Button
-                android:id="@+id/Fruits"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Fruits"/>
-<!--                android:onClick="filterFruits"/>-->
-
-            <Button
-                android:id="@+id/Vegetables"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Vegetables"/>
-<!--                android:onClick="filterVegetables"/>-->
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/Canned"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Canned Goods"/>
-<!--                android:onClick="filterCanned"/>-->
-
-            <Button
-                android:id="@+id/Dairy"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Dairy"/>
-<!--                android:onClick="filterDairy"/>-->
-
-            <Button
-                android:id="@+id/Meat"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Meat"/>
-<!--                android:onClick="filterMeat"/>-->
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/Seafood"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Seafood"/>
-<!--                android:onClick="filterSeafood"/>-->
-
-            <Button
-                android:id="@+id/Deli"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Deli"/>
-<!--                android:onClick="filterDeli"/>-->
-
-            <Button
-                android:id="@+id/Condiments"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Condiments"/>
-<!--                android:onClick="filterCondiments"/>-->
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/Snacks"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Snacks"/>
-<!--                android:onClick="filterSnacks"/>-->
-
-            <Button
-                android:id="@+id/Bakery"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Bakery"/>
-<!--                android:onClick="filterBakery"/>-->
-
-            <Button
-                android:id="@+id/Beverages"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Beverages"/>
-<!--                android:onClick="filterBeverages"/>-->
-
-        </LinearLayout>
-
-        <LinearLayout
+        <HorizontalScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/PRC"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Pasta, Rice and Cereal"/>
-<!--                android:onClick="filterPRC"/>-->
-
-            <Button
-                android:id="@+id/Frozen"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Frozen"/>
-<!--                android:onClick="filterFrozen"/>-->
-
-            <Button
-                android:id="@+id/PersonalCare"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:text="Personal Care"/>
-<!--                android:onClick="filterPersonalCare"/>-->
-
-        </LinearLayout>
+            android:scrollbars="none">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/All"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="All"/>
+    <!--                android:onClick="filterAll"/>-->
+
+                <Button
+                    android:id="@+id/Fruits"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Fruits"/>
+    <!--                android:onClick="filterFruits"/>-->
+
+                <Button
+                    android:id="@+id/Vegetables"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Vegetables"/>
+    <!--                android:onClick="filterVegetables"/>-->
+
+                <Button
+                    android:id="@+id/Canned"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Canned Goods"/>
+    <!--                android:onClick="filterCanned"/>-->
+
+                <Button
+                    android:id="@+id/Dairy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Dairy"/>
+    <!--                android:onClick="filterDairy"/>-->
+
+                <Button
+                    android:id="@+id/Meat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Meat"/>
+    <!--                android:onClick="filterMeat"/>-->
+
+                <Button
+                    android:id="@+id/Seafood"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Seafood"/>
+    <!--                android:onClick="filterSeafood"/>-->
+
+                <Button
+                    android:id="@+id/Deli"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Deli"/>
+    <!--                android:onClick="filterDeli"/>-->
+
+                <Button
+                    android:id="@+id/Condiments"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Condiments"/>
+    <!--                android:onClick="filterCondiments"/>-->
+
+                <Button
+                    android:id="@+id/Snacks"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Snacks"/>
+    <!--                android:onClick="filterSnacks"/>-->
+
+                <Button
+                    android:id="@+id/Bakery"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Bakery"/>
+    <!--                android:onClick="filterBakery"/>-->
+
+                <Button
+                    android:id="@+id/Beverages"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Beverages"/>
+    <!--                android:onClick="filterBeverages"/>-->
+
+                <Button
+                    android:id="@+id/PRC"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Pasta, Rice and Cereal"/>
+    <!--                android:onClick="filterPRC"/>-->
+
+                <Button
+                    android:id="@+id/Frozen"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Frozen"/>
+    <!--                android:onClick="filterFrozen"/>-->
+
+                <Button
+                    android:id="@+id/PersonalCare"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Personal Care"/>
+    <!--                android:onClick="filterPersonalCare"/>-->
+
+            </LinearLayout>
+
+        </HorizontalScrollView>
 
     </LinearLayout>
 

From f6193637c2594c69cde5c943a18924331586d390 Mon Sep 17 00:00:00 2001
From: SIDDHANT SINGHAL <s8singha@uwaterloo.ca>
Date: Wed, 8 Mar 2023 18:50:42 -0500
Subject: [PATCH 06/36] Add Button send to top of search

---
 .../main/res/layout/item_list_fragment.xml    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index ee82a2da..63b58522 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -56,15 +56,6 @@
         app:layout_constraintStart_toEndOf="@+id/item_price"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <View
-        android:id="@+id/divider"
-        style="@style/Divider"
-        android:layout_marginTop="@dimen/margin_between_elements"
-        app:layout_constraintBottom_toTopOf="@+id/recyclerView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_quantity" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
@@ -78,13 +69,13 @@
         android:id="@+id/floatingActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/margin_between_elements"
-        android:layout_marginBottom="@dimen/margin_between_elements"
+        android:layout_marginEnd="4dp"
         android:contentDescription="@string/add_new_item"
         android:src="@android:drawable/ic_input_add"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:tint="@android:color/white" />
+        app:layout_constraintBottom_toTopOf="@+id/divider1"
+        app:tint="@android:color/white"
+        tools:layout_editor_absoluteY="518dp" />
 
     <View
         android:id="@+id/divider1"
@@ -100,10 +91,20 @@
         android:layout_height="wrap_content"
         android:scrollbars="vertical"
         android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/floatingActionButton"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/recyclerView">
+        app:layout_constraintTop_toBottomOf="@+id/floatingActionButton">
+
+        <View
+            android:id="@+id/divider2"
+            style="@style/Divider"
+            android:layout_marginTop="@dimen/margin_between_elements"
+            android:layout_marginBottom="@dimen/margin_between_elements"
+            app:layout_constraintBottom_toTopOf="@+id/SFContainerView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/grocerySearchView" />
 
         <androidx.appcompat.widget.SearchView
             android:layout_width="match_parent"

From 4a97b9f66787ece2666d940be03fb02417cb5a02 Mon Sep 17 00:00:00 2001
From: SIDDHANT SINGHAL <s8singha@uwaterloo.ca>
Date: Wed, 8 Mar 2023 18:53:24 -0500
Subject: [PATCH 07/36] Horizontal Padding added to Filter Buttons

---
 app/src/main/res/layout/item_list_fragment.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index 63b58522..50918b79 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -138,6 +138,7 @@
                     android:id="@+id/All"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="All"/>
     <!--                android:onClick="filterAll"/>-->
 
@@ -145,6 +146,7 @@
                     android:id="@+id/Fruits"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Fruits"/>
     <!--                android:onClick="filterFruits"/>-->
 
@@ -152,6 +154,7 @@
                     android:id="@+id/Vegetables"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Vegetables"/>
     <!--                android:onClick="filterVegetables"/>-->
 
@@ -159,6 +162,7 @@
                     android:id="@+id/Canned"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Canned Goods"/>
     <!--                android:onClick="filterCanned"/>-->
 
@@ -166,6 +170,7 @@
                     android:id="@+id/Dairy"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Dairy"/>
     <!--                android:onClick="filterDairy"/>-->
 
@@ -173,6 +178,7 @@
                     android:id="@+id/Meat"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Meat"/>
     <!--                android:onClick="filterMeat"/>-->
 
@@ -180,6 +186,7 @@
                     android:id="@+id/Seafood"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Seafood"/>
     <!--                android:onClick="filterSeafood"/>-->
 
@@ -187,6 +194,7 @@
                     android:id="@+id/Deli"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Deli"/>
     <!--                android:onClick="filterDeli"/>-->
 
@@ -194,6 +202,7 @@
                     android:id="@+id/Condiments"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Condiments"/>
     <!--                android:onClick="filterCondiments"/>-->
 
@@ -201,6 +210,7 @@
                     android:id="@+id/Snacks"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Snacks"/>
     <!--                android:onClick="filterSnacks"/>-->
 
@@ -208,6 +218,7 @@
                     android:id="@+id/Bakery"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Bakery"/>
     <!--                android:onClick="filterBakery"/>-->
 
@@ -215,6 +226,7 @@
                     android:id="@+id/Beverages"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Beverages"/>
     <!--                android:onClick="filterBeverages"/>-->
 
@@ -222,6 +234,7 @@
                     android:id="@+id/PRC"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Pasta, Rice and Cereal"/>
     <!--                android:onClick="filterPRC"/>-->
 
@@ -229,6 +242,7 @@
                     android:id="@+id/Frozen"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Frozen"/>
     <!--                android:onClick="filterFrozen"/>-->
 
@@ -236,6 +250,7 @@
                     android:id="@+id/PersonalCare"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
                     android:text="Personal Care"/>
     <!--                android:onClick="filterPersonalCare"/>-->
 

From 295aea90f3c2b37e3fd0786fb699da6a85aefe07 Mon Sep 17 00:00:00 2001
From: SIDDHANT SINGHAL <s8singha@uwaterloo.ca>
Date: Wed, 8 Mar 2023 19:18:27 -0500
Subject: [PATCH 08/36] Fixed Button Styling

---
 app/src/main/res/layout/item_list_fragment.xml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index 50918b79..32522239 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -63,7 +63,7 @@
         android:scrollbars="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider" />
+        app:layout_constraintTop_toBottomOf="@+id/item_quantity" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
@@ -74,8 +74,7 @@
         android:src="@android:drawable/ic_input_add"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/divider1"
-        app:tint="@android:color/white"
-        tools:layout_editor_absoluteY="518dp" />
+        app:tint="@android:color/white"/>
 
     <View
         android:id="@+id/divider1"
@@ -97,7 +96,7 @@
         app:layout_constraintTop_toBottomOf="@+id/floatingActionButton">
 
         <View
-            android:id="@+id/divider2"
+            android:id="@+id/divider3"
             style="@style/Divider"
             android:layout_marginTop="@dimen/margin_between_elements"
             android:layout_marginBottom="@dimen/margin_between_elements"
@@ -246,14 +245,6 @@
                     android:text="Frozen"/>
     <!--                android:onClick="filterFrozen"/>-->
 
-                <Button
-                    android:id="@+id/PersonalCare"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="10dp"
-                    android:text="Personal Care"/>
-    <!--                android:onClick="filterPersonalCare"/>-->
-
             </LinearLayout>
 
         </HorizontalScrollView>

From a10702d05b5a3736148dcd4099c0330c747d18c6 Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Thu, 9 Mar 2023 01:39:25 -0500
Subject: [PATCH 09/36] updated form and all screens to use food expiry
 information. fixed item_list_frag layout

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../com/example/inventory/AddItemFragment.kt  |  3 +-
 .../example/inventory/InventoryViewModel.kt   | 38 ++++++----
 .../example/inventory/ItemDetailFragment.kt   |  9 ++-
 .../com/example/inventory/ItemListAdapter.kt  |  6 +-
 .../java/com/example/inventory/data/Item.kt   | 10 +--
 .../inventory/data/ItemRoomDatabase.kt        |  2 +-
 app/src/main/res/layout/fragment_add_item.xml | 17 ++---
 .../main/res/layout/fragment_item_detail.xml  | 74 ++++++++++++++-----
 .../main/res/layout/item_list_fragment.xml    |  9 ++-
 app/src/main/res/layout/item_list_item.xml    |  8 +-
 app/src/main/res/values/strings.xml           |  2 +-
 12 files changed, 112 insertions(+), 68 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5d86cc63..249bca63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:name="com.example.inventory.InventoryApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="Food Expiry Tracker"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.InventoryApp">
diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 5e3db5da..a95af6b8 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -77,7 +77,8 @@ class AddItemFragment : Fragment() {
      * Binds views with the passed in [item] information.
      */
     private fun bind(item: Item) {
-        val price = "%.2f".format(item.itemPrice)
+        val price = item.itemPrice
+//        val price = "%.2f".format(item.itemPrice)
         binding.apply {
             itemName.setText(item.itemName, TextView.BufferType.SPANNABLE)
             itemPrice.setText(price, TextView.BufferType.SPANNABLE)
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index 0bb24269..65241470 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -37,9 +37,9 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Returns true if stock is available to sell, false otherwise.
      */
-    fun isStockAvailable(item: Item): Boolean {
-        return (item.quantityInStock > 0)
-    }
+//    fun isStockAvailable(item: Item): Boolean {
+//        return (item.quantityInStock > 0)
+//    }
 
     /**
      * Updates an existing Item in the database.
@@ -68,13 +68,13 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Decreases the stock by one unit and updates the database.
      */
-    fun sellItem(item: Item) {
-        if (item.quantityInStock > 0) {
-            // Decrease the quantity by 1
-            val newItem = item.copy(quantityInStock = item.quantityInStock - 1)
-            updateItem(newItem)
-        }
-    }
+//    fun sellItem(item: Item) {
+//        if (item.quantityInStock > 0) {
+//            // Decrease the quantity by 1
+//            val newItem = item.copy(quantityInStock = item.quantityInStock - 1)
+//            updateItem(newItem)
+//        }
+//    }
 
     /**
      * Inserts the new Item into database.
@@ -126,9 +126,12 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     private fun getNewItemEntry(itemName: String, itemPrice: String, itemCount: String, itemSum: String): Item {
         return Item(
             itemName = itemName,
-            itemPrice = itemPrice.toDouble(),
-            quantityInStock = itemCount.toInt(),
-            itemSum = itemSum.toInt()
+            itemPrice = itemPrice,
+            quantityInStock = itemCount,
+            itemSum = itemSum
+//            itemPrice = itemPrice.toDouble(),
+//            quantityInStock = itemCount.toInt(),
+//            itemSum = itemSum.toInt()
         )
     }
 
@@ -146,9 +149,12 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         return Item(
             id = itemId,
             itemName = itemName,
-            itemPrice = itemPrice.toDouble(),
-            quantityInStock = itemCount.toInt(),
-            itemSum = itemSum.toInt()
+            itemPrice = itemPrice,
+            quantityInStock = itemCount,
+            itemSum = itemSum
+//            itemPrice = itemPrice.toDouble(),
+//            quantityInStock = itemCount.toInt(),
+//            itemSum = itemSum.toInt()
         )
     }
 }
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index f54ba936..7ca828c4 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -25,7 +25,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.example.inventory.data.Item
-import com.example.inventory.data.getFormattedPrice
+//import com.example.inventory.data.getFormattedPrice
 import com.example.inventory.databinding.FragmentItemDetailBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
@@ -60,11 +60,12 @@ class ItemDetailFragment : Fragment() {
     private fun bind(item: Item) {
         binding.apply {
             itemName.text = item.itemName
-            itemPrice.text = item.getFormattedPrice()
+            itemPrice.text = item.itemPrice
+//            itemPrice.text = item.getFormattedPrice()
             itemCount.text = item.quantityInStock.toString()
             itemSum.text = item.itemSum.toString()
-            sellItem.isEnabled = viewModel.isStockAvailable(item)
-            sellItem.setOnClickListener { viewModel.sellItem(item) }
+//            sellItem.isEnabled = viewModel.isStockAvailable(item)
+//            sellItem.setOnClickListener { viewModel.sellItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
             editItem.setOnClickListener { editItem() }
         }
diff --git a/app/src/main/java/com/example/inventory/ItemListAdapter.kt b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
index 9a13d9fc..650a2361 100644
--- a/app/src/main/java/com/example/inventory/ItemListAdapter.kt
+++ b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
@@ -21,7 +21,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.example.inventory.data.Item
-import com.example.inventory.data.getFormattedPrice
+//import com.example.inventory.data.getFormattedPrice
 import com.example.inventory.databinding.ItemListItemBinding
 
 /**
@@ -54,9 +54,11 @@ class ItemListAdapter(private val onItemClicked: (Item) -> Unit) :
 
         fun bind(item: Item) {
             binding.itemName.text = item.itemName
-            binding.itemPrice.text = item.getFormattedPrice()
+            binding.itemPrice.text = item.itemPrice
+//            binding.itemPrice.text = item.getFormattedPrice()
             binding.itemQuantity.text = item.quantityInStock.toString()
             binding.itemSum.text = item.itemSum.toString()
+
         }
     }
 
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 79a694d7..b8fd1d63 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -30,14 +30,14 @@ data class Item(
     @ColumnInfo(name = "name")
     val itemName: String,
     @ColumnInfo(name = "price")
-    val itemPrice: Double,
+    val itemPrice: String,
     @ColumnInfo(name = "quantity")
-    val quantityInStock: Int,
+    val quantityInStock: String,
     @ColumnInfo(name = "sum")
-    val itemSum: Int,
+    val itemSum: String,
 )
 /**
  * Returns the passed in price in currency format.
  */
-fun Item.getFormattedPrice(): String =
-    NumberFormat.getCurrencyInstance().format(itemPrice)
\ No newline at end of file
+//fun Item.getFormattedPrice(): String =
+//    NumberFormat.getCurrencyInstance().format(itemPrice)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
index 96bbbff4..dda6d1ff 100644
--- a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
@@ -24,7 +24,7 @@ import androidx.room.RoomDatabase
 /**
  * Database class with a singleton INSTANCE object.
  */
-@Database(entities = [Item::class], version = 2, exportSchema = false)
+@Database(entities = [Item::class], version = 3, exportSchema = false)
 abstract class ItemRoomDatabase : RoomDatabase() {
 
     abstract fun itemDao(): ItemDao
diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
index 551a2f8f..a69c43be 100644
--- a/app/src/main/res/layout/fragment_add_item.xml
+++ b/app/src/main/res/layout/fragment_add_item.xml
@@ -29,7 +29,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
-            android:hint="@string/item_name_req"
+            android:hint="Ingredient Name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -48,17 +48,16 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
-            android:hint="@string/item_price_req"
+            android:hint="Expiry Date (YYYY-MM-DD)"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_name_label"
-            app:prefixText="@string/currency_symbol">
+            app:layout_constraintTop_toBottomOf="@+id/item_name_label">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/item_price"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:inputType="numberDecimal"
+                android:inputType="text"
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -67,7 +66,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
-            android:hint="@string/quantity_req"
+            android:hint="Enter a label"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/item_price_label">
@@ -76,7 +75,7 @@
                 android:id="@+id/item_count"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:inputType="number"
+                android:inputType="text"
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -85,7 +84,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
-            android:hint="Sum in Stock *"
+            android:hint="Owner"
             app:layout_constraintBottom_toTopOf="@+id/save_action"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -95,7 +94,7 @@
                 android:id="@+id/item_sum"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:inputType="number"
+                android:inputType="text"
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index 8eae0750..eaa1da9a 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -22,28 +22,51 @@
     android:layout_margin="@dimen/margin"
     tools:context=".ItemDetailFragment">
 
+    <TextView
+        android:id="@+id/item_name_label"
+        style="@style/Widget.Inventory.TextView"
+        android:layout_width="wrap_content"
+        android:text="Ingredient Name:"
+        app:layout_constraintBaseline_toBaselineOf="@+id/item_name"
+        app:layout_constraintEnd_toStartOf="@+id/item_name"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <TextView
         android:id="@+id/item_name"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/item_name_label"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Screwdrivers" />
+        android:layout_marginStart="@dimen/margin_between_elements"
+        tools:text="Apple" />
+
+    <TextView
+        android:id="@+id/item_price_label"
+        style="@style/Widget.Inventory.TextView"
+        android:layout_width="wrap_content"
+        android:text="Expiry Date:"
+        app:layout_constraintBaseline_toBaselineOf="@+id/item_price"
+        app:layout_constraintEnd_toStartOf="@+id/item_price"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/item_price"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
         android:layout_marginTop="@dimen/margin"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="@dimen/margin_between_elements"
+        app:layout_constraintStart_toEndOf="@+id/item_price_label"
         app:layout_constraintTop_toBottomOf="@+id/item_name"
-        tools:text="$5.50" />
+        tools:text="2000-12-11" />
 
     <TextView
         android:id="@+id/item_count_label"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
-        android:text="@string/quantity"
+        android:text="Labels:"
         app:layout_constraintBaseline_toBaselineOf="@+id/item_count"
         app:layout_constraintEnd_toStartOf="@+id/item_count"
         app:layout_constraintHorizontal_bias="0.5"
@@ -58,27 +81,38 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/item_count_label"
         app:layout_constraintTop_toBottomOf="@+id/item_price"
-        tools:text="5" />
+        tools:text="Fruit" />
+
+    <TextView
+        android:id="@+id/item_sum_label"
+        style="@style/Widget.Inventory.TextView"
+        android:layout_width="wrap_content"
+        android:text="Owner:"
+        app:layout_constraintBaseline_toBaselineOf="@+id/item_sum"
+        app:layout_constraintEnd_toStartOf="@+id/item_sum"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/item_sum"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="0dp"
+        android:layout_marginStart="@dimen/margin_between_elements"
         android:layout_marginTop="@dimen/margin"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_count_label"
-        tools:text="Item Sum" />
+        app:layout_constraintStart_toEndOf="@+id/item_sum_label"
+        app:layout_constraintTop_toBottomOf="@+id/item_count"
+        tools:text="Jack" />
 
-    <Button
-        android:id="@+id/sell_item"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin"
-        android:text="@string/sell"
-        app:layout_constraintBottom_toTopOf="@+id/delete_item"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_sum" />
+<!--    <Button-->
+<!--        android:id="@+id/sell_item"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginTop="@dimen/margin"-->
+<!--        android:text="@string/sell"-->
+<!--        app:layout_constraintBottom_toTopOf="@+id/delete_item"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/item_sum" />-->
 
     <Button
         android:id="@+id/delete_item"
@@ -89,7 +123,7 @@
         android:text="@string/delete"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sell_item" />
+        app:layout_constraintTop_toBottomOf="@+id/item_sum" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/edit_item"
diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index 3841adbf..07764b1e 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -26,7 +26,7 @@
         android:id="@+id/item_name"
         style="@style/Widget.Inventory.Header"
         android:layout_marginStart="@dimen/margin_between_elements"
-        android:text="@string/item"
+        android:text="Ingredient"
         app:layout_constraintEnd_toStartOf="@+id/item_price"
         app:layout_constraintHorizontal_weight="2"
         app:layout_constraintStart_toStartOf="parent"
@@ -37,7 +37,7 @@
         style="@style/Widget.Inventory.Header"
         android:layout_below="@+id/item_name"
         android:layout_marginStart="@dimen/margin_between_elements"
-        android:text="@string/price"
+        android:text="Expiry Date"
         android:textAlignment="center"
         app:layout_constraintEnd_toStartOf="@+id/item_sum"
         app:layout_constraintHorizontal_weight="1"
@@ -49,7 +49,7 @@
         style="@style/Widget.Inventory.Header"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="@dimen/margin_between_elements"
-        android:text="Sum in Stock"
+        android:text="Labels"
         android:textAlignment="center"
         app:layout_constraintEnd_toStartOf="@+id/item_quantity"
         app:layout_constraintHorizontal_weight="1"
@@ -60,8 +60,9 @@
         android:id="@+id/item_quantity"
         style="@style/Widget.Inventory.Header"
         android:layout_alignParentEnd="true"
+        android:layout_marginStart="@dimen/margin_between_elements"
         android:layout_marginEnd="@dimen/margin_between_elements"
-        android:text="@string/quantity_in_stock"
+        android:text="Owner"
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
diff --git a/app/src/main/res/layout/item_list_item.xml b/app/src/main/res/layout/item_list_item.xml
index c7d7cb9f..713b76cd 100644
--- a/app/src/main/res/layout/item_list_item.xml
+++ b/app/src/main/res/layout/item_list_item.xml
@@ -30,7 +30,7 @@
         app:layout_constraintEnd_toStartOf="@+id/item_price"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Cogs" />
+        tools:text="Apple" />
 
     <TextView
         android:id="@+id/item_price"
@@ -44,7 +44,7 @@
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_name"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="$4.99" />
+        tools:text="2000-12-10" />
 
     <TextView
         android:id="@+id/item_sum"
@@ -57,7 +57,7 @@
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_price"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="15" />
+        tools:text="Fruit" />
 
     <TextView
         android:id="@+id/item_quantity"
@@ -70,6 +70,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="3" />
+        tools:text="Jack" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d165e9f5..55f1841a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 <resources>
-    <string name="app_name">Inventory</string>
+    <string name="app_name">Food Expiry Tracker</string>
     <string name="sell">Sell</string>
     <string name="quantity">Quantity in Stock:</string>
     <string name="quantity_req">Quantity in Stock <font color='#FF0000'>*</font></string>

From 1a98ee57a8f0c6dc6d77c9701b14d4e75f537836 Mon Sep 17 00:00:00 2001
From: FaizaanRehman <FaizaanRehman@users.noreply.github.com>
Date: Thu, 9 Mar 2023 13:25:46 -0500
Subject: [PATCH 10/36] Added push notification button on details page

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../example/inventory/ItemDetailFragment.kt   | 28 +++++++++++++++++
 .../com/example/inventory/MainActivity.kt     | 31 +++++++++++++++++++
 .../main/res/drawable/ic_notifications.xml    |  5 +++
 .../main/res/layout/fragment_item_detail.xml  | 11 +++++++
 app/src/main/res/values/strings.xml           |  5 +++
 6 files changed, 81 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_notifications.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5d86cc63..469686da 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <application
         android:name="com.example.inventory.InventoryApplication"
         android:allowBackup="true"
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index 9264b290..1782a4e1 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -16,10 +16,15 @@
 
 package com.example.inventory
 
+import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.app.ActivityCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
@@ -45,6 +50,8 @@ class ItemDetailFragment : Fragment() {
     private var _binding: FragmentItemDetailBinding? = null
     private val binding get() = _binding!!
 
+    private var notificationId: Int = 0
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -65,6 +72,7 @@ class ItemDetailFragment : Fragment() {
             sellItem.isEnabled = viewModel.isStockAvailable(item)
             sellItem.setOnClickListener { viewModel.sellItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
+            sendNotification.setOnClickListener { sendNotification() }
             editItem.setOnClickListener { editItem() }
         }
     }
@@ -103,6 +111,26 @@ class ItemDetailFragment : Fragment() {
         findNavController().navigateUp()
     }
 
+    /**
+     * Sends a push notification to inform the user of the expiry date
+     */
+    private fun sendNotification() {
+        if (ContextCompat.checkSelfPermission(this@ItemDetailFragment.requireContext(), android.Manifest.permission.POST_NOTIFICATIONS ) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this@ItemDetailFragment.requireActivity(),arrayOf(android.Manifest.permission.POST_NOTIFICATIONS), 1)
+        } else {
+            val builder = NotificationCompat.Builder(this.requireContext(), MainActivity.CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_notifications)
+                .setContentTitle(getString(R.string.expiring_soon))
+                .setContentText(getString(R.string.expiration_message, item.itemName, 5))
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+
+            with(NotificationManagerCompat.from(this.requireContext())) {
+                // notificationId is a unique int for each notification that you must define
+                notify(notificationId++, builder.build())
+            }
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val id = navigationArgs.itemId
diff --git a/app/src/main/java/com/example/inventory/MainActivity.kt b/app/src/main/java/com/example/inventory/MainActivity.kt
index a70a3a36..0ee9bed7 100644
--- a/app/src/main/java/com/example/inventory/MainActivity.kt
+++ b/app/src/main/java/com/example/inventory/MainActivity.kt
@@ -15,6 +15,10 @@
  */
 package com.example.inventory
 
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
@@ -23,6 +27,10 @@ import androidx.navigation.ui.NavigationUI.setupActionBarWithNavController
 
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
 
+    companion object {
+        const val CHANNEL_ID: String = "Expirations"
+    }
+
     private lateinit var navController: NavController
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -34,6 +42,9 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
         navController = navHostFragment.navController
         // Set up the action bar for use with the NavController
         setupActionBarWithNavController(this, navController)
+
+        // Set up notifications channel
+        createNotificationChannel()
     }
 
     /**
@@ -42,4 +53,24 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
     override fun onSupportNavigateUp(): Boolean {
         return navController.navigateUp() || super.onSupportNavigateUp()
     }
+
+    /**
+     * Setup notification channel
+     */
+    private fun createNotificationChannel() {
+        // Create the NotificationChannel, but only on API 26+ because
+        // the NotificationChannel class is new and not in the support library
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val name = getString(R.string.channel_name)
+            val descriptionText = getString(R.string.channel_description)
+            val importance = NotificationManager.IMPORTANCE_DEFAULT
+            val channel = NotificationChannel(CHANNEL_ID, name, importance).apply {
+                description = descriptionText
+            }
+            // Register the channel with the system
+            val notificationManager: NotificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.createNotificationChannel(channel)
+        }
+    }
+
 }
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
new file mode 100644
index 00000000..1d038a44
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index c6a48052..9ed08a64 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -78,10 +78,21 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin"
         android:text="@string/delete"
+        app:layout_constraintBottom_toTopOf="@+id/send_notification"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/sell_item" />
 
+    <Button
+        android:id="@+id/send_notification"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin"
+        android:text="@string/notify"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/delete_item" />
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/edit_item"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 37db6639..0a839624 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,4 +34,9 @@
     <string name="currency_symbol">$</string>
     <string name="edit_item">Edit Item</string>
     <string name="add_new_item">Add new item</string>
+    <string name="notify">Notify</string>
+    <string name="channel_name">Expirations</string>
+    <string name="channel_description">Notification channel for ingredient expiry messages</string>
+    <string name="expiring_soon">Expiring Soon</string>
+    <string name="expiration_message">%1$s expires in %2$d days</string>
 </resources>
\ No newline at end of file

From db102f647ac390555951f3ce9761c5a34784ed8b Mon Sep 17 00:00:00 2001
From: epheitea <ephei@outlook.com>
Date: Fri, 10 Mar 2023 03:32:21 +0700
Subject: [PATCH 11/36] Minimal implementation of image mock

---
 .../com/example/inventory/AddItemFragment.kt  |  7 ++++
 .../inventory/data/ItemRoomDatabase.kt        |  2 +-
 .../res/drawable/baseline_image_search_24.xml |  5 +++
 app/src/main/res/layout/fragment_add_item.xml | 39 ++++++++++++-------
 .../main/res/layout/fragment_item_detail.xml  | 24 ++++++------
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 53 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_image_search_24.xml

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index a95af6b8..1a18a759 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -131,15 +131,22 @@ class AddItemFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val id = navigationArgs.itemId
+        // Protocol for editing an existing item
         if (id > 0) {
             viewModel.retrieveItem(id).observe(this.viewLifecycleOwner) { selectedItem ->
                 item = selectedItem
                 bind(item)
             }
+            binding.imageView.visibility = View.VISIBLE
+
+            // Protocol for adding a new item
         } else {
             binding.saveAction.setOnClickListener {
                 addNewItem()
             }
+            binding.uploadPhoto.setOnClickListener{
+                binding.imageView.visibility = View.VISIBLE
+            }
         }
     }
 
diff --git a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
index dda6d1ff..17dbe4e5 100644
--- a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
@@ -24,7 +24,7 @@ import androidx.room.RoomDatabase
 /**
  * Database class with a singleton INSTANCE object.
  */
-@Database(entities = [Item::class], version = 3, exportSchema = false)
+@Database(entities = [Item::class], version = 4, exportSchema = false)
 abstract class ItemRoomDatabase : RoomDatabase() {
 
     abstract fun itemDao(): ItemDao
diff --git a/app/src/main/res/drawable/baseline_image_search_24.xml b/app/src/main/res/drawable/baseline_image_search_24.xml
new file mode 100644
index 00000000..d797b739
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_image_search_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,13v7L4,20L4,6h5.02c0.05,-0.71 0.22,-1.38 0.48,-2L4,4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-5l-2,-2zM16.5,18h-11l2.75,-3.53 1.96,2.36 2.75,-3.54zM19.3,8.89c0.44,-0.7 0.7,-1.51 0.7,-2.39C20,4.01 17.99,2 15.5,2S11,4.01 11,6.5s2.01,4.5 4.49,4.5c0.88,0 1.7,-0.26 2.39,-0.7L21,13.42 22.42,12 19.3,8.89zM15.5,9C14.12,9 13,7.88 13,6.5S14.12,4 15.5,4 18,5.12 18,6.5 16.88,9 15.5,9z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
index a69c43be..42e74d43 100644
--- a/app/src/main/res/layout/fragment_add_item.xml
+++ b/app/src/main/res/layout/fragment_add_item.xml
@@ -85,7 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
             android:hint="Owner"
-            app:layout_constraintBottom_toTopOf="@+id/save_action"
+            app:layout_constraintBottom_toTopOf="@+id/imageView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/item_count_label">
@@ -98,18 +98,31 @@
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_marginTop="48dp"
+            android:layout_marginBottom="48dp"
+            app:layout_constraintBottom_toTopOf="@+id/upload_photo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/item_sum_label"
+            app:layout_constraintVertical_bias="0.0"
+            android:visibility="gone"
+            app:srcCompat="@drawable/baseline_image_search_24" />
 
-<!--        <Spinner-->
-<!--            android:id="@+id/label_spinner"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginTop="@dimen/margin"-->
-<!--            android:spinnerMode="dialog"-->
-<!--            android:prompt="@string/select_label"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@+id/item_count_label"/>-->
-
+        <Button
+            android:id="@+id/upload_photo"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin"
+            android:text="@string/upload"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/imageView" />
 
         <Button
             android:id="@+id/save_action"
@@ -119,7 +132,7 @@
             android:text="@string/save_action"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_sum_label" />
+            app:layout_constraintTop_toBottomOf="@+id/upload_photo" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index eaa1da9a..280d204d 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -103,16 +103,18 @@
         app:layout_constraintTop_toBottomOf="@+id/item_count"
         tools:text="Jack" />
 
-<!--    <Button-->
-<!--        android:id="@+id/sell_item"-->
-<!--        android:layout_width="0dp"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginTop="@dimen/margin"-->
-<!--        android:text="@string/sell"-->
-<!--        app:layout_constraintBottom_toTopOf="@+id/delete_item"-->
-<!--        app:layout_constraintEnd_toEndOf="parent"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        app:layout_constraintTop_toBottomOf="@+id/item_sum" />-->
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:layout_marginTop="48dp"
+        app:layout_constraintBottom_toTopOf="@+id/delete_item"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/item_count"
+        app:layout_constraintVertical_bias="0.0"
+        app:srcCompat="@drawable/baseline_image_search_24" />
 
     <Button
         android:id="@+id/delete_item"
@@ -123,7 +125,7 @@
         android:text="@string/delete"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_sum" />
+        app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/edit_item"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55f1841a..1bba39d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,4 +35,5 @@
     <string name="edit_item">Edit Item</string>
     <string name="add_new_item">Add new item</string>
     <string name="select_label">Select Label</string>
+    <string name="upload">Upload Photo</string>
 </resources>
\ No newline at end of file

From 81b901fdbfba344507a866e546a51b3de2466814 Mon Sep 17 00:00:00 2001
From: FaizaanRehman <FaizaanRehman@users.noreply.github.com>
Date: Thu, 9 Mar 2023 16:01:16 -0500
Subject: [PATCH 12/36] Added new fields to Database schema

---
 .../java/com/example/inventory/data/Item.kt     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index b8fd1d63..32353215 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -18,7 +18,6 @@ package com.example.inventory.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.text.NumberFormat
 
 /**
  * Entity data class represents a single row in the database.
@@ -27,7 +26,7 @@ import java.text.NumberFormat
 data class Item(
     @PrimaryKey(autoGenerate = true)
     val id: Int = 0,
-    @ColumnInfo(name = "name")
+    @ColumnInfo(name = "itemName")
     val itemName: String,
     @ColumnInfo(name = "price")
     val itemPrice: String,
@@ -35,6 +34,20 @@ data class Item(
     val quantityInStock: String,
     @ColumnInfo(name = "sum")
     val itemSum: String,
+    @ColumnInfo(name = "name", defaultValue = "Apple")
+    val name: String = "Apple",
+    @ColumnInfo(name = "expiryDate", defaultValue = "1680291840000" /* default = March 31 2023*/)
+    val expiryDate: Long = 1680291840000,
+    @ColumnInfo(name = "label", defaultValue = "")
+    val label: String = "",
+    @ColumnInfo(name = "image", defaultValue = "")
+    val imagePath: String = "",
+    @ColumnInfo(name = "discarded", defaultValue = false.toString())
+    val discarded: Boolean = false,
+    @ColumnInfo(name = "addedOn", defaultValue = "1678394640000" /* default = March 1 2023*/)
+    val addedOn: Long = 1678394640000,
+    @ColumnInfo(name = "updatedOn", defaultValue = "1678394640000" /* default = March 1 2023*/)
+    val updatedOn: Long = 1678394640000,
 )
 /**
  * Returns the passed in price in currency format.

From e6e2726377eadbdee9abb1bd3ad73a53cc5f0445 Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Thu, 9 Mar 2023 17:27:04 -0500
Subject: [PATCH 13/36] Fixed ordering of Labels and Owner fields in homepage
 UI

---
 app/src/main/res/layout/item_list_fragment.xml | 10 +++++-----
 app/src/main/res/layout/item_list_item.xml     |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index a1f954de..2dac68f3 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -39,25 +39,25 @@
         android:layout_marginStart="@dimen/margin_between_elements"
         android:text="Expiry Date"
         android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_sum"
+        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_name"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/item_sum"
+        android:id="@+id/item_quantity"
         style="@style/Widget.Inventory.Header"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="@dimen/margin_between_elements"
         android:text="Labels"
         android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
+        app:layout_constraintEnd_toStartOf="@+id/item_sum"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_price"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/item_quantity"
+        android:id="@+id/item_sum"
         style="@style/Widget.Inventory.Header"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="@dimen/margin_between_elements"
@@ -66,7 +66,7 @@
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@+id/item_sum"
+        app:layout_constraintStart_toEndOf="@+id/item_quantity"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/item_list_item.xml b/app/src/main/res/layout/item_list_item.xml
index 713b76cd..da55c8a8 100644
--- a/app/src/main/res/layout/item_list_item.xml
+++ b/app/src/main/res/layout/item_list_item.xml
@@ -40,27 +40,27 @@
         android:layout_marginStart="@dimen/margin_between_elements"
         android:fontFamily="sans-serif-medium"
         android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_sum"
+        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_name"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="2000-12-10" />
 
     <TextView
-        android:id="@+id/item_sum"
+        android:id="@+id/item_quantity"
         style="@style/Widget.Inventory.ListItemTextView"
         android:layout_width="100dp"
         android:layout_marginStart="@dimen/margin_between_elements"
         android:fontFamily="sans-serif-medium"
         android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
+        app:layout_constraintEnd_toStartOf="@+id/item_sum"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_price"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Fruit" />
 
     <TextView
-        android:id="@+id/item_quantity"
+        android:id="@+id/item_sum"
         style="@style/Widget.Inventory.ListItemTextView"
         android:layout_width="80dp"
         android:layout_alignParentEnd="true"

From bda7ecd14d04b9aaeeb4b525afa353ebc1101205 Mon Sep 17 00:00:00 2001
From: epheitea <ephei@outlook.com>
Date: Sat, 11 Mar 2023 09:05:31 +0700
Subject: [PATCH 14/36] Added file upload, need help persisting images

---
 .../com/example/inventory/AddItemFragment.kt  | 32 ++++++++++++++++---
 .../example/inventory/InventoryViewModel.kt   | 28 ++++++++++++----
 .../example/inventory/ItemDetailFragment.kt   |  2 ++
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 1a18a759..7a93d600 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -15,8 +15,13 @@
  */
 package com.example.inventory
 
+import android.app.Activity.RESULT_OK
 import android.content.Context.INPUT_METHOD_SERVICE
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
+import android.provider.MediaStore
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -52,6 +57,10 @@ class AddItemFragment : Fragment() {
     private var _binding: FragmentAddItemBinding? = null
     private val binding get() = _binding!!
 
+    // For file upload
+    private val pickImage = 100
+    private var imagePath: Uri? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -85,7 +94,9 @@ class AddItemFragment : Fragment() {
             itemCount.setText(item.quantityInStock.toString(), TextView.BufferType.SPANNABLE)
             itemSum.setText(item.itemSum.toString(), TextView.BufferType.SPANNABLE)
             saveAction.setOnClickListener { updateItem() }
+            binding.imageView.setImageURI(Uri.parse(item.imagePath))
         }
+        binding.imageView.visibility = View.VISIBLE
     }
 
     /**
@@ -98,6 +109,7 @@ class AddItemFragment : Fragment() {
                 binding.itemPrice.text.toString(),
                 binding.itemCount.text.toString(),
                 binding.itemSum.text.toString(),
+                imagePath.toString()
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
             findNavController().navigate(action)
@@ -114,13 +126,23 @@ class AddItemFragment : Fragment() {
                 this.binding.itemName.text.toString(),
                 this.binding.itemPrice.text.toString(),
                 this.binding.itemCount.text.toString(),
-                this.binding.itemSum.text.toString()
+                this.binding.itemSum.text.toString(),
+                this.imagePath.toString(),
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
             findNavController().navigate(action)
         }
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == RESULT_OK && requestCode == pickImage) {
+            imagePath = data?.data
+            binding.imageView.setImageURI(imagePath)
+            binding.imageView.visibility = View.VISIBLE
+        }
+    }
+
     /**
      * Called when the view is created.
      * The itemId Navigation argument determines the edit item  or add new item.
@@ -137,16 +159,16 @@ class AddItemFragment : Fragment() {
                 item = selectedItem
                 bind(item)
             }
-            binding.imageView.visibility = View.VISIBLE
 
             // Protocol for adding a new item
         } else {
             binding.saveAction.setOnClickListener {
                 addNewItem()
             }
-            binding.uploadPhoto.setOnClickListener{
-                binding.imageView.visibility = View.VISIBLE
-            }
+        }
+        binding.uploadPhoto.setOnClickListener{
+            val gallery = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI)
+            startActivityForResult(gallery, pickImage)
         }
     }
 
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index 65241470..e560e491 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -50,8 +50,9 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         itemPrice: String,
         itemCount: String,
         itemSum: String,
+        imagePath: String,
     ) {
-        val updatedItem = getUpdatedItemEntry(itemId, itemName, itemPrice, itemCount, itemSum)
+        val updatedItem = getUpdatedItemEntry(itemId, itemName, itemPrice, itemCount, itemSum, imagePath)
         updateItem(updatedItem)
     }
 
@@ -79,8 +80,14 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Inserts the new Item into database.
      */
-    fun addNewItem(itemName: String, itemPrice: String, itemCount: String, itemSum: String) {
-        val newItem = getNewItemEntry(itemName, itemPrice, itemCount, itemSum)
+    fun addNewItem(
+        itemName: String,
+        itemPrice: String,
+        itemCount: String,
+        itemSum: String,
+        imagePath: String,
+    ) {
+        val newItem = getNewItemEntry(itemName, itemPrice, itemCount, itemSum, imagePath)
         insertItem(newItem)
     }
 
@@ -123,12 +130,19 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
      * Returns an instance of the [Item] entity class with the item info entered by the user.
      * This will be used to add a new entry to the Inventory database.
      */
-    private fun getNewItemEntry(itemName: String, itemPrice: String, itemCount: String, itemSum: String): Item {
+    private fun getNewItemEntry(
+        itemName: String,
+        itemPrice: String,
+        itemCount: String,
+        itemSum: String,
+        imagePath: String,
+    ): Item {
         return Item(
             itemName = itemName,
             itemPrice = itemPrice,
             quantityInStock = itemCount,
-            itemSum = itemSum
+            itemSum = itemSum,
+            imagePath = imagePath
 //            itemPrice = itemPrice.toDouble(),
 //            quantityInStock = itemCount.toInt(),
 //            itemSum = itemSum.toInt()
@@ -145,13 +159,15 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         itemPrice: String,
         itemCount: String,
         itemSum: String,
+        imagePath: String
     ): Item {
         return Item(
             id = itemId,
             itemName = itemName,
             itemPrice = itemPrice,
             quantityInStock = itemCount,
-            itemSum = itemSum
+            itemSum = itemSum,
+            imagePath = imagePath
 //            itemPrice = itemPrice.toDouble(),
 //            quantityInStock = itemCount.toInt(),
 //            itemSum = itemSum.toInt()
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index 93cda5c7..69d03491 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -17,6 +17,7 @@
 package com.example.inventory
 
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -76,6 +77,7 @@ class ItemDetailFragment : Fragment() {
             deleteItem.setOnClickListener { showConfirmationDialog() }
             sendNotification.setOnClickListener { sendNotification() }
             editItem.setOnClickListener { editItem() }
+            imageView.setImageURI(Uri.parse(item.imagePath))
         }
     }
 

From 43ae83209ed0c3b5071cb8ca5050c6a462cd5b02 Mon Sep 17 00:00:00 2001
From: FaizaanRehman <FaizaanRehman@users.noreply.github.com>
Date: Sat, 11 Mar 2023 12:04:50 -0500
Subject: [PATCH 15/36] Updated layout of columns and alignment on main page

---
 .../com/example/inventory/ItemListAdapter.kt  |  4 -
 .../main/res/layout/item_list_fragment.xml    | 38 +++-----
 app/src/main/res/layout/item_list_item.xml    | 86 ++++++++-----------
 app/src/main/res/values/strings.xml           |  2 +
 4 files changed, 48 insertions(+), 82 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/ItemListAdapter.kt b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
index 650a2361..1262f009 100644
--- a/app/src/main/java/com/example/inventory/ItemListAdapter.kt
+++ b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
@@ -55,10 +55,6 @@ class ItemListAdapter(private val onItemClicked: (Item) -> Unit) :
         fun bind(item: Item) {
             binding.itemName.text = item.itemName
             binding.itemPrice.text = item.itemPrice
-//            binding.itemPrice.text = item.getFormattedPrice()
-            binding.itemQuantity.text = item.quantityInStock.toString()
-            binding.itemSum.text = item.itemSum.toString()
-
         }
     }
 
diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index 2dac68f3..d58e5077 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -26,7 +26,7 @@
         android:id="@+id/item_name"
         style="@style/Widget.Inventory.Header"
         android:layout_marginStart="@dimen/margin_between_elements"
-        android:text="Ingredient"
+        android:text="@string/ingredient"
         app:layout_constraintEnd_toStartOf="@+id/item_price"
         app:layout_constraintHorizontal_weight="2"
         app:layout_constraintStart_toStartOf="parent"
@@ -37,46 +37,30 @@
         style="@style/Widget.Inventory.Header"
         android:layout_below="@+id/item_name"
         android:layout_marginStart="@dimen/margin_between_elements"
-        android:text="Expiry Date"
+        android:text="@string/expiry_date"
         android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toEndOf="@+id/item_name"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/item_quantity"
-        style="@style/Widget.Inventory.Header"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/margin_between_elements"
-        android:text="Labels"
-        android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_sum"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@+id/item_price"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/item_sum"
-        style="@style/Widget.Inventory.Header"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="@dimen/margin_between_elements"
-        android:layout_marginEnd="@dimen/margin_between_elements"
-        android:text="Owner"
-        android:textAlignment="center"
+    <View
+        android:id="@+id/divider"
+        style="@style/Divider"
+        app:layout_constraintBottom_toTopOf="@+id/recyclerView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@+id/item_quantity"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/item_name" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_between_elements"
         android:scrollbars="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_quantity" />
+        app:layout_constraintTop_toBottomOf="@+id/item_price" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
diff --git a/app/src/main/res/layout/item_list_item.xml b/app/src/main/res/layout/item_list_item.xml
index da55c8a8..39483ba1 100644
--- a/app/src/main/res/layout/item_list_item.xml
+++ b/app/src/main/res/layout/item_list_item.xml
@@ -14,62 +14,46 @@
   ~ limitations under the License.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:descendantFocusability="blocksDescendants">
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="2dp"
+    app:cardElevation="2dp"
+    app:cardUseCompatPadding="true" >
 
-    <TextView
-        android:id="@+id/item_name"
-        style="@style/Widget.Inventory.ListItemTextView"
-        android:layout_width="wrap_content"
-        android:fontFamily="sans-serif"
-        app:layout_constraintEnd_toStartOf="@+id/item_price"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Apple" />
 
-    <TextView
-        android:id="@+id/item_price"
-        style="@style/Widget.Inventory.ListItemTextView"
-        android:layout_width="100dp"
-        android:layout_below="@+id/item_name"
-        android:layout_marginStart="@dimen/margin_between_elements"
-        android:fontFamily="sans-serif-medium"
-        android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_quantity"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@+id/item_name"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="2000-12-10" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:descendantFocusability="blocksDescendants">
 
-    <TextView
-        android:id="@+id/item_quantity"
-        style="@style/Widget.Inventory.ListItemTextView"
-        android:layout_width="100dp"
-        android:layout_marginStart="@dimen/margin_between_elements"
-        android:fontFamily="sans-serif-medium"
-        android:textAlignment="center"
-        app:layout_constraintEnd_toStartOf="@+id/item_sum"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@+id/item_price"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Fruit" />
 
-    <TextView
-        android:id="@+id/item_sum"
-        style="@style/Widget.Inventory.ListItemTextView"
-        android:layout_width="80dp"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="@dimen/margin_between_elements"
-        android:fontFamily="sans-serif-medium"
-        android:textAlignment="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Jack" />
+        <TextView
+            android:id="@+id/item_name"
+            style="@style/Widget.Inventory.ListItemTextView"
+            android:layout_width="255dp"
+            android:layout_marginStart="@dimen/margin_between_elements"
+            android:fontFamily="sans-serif"
+            app:layout_constraintEnd_toStartOf="@+id/item_price"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Apple" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/item_price"
+            style="@style/Widget.Inventory.ListItemTextView"
+            android:layout_width="100dp"
+            android:layout_below="@+id/item_name"
+            android:layout_marginEnd="@dimen/margin_between_elements"
+            android:fontFamily="sans-serif-medium"
+            android:textAlignment="textEnd"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/item_name"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="2000-12-10" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 53feef4a..6a906e7d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,4 +41,6 @@
     <string name="channel_description">Notification channel for ingredient expiry messages</string>
     <string name="expiring_soon">Expiring Soon</string>
     <string name="expiration_message">%1$s expires in %2$d days</string>
+    <string name="ingredient">Ingredient</string>
+    <string name="expiry_date">Expiry Date</string>
 </resources>
\ No newline at end of file

From b97fc01abd2a2f35ce574b55d12e0f4d39550e38 Mon Sep 17 00:00:00 2001
From: Benjamin Luo <59003755+BenjaminLuo@users.noreply.github.com>
Date: Mon, 13 Mar 2023 08:14:45 +0800
Subject: [PATCH 16/36] Update AddItemFragment.kt

Added comment to clarify functionality of file upload function
---
 app/src/main/java/com/example/inventory/AddItemFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 7a93d600..bb176e52 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -134,6 +134,7 @@ class AddItemFragment : Fragment() {
         }
     }
 
+    // File upload: Stores the image the user selects from their gallery into the 'imagePath' variable
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == pickImage) {

From b23dbf2642179067e8185dc2b02afbed6ae41e4e Mon Sep 17 00:00:00 2001
From: tayyaab t <tayyaabtanveer@gmail.com>
Date: Sun, 12 Mar 2023 22:42:37 -0400
Subject: [PATCH 17/36] renaming db attributes throughout app

---
 .../com/example/inventory/AddItemFragment.kt  | 34 +++++-----
 .../example/inventory/InventoryViewModel.kt   | 62 +++++++++----------
 .../example/inventory/ItemDetailFragment.kt   | 11 ++--
 .../com/example/inventory/ItemListAdapter.kt  |  6 +-
 .../java/com/example/inventory/data/Item.kt   | 10 +--
 app/src/main/res/layout/fragment_add_item.xml | 26 ++++----
 .../main/res/layout/fragment_item_detail.xml  | 50 +++++++--------
 .../main/res/layout/item_list_fragment.xml    | 14 ++---
 app/src/main/res/layout/item_list_item.xml    | 10 +--
 9 files changed, 104 insertions(+), 119 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index bb176e52..7075883d 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -75,10 +75,10 @@ class AddItemFragment : Fragment() {
      */
     private fun isEntryValid(): Boolean {
         return viewModel.isEntryValid(
-            binding.itemName.text.toString(),
-            binding.itemPrice.text.toString(),
-            binding.itemCount.text.toString(),
-            binding.itemSum.text.toString(),
+            binding.name.text.toString(),
+            binding.expiryDate.text.toString(),
+            binding.label.text.toString(),
+            binding.quantity.text.toString(),
         )
     }
 
@@ -86,13 +86,11 @@ class AddItemFragment : Fragment() {
      * Binds views with the passed in [item] information.
      */
     private fun bind(item: Item) {
-        val price = item.itemPrice
-//        val price = "%.2f".format(item.itemPrice)
         binding.apply {
-            itemName.setText(item.itemName, TextView.BufferType.SPANNABLE)
-            itemPrice.setText(price, TextView.BufferType.SPANNABLE)
-            itemCount.setText(item.quantityInStock.toString(), TextView.BufferType.SPANNABLE)
-            itemSum.setText(item.itemSum.toString(), TextView.BufferType.SPANNABLE)
+            name.setText(item.name, TextView.BufferType.SPANNABLE)
+            expiryDate.setText(item.expiryDate, TextView.BufferType.SPANNABLE)
+            label.setText(item.label.toString(), TextView.BufferType.SPANNABLE)
+            quantity.setText(item.quantity.toString(), TextView.BufferType.SPANNABLE)
             saveAction.setOnClickListener { updateItem() }
             binding.imageView.setImageURI(Uri.parse(item.imagePath))
         }
@@ -105,10 +103,10 @@ class AddItemFragment : Fragment() {
     private fun addNewItem() {
         if (isEntryValid()) {
             viewModel.addNewItem(
-                binding.itemName.text.toString(),
-                binding.itemPrice.text.toString(),
-                binding.itemCount.text.toString(),
-                binding.itemSum.text.toString(),
+                binding.name.text.toString(),
+                binding.expiryDate.text.toString(),
+                binding.label.text.toString(),
+                binding.quantity.text.toString(),
                 imagePath.toString()
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
@@ -123,10 +121,10 @@ class AddItemFragment : Fragment() {
         if (isEntryValid()) {
             viewModel.updateItem(
                 this.navigationArgs.itemId,
-                this.binding.itemName.text.toString(),
-                this.binding.itemPrice.text.toString(),
-                this.binding.itemCount.text.toString(),
-                this.binding.itemSum.text.toString(),
+                this.binding.name.text.toString(),
+                this.binding.expiryDate.text.toString(),
+                this.binding.label.text.toString(),
+                this.binding.quantity.text.toString(),
                 this.imagePath.toString(),
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index e560e491..8b172cd5 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -46,13 +46,13 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
      */
     fun updateItem(
         itemId: Int,
-        itemName: String,
-        itemPrice: String,
-        itemCount: String,
-        itemSum: String,
+        name: String,
+        expiryDate: String,
+        label: String,
+        quantity: String,
         imagePath: String,
     ) {
-        val updatedItem = getUpdatedItemEntry(itemId, itemName, itemPrice, itemCount, itemSum, imagePath)
+        val updatedItem = getUpdatedItemEntry(itemId, name, expiryDate, label, quantity, imagePath)
         updateItem(updatedItem)
     }
 
@@ -81,13 +81,13 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
      * Inserts the new Item into database.
      */
     fun addNewItem(
-        itemName: String,
-        itemPrice: String,
-        itemCount: String,
-        itemSum: String,
+        name: String,
+        expiryDate: String,
+        label: String,
+        quantity: String,
         imagePath: String,
     ) {
-        val newItem = getNewItemEntry(itemName, itemPrice, itemCount, itemSum, imagePath)
+        val newItem = getNewItemEntry(name, expiryDate, label, quantity, imagePath)
         insertItem(newItem)
     }
 
@@ -119,8 +119,8 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Returns true if the EditTexts are not empty
      */
-    fun isEntryValid(itemName: String, itemPrice: String, itemCount: String, itemSum: String): Boolean {
-        if (itemName.isBlank() || itemPrice.isBlank() || itemCount.isBlank() || itemSum.isBlank()) {
+    fun isEntryValid(name: String, expiryDate: String, label: String, quantity: String): Boolean {
+        if (name.isBlank() || expiryDate.isBlank() || label.isBlank() || quantity.isBlank()) {
             return false
         }
         return true
@@ -131,21 +131,18 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
      * This will be used to add a new entry to the Inventory database.
      */
     private fun getNewItemEntry(
-        itemName: String,
-        itemPrice: String,
-        itemCount: String,
-        itemSum: String,
+        name: String,
+        expiryDate: String,
+        label: String,
+        quantity: String,
         imagePath: String,
     ): Item {
         return Item(
-            itemName = itemName,
-            itemPrice = itemPrice,
-            quantityInStock = itemCount,
-            itemSum = itemSum,
+            name = name,
+            expiryDate = expiryDate,
+            label = label,
+            quantity = quantity,
             imagePath = imagePath
-//            itemPrice = itemPrice.toDouble(),
-//            quantityInStock = itemCount.toInt(),
-//            itemSum = itemSum.toInt()
         )
     }
 
@@ -155,22 +152,19 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
      */
     private fun getUpdatedItemEntry(
         itemId: Int,
-        itemName: String,
-        itemPrice: String,
-        itemCount: String,
-        itemSum: String,
+        name: String,
+        expiryDate: String,
+        label: String,
+        quantity: String,
         imagePath: String
     ): Item {
         return Item(
             id = itemId,
-            itemName = itemName,
-            itemPrice = itemPrice,
-            quantityInStock = itemCount,
-            itemSum = itemSum,
+            name = name,
+            expiryDate = expiryDate,
+            label = label,
+            quantity = quantity,
             imagePath = imagePath
-//            itemPrice = itemPrice.toDouble(),
-//            quantityInStock = itemCount.toInt(),
-//            itemSum = itemSum.toInt()
         )
     }
 }
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index 69d03491..c34f5c9d 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -67,11 +67,10 @@ class ItemDetailFragment : Fragment() {
      */
     private fun bind(item: Item) {
         binding.apply {
-            itemName.text = item.itemName
-            itemPrice.text = item.itemPrice
-//            itemPrice.text = item.getFormattedPrice()
-            itemCount.text = item.quantityInStock.toString()
-            itemSum.text = item.itemSum.toString()
+            name.text = item.name
+            expiryDate.text = item.expiryDate
+            label.text = item.label.toString()
+            quantity.text = item.quantity.toString()
 //            sellItem.isEnabled = viewModel.isStockAvailable(item)
 //            sellItem.setOnClickListener { viewModel.sellItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
@@ -125,7 +124,7 @@ class ItemDetailFragment : Fragment() {
             val builder = NotificationCompat.Builder(this.requireContext(), MainActivity.CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notifications)
                 .setContentTitle(getString(R.string.expiring_soon))
-                .setContentText(getString(R.string.expiration_message, item.itemName, 5))
+                .setContentText(getString(R.string.expiration_message, item.name, 5))
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
 
             with(NotificationManagerCompat.from(this.requireContext())) {
diff --git a/app/src/main/java/com/example/inventory/ItemListAdapter.kt b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
index 1262f009..5b0a847a 100644
--- a/app/src/main/java/com/example/inventory/ItemListAdapter.kt
+++ b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
@@ -53,8 +53,8 @@ class ItemListAdapter(private val onItemClicked: (Item) -> Unit) :
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(item: Item) {
-            binding.itemName.text = item.itemName
-            binding.itemPrice.text = item.itemPrice
+            binding.name.text = item.name
+            binding.expiryDate.text = item.expiryDate
         }
     }
 
@@ -65,7 +65,7 @@ class ItemListAdapter(private val onItemClicked: (Item) -> Unit) :
             }
 
             override fun areContentsTheSame(oldItem: Item, newItem: Item): Boolean {
-                return oldItem.itemName == newItem.itemName
+                return oldItem.name == newItem.name
             }
         }
     }
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 32353215..148c7cdb 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -26,18 +26,12 @@ import androidx.room.PrimaryKey
 data class Item(
     @PrimaryKey(autoGenerate = true)
     val id: Int = 0,
-    @ColumnInfo(name = "itemName")
-    val itemName: String,
-    @ColumnInfo(name = "price")
-    val itemPrice: String,
     @ColumnInfo(name = "quantity")
-    val quantityInStock: String,
-    @ColumnInfo(name = "sum")
-    val itemSum: String,
+    val quantity: String,
     @ColumnInfo(name = "name", defaultValue = "Apple")
     val name: String = "Apple",
     @ColumnInfo(name = "expiryDate", defaultValue = "1680291840000" /* default = March 31 2023*/)
-    val expiryDate: Long = 1680291840000,
+    val expiryDate: String = "expiry string",
     @ColumnInfo(name = "label", defaultValue = "")
     val label: String = "",
     @ColumnInfo(name = "image", defaultValue = "")
diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
index 42e74d43..0adfb5dc 100644
--- a/app/src/main/res/layout/fragment_add_item.xml
+++ b/app/src/main/res/layout/fragment_add_item.xml
@@ -25,7 +25,7 @@
         android:layout_margin="@dimen/margin">
 
         <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/item_name_label"
+            android:id="@+id/name_label"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
@@ -35,7 +35,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/item_name"
+                android:id="@+id/name"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="textAutoComplete|textCapWords"
@@ -44,17 +44,17 @@
 
 
         <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/item_price_label"
+            android:id="@+id/expiry_date_label"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
             android:hint="Expiry Date (YYYY-MM-DD)"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_name_label">
+            app:layout_constraintTop_toBottomOf="@+id/name_label">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/item_price"
+                android:id="@+id/expiry_date"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="text"
@@ -62,17 +62,17 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/item_count_label"
+            android:id="@+id/label_label"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
             android:hint="Enter a label"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_price_label">
+            app:layout_constraintTop_toBottomOf="@+id/expiry_date_label">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/item_count"
+                android:id="@+id/label"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="text"
@@ -80,18 +80,18 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/item_sum_label"
+            android:id="@+id/quantity_label"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin"
-            android:hint="Owner"
+            android:hint="Quantity"
             app:layout_constraintBottom_toTopOf="@+id/imageView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_count_label">
+            app:layout_constraintTop_toBottomOf="@+id/label_label">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/item_sum"
+                android:id="@+id/quantity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="text"
@@ -108,7 +108,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/item_sum_label"
+            app:layout_constraintTop_toBottomOf="@+id/quantity_label"
             app:layout_constraintVertical_bias="0.0"
             android:visibility="gone"
             app:srcCompat="@drawable/baseline_image_search_24" />
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index 58fd1aaf..e9ac02bd 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -23,84 +23,84 @@
     tools:context=".ItemDetailFragment">
 
     <TextView
-        android:id="@+id/item_name_label"
+        android:id="@+id/name_label"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
         android:text="Ingredient Name:"
-        app:layout_constraintBaseline_toBaselineOf="@+id/item_name"
-        app:layout_constraintEnd_toStartOf="@+id/item_name"
+        app:layout_constraintBaseline_toBaselineOf="@+id/name"
+        app:layout_constraintEnd_toStartOf="@+id/name"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
-        android:id="@+id/item_name"
+        android:id="@+id/name"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
-        app:layout_constraintStart_toEndOf="@+id/item_name_label"
+        app:layout_constraintStart_toEndOf="@+id/name_label"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginStart="@dimen/margin_between_elements"
         tools:text="Apple" />
 
     <TextView
-        android:id="@+id/item_price_label"
+        android:id="@+id/expiry_date_label"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
         android:text="Expiry Date:"
-        app:layout_constraintBaseline_toBaselineOf="@+id/item_price"
-        app:layout_constraintEnd_toStartOf="@+id/item_price"
+        app:layout_constraintBaseline_toBaselineOf="@+id/expiry_date"
+        app:layout_constraintEnd_toStartOf="@+id/expiry_date"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
-        android:id="@+id/item_price"
+        android:id="@+id/expiry_date"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
         android:layout_marginTop="@dimen/margin"
         android:layout_marginStart="@dimen/margin_between_elements"
-        app:layout_constraintStart_toEndOf="@+id/item_price_label"
-        app:layout_constraintTop_toBottomOf="@+id/item_name"
+        app:layout_constraintStart_toEndOf="@+id/expiry_date_label"
+        app:layout_constraintTop_toBottomOf="@+id/name"
         tools:text="2000-12-11" />
 
     <TextView
-        android:id="@+id/item_count_label"
+        android:id="@+id/label_label"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
         android:text="Labels:"
-        app:layout_constraintBaseline_toBaselineOf="@+id/item_count"
-        app:layout_constraintEnd_toStartOf="@+id/item_count"
+        app:layout_constraintBaseline_toBaselineOf="@+id/label"
+        app:layout_constraintEnd_toStartOf="@+id/label"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
-        android:id="@+id/item_count"
+        android:id="@+id/label"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="0dp"
         android:layout_marginStart="@dimen/margin_between_elements"
         android:layout_marginTop="@dimen/margin"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/item_count_label"
-        app:layout_constraintTop_toBottomOf="@+id/item_price"
+        app:layout_constraintStart_toEndOf="@+id/label_label"
+        app:layout_constraintTop_toBottomOf="@+id/expiry_date"
         tools:text="Fruit" />
 
     <TextView
-        android:id="@+id/item_sum_label"
+        android:id="@+id/quantity_label"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
-        android:text="Owner:"
-        app:layout_constraintBaseline_toBaselineOf="@+id/item_sum"
-        app:layout_constraintEnd_toStartOf="@+id/item_sum"
+        android:text="Quantity:"
+        app:layout_constraintBaseline_toBaselineOf="@+id/quantity"
+        app:layout_constraintEnd_toStartOf="@+id/quantity"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
-        android:id="@+id/item_sum"
+        android:id="@+id/quantity"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="0dp"
         android:layout_marginStart="@dimen/margin_between_elements"
         android:layout_marginTop="@dimen/margin"
-        app:layout_constraintStart_toEndOf="@+id/item_sum_label"
-        app:layout_constraintTop_toBottomOf="@+id/item_count"
+        app:layout_constraintStart_toEndOf="@+id/quantity_label"
+        app:layout_constraintTop_toBottomOf="@+id/label"
         tools:text="Jack" />
 
     <ImageView
@@ -112,7 +112,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_count"
+        app:layout_constraintTop_toBottomOf="@+id/label"
         app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/baseline_image_search_24" />
 
diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index d58e5077..56dede25 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -23,25 +23,25 @@
     tools:context=".ItemListFragment">
 
     <TextView
-        android:id="@+id/item_name"
+        android:id="@+id/name"
         style="@style/Widget.Inventory.Header"
         android:layout_marginStart="@dimen/margin_between_elements"
         android:text="@string/ingredient"
-        app:layout_constraintEnd_toStartOf="@+id/item_price"
+        app:layout_constraintEnd_toStartOf="@+id/expiry_date"
         app:layout_constraintHorizontal_weight="2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/item_price"
+        android:id="@+id/expiry_date"
         style="@style/Widget.Inventory.Header"
-        android:layout_below="@+id/item_name"
+        android:layout_below="@+id/name"
         android:layout_marginStart="@dimen/margin_between_elements"
         android:text="@string/expiry_date"
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toEndOf="@+id/item_name"
+        app:layout_constraintStart_toEndOf="@+id/name"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -50,7 +50,7 @@
         app:layout_constraintBottom_toTopOf="@+id/recyclerView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_name" />
+        app:layout_constraintTop_toBottomOf="@+id/name" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
@@ -60,7 +60,7 @@
         android:scrollbars="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_price" />
+        app:layout_constraintTop_toBottomOf="@+id/expiry_date" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
diff --git a/app/src/main/res/layout/item_list_item.xml b/app/src/main/res/layout/item_list_item.xml
index 39483ba1..a2bea4e6 100644
--- a/app/src/main/res/layout/item_list_item.xml
+++ b/app/src/main/res/layout/item_list_item.xml
@@ -31,26 +31,26 @@
 
 
         <TextView
-            android:id="@+id/item_name"
+            android:id="@+id/name"
             style="@style/Widget.Inventory.ListItemTextView"
             android:layout_width="255dp"
             android:layout_marginStart="@dimen/margin_between_elements"
             android:fontFamily="sans-serif"
-            app:layout_constraintEnd_toStartOf="@+id/item_price"
+            app:layout_constraintEnd_toStartOf="@+id/expiry_date"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="Apple" />
 
         <TextView
-            android:id="@+id/item_price"
+            android:id="@+id/expiry_date"
             style="@style/Widget.Inventory.ListItemTextView"
             android:layout_width="100dp"
-            android:layout_below="@+id/item_name"
+            android:layout_below="@+id/name"
             android:layout_marginEnd="@dimen/margin_between_elements"
             android:fontFamily="sans-serif-medium"
             android:textAlignment="textEnd"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/item_name"
+            app:layout_constraintStart_toEndOf="@+id/name"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="2000-12-10" />
 

From 1a57927d26962703056d8bac4fb80182c99a3cfa Mon Sep 17 00:00:00 2001
From: jvbhatt <jvbhatt@uwaterloo.ca>
Date: Mon, 13 Mar 2023 04:52:26 -0400
Subject: [PATCH 18/36] Add DatePicker dialog to set expiry date

---
 .../com/example/inventory/AddItemFragment.kt  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 7075883d..5654d50f 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -16,6 +16,7 @@
 package com.example.inventory
 
 import android.app.Activity.RESULT_OK
+import android.app.DatePickerDialog
 import android.content.Context.INPUT_METHOD_SERVICE
 import android.content.Intent
 import android.net.Uri
@@ -33,6 +34,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.example.inventory.data.Item
 import com.example.inventory.databinding.FragmentAddItemBinding
+import java.util.*
 
 /**
  * Fragment to add or update an item in the Inventory database.
@@ -132,6 +134,27 @@ class AddItemFragment : Fragment() {
         }
     }
 
+    /**
+     * Calls the Date Picker pop up for setting expiry date.
+     */
+    private fun callDatePicker() {
+        val expiryDate = binding.expiryDate
+        val calendar = Calendar.getInstance()
+        val year = calendar.get(Calendar.YEAR)
+        val month = calendar.get(Calendar.MONTH)
+        val day = calendar.get(Calendar.DAY_OF_MONTH)
+
+        val dateSetListener =
+            DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+                val selectedDate = "$dayOfMonth/${monthOfYear + 1}/$year"
+                expiryDate.setText(selectedDate)
+            }
+
+        val datePickerDialog =
+            DatePickerDialog(requireContext(), dateSetListener, year, month, day)
+        datePickerDialog.show()
+    }
+
     // File upload: Stores the image the user selects from their gallery into the 'imagePath' variable
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
@@ -151,6 +174,12 @@ class AddItemFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val itemPriceEditText = binding.expiryDate
+        itemPriceEditText.setOnFocusChangeListener { view, hasFocus ->
+            if (hasFocus) {
+                callDatePicker()
+            }
+        }
         val id = navigationArgs.itemId
         // Protocol for editing an existing item
         if (id > 0) {

From d82a087c49ac656ed1a274acb3807ca3dad20809 Mon Sep 17 00:00:00 2001
From: jvbhatt <jvbhatt@uwaterloo.ca>
Date: Mon, 13 Mar 2023 14:08:06 -0400
Subject: [PATCH 19/36] Update naming

---
 app/src/main/java/com/example/inventory/AddItemFragment.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 5654d50f..68acb92c 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -174,8 +174,8 @@ class AddItemFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val itemPriceEditText = binding.expiryDate
-        itemPriceEditText.setOnFocusChangeListener { view, hasFocus ->
+        val expiryDate = binding.expiryDate
+        expiryDate.setOnFocusChangeListener { view, hasFocus ->
             if (hasFocus) {
                 callDatePicker()
             }

From 298acea0e349b22f79585bde12c95a1fa3f2a69c Mon Sep 17 00:00:00 2001
From: tayyaab-wonolo <122898473+tayyaab-wonolo@users.noreply.github.com>
Date: Mon, 13 Mar 2023 14:19:00 -0400
Subject: [PATCH 20/36] testing permissions

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index de522f17..9fbd47a6 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
 Inventory - Solution Code
 ==================================
 
-Solution code for Android Basics in Kotlin.
-Codelab: Android Jetpack - Room.
-
 Introduction
 ------------
 
@@ -33,4 +30,4 @@ You need to know:
 Getting Started
 ---------------
 
-1. Download and run the app.
\ No newline at end of file
+1. Download and run the app.

From d59fee228957d67bd7b13cc49070cb5578129ca9 Mon Sep 17 00:00:00 2001
From: tayyaab-wonolo <122898473+tayyaab-wonolo@users.noreply.github.com>
Date: Mon, 13 Mar 2023 14:41:07 -0400
Subject: [PATCH 21/36] Revert "testing permissions"

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9fbd47a6..de522f17 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 Inventory - Solution Code
 ==================================
 
+Solution code for Android Basics in Kotlin.
+Codelab: Android Jetpack - Room.
+
 Introduction
 ------------
 
@@ -30,4 +33,4 @@ You need to know:
 Getting Started
 ---------------
 
-1. Download and run the app.
+1. Download and run the app.
\ No newline at end of file

From b14f65ae1fa53ec17cdeae68f965ca0a5fea9ab5 Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Mon, 13 Mar 2023 15:09:14 -0400
Subject: [PATCH 22/36] Add buttons on the detail screen to increment and
 decrement quantity of a food

---
 .../example/inventory/InventoryViewModel.kt   | 32 ++++++++++++-------
 .../example/inventory/ItemDetailFragment.kt   |  6 ++--
 .../java/com/example/inventory/data/Item.kt   |  2 +-
 .../inventory/data/ItemRoomDatabase.kt        |  2 +-
 app/src/main/res/layout/fragment_add_item.xml |  2 +-
 .../main/res/layout/fragment_item_detail.xml  | 24 +++++++++++++-
 app/src/main/res/values/strings.xml           |  3 +-
 7 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index 8b172cd5..6ee69e74 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -37,9 +37,9 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Returns true if stock is available to sell, false otherwise.
      */
-//    fun isStockAvailable(item: Item): Boolean {
-//        return (item.quantityInStock > 0)
-//    }
+    fun isStockAvailable(item: Item): Boolean {
+        return (item.quantity > 0)
+    }
 
     /**
      * Updates an existing Item in the database.
@@ -69,13 +69,21 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Decreases the stock by one unit and updates the database.
      */
-//    fun sellItem(item: Item) {
-//        if (item.quantityInStock > 0) {
-//            // Decrease the quantity by 1
-//            val newItem = item.copy(quantityInStock = item.quantityInStock - 1)
-//            updateItem(newItem)
-//        }
-//    }
+    fun sellItem(item: Item) {
+        if (item.quantity > 0) {
+            // Decrease the quantity by 1
+            val newItem = item.copy(quantity = item.quantity - 1)
+            updateItem(newItem)
+        }
+    }
+
+    fun incrementItem(item: Item) {
+        if (item.quantity > 0) {
+            // Decrease the quantity by 1
+            val newItem = item.copy(quantity = item.quantity + 1)
+            updateItem(newItem)
+        }
+    }
 
     /**
      * Inserts the new Item into database.
@@ -141,7 +149,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
             name = name,
             expiryDate = expiryDate,
             label = label,
-            quantity = quantity,
+            quantity = quantity.toInt(),
             imagePath = imagePath
         )
     }
@@ -163,7 +171,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
             name = name,
             expiryDate = expiryDate,
             label = label,
-            quantity = quantity,
+            quantity = quantity.toInt(),
             imagePath = imagePath
         )
     }
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index c34f5c9d..c6008509 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -71,8 +71,10 @@ class ItemDetailFragment : Fragment() {
             expiryDate.text = item.expiryDate
             label.text = item.label.toString()
             quantity.text = item.quantity.toString()
-//            sellItem.isEnabled = viewModel.isStockAvailable(item)
-//            sellItem.setOnClickListener { viewModel.sellItem(item) }
+            sellItem.isEnabled = viewModel.isStockAvailable(item)
+            incrementItem.isEnabled = viewModel.isStockAvailable(item)
+            sellItem.setOnClickListener { viewModel.sellItem(item) }
+            incrementItem.setOnClickListener{ viewModel.incrementItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
             sendNotification.setOnClickListener { sendNotification() }
             editItem.setOnClickListener { editItem() }
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 148c7cdb..0e45077d 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -27,7 +27,7 @@ data class Item(
     @PrimaryKey(autoGenerate = true)
     val id: Int = 0,
     @ColumnInfo(name = "quantity")
-    val quantity: String,
+    val quantity: Int,
     @ColumnInfo(name = "name", defaultValue = "Apple")
     val name: String = "Apple",
     @ColumnInfo(name = "expiryDate", defaultValue = "1680291840000" /* default = March 31 2023*/)
diff --git a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
index 17dbe4e5..5b18d812 100644
--- a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
@@ -24,7 +24,7 @@ import androidx.room.RoomDatabase
 /**
  * Database class with a singleton INSTANCE object.
  */
-@Database(entities = [Item::class], version = 4, exportSchema = false)
+@Database(entities = [Item::class], version = 5, exportSchema = false)
 abstract class ItemRoomDatabase : RoomDatabase() {
 
     abstract fun itemDao(): ItemDao
diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
index 0adfb5dc..309e1ce5 100644
--- a/app/src/main/res/layout/fragment_add_item.xml
+++ b/app/src/main/res/layout/fragment_add_item.xml
@@ -94,7 +94,7 @@
                 android:id="@+id/quantity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:inputType="text"
+                android:inputType="number"
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index e9ac02bd..099ad1cc 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -116,6 +116,28 @@
         app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/baseline_image_search_24" />
 
+    <Button
+        android:id="@+id/sell_item"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin"
+        android:text="@string/decrement_count"
+        app:layout_constraintBottom_toTopOf="@+id/delete_item"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+    <Button
+        android:id="@+id/increment_item"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin"
+        android:text="@string/increment_count"
+        app:layout_constraintBottom_toTopOf="@+id/delete_item"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sell_item" />
+
     <Button
         android:id="@+id/delete_item"
         style="?attr/materialButtonOutlinedStyle"
@@ -126,7 +148,7 @@
         app:layout_constraintBottom_toTopOf="@+id/send_notification"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView" />
+        app:layout_constraintTop_toBottomOf="@+id/increment_item" />
 
     <Button
         android:id="@+id/send_notification"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a906e7d..b1495b6f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,8 @@
   -->
 <resources>
     <string name="app_name">Food Expiry Tracker</string>
-    <string name="sell">Sell</string>
+    <string name="decrement_count">Decrement</string>
+    <string name="increment_count">Increment</string>
     <string name="quantity">Quantity in Stock:</string>
     <string name="quantity_req">Quantity in Stock <font color='#FF0000'>*</font></string>
     <string name="item_name_req">Ingredient Name <font color='#FF0000'>*</font></string>

From ec149e9eb8499dcc08729fd337ed64e7b259f34b Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Mon, 13 Mar 2023 15:15:13 -0400
Subject: [PATCH 23/36] renamed sell item id in detail layout to decrement item

---
 .../main/java/com/example/inventory/ItemDetailFragment.kt   | 4 ++--
 app/src/main/res/layout/fragment_item_detail.xml            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index c6008509..6129db8f 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -71,9 +71,9 @@ class ItemDetailFragment : Fragment() {
             expiryDate.text = item.expiryDate
             label.text = item.label.toString()
             quantity.text = item.quantity.toString()
-            sellItem.isEnabled = viewModel.isStockAvailable(item)
+            decrementItem.isEnabled = viewModel.isStockAvailable(item)
             incrementItem.isEnabled = viewModel.isStockAvailable(item)
-            sellItem.setOnClickListener { viewModel.sellItem(item) }
+            decrementItem.setOnClickListener { viewModel.sellItem(item) }
             incrementItem.setOnClickListener{ viewModel.incrementItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
             sendNotification.setOnClickListener { sendNotification() }
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index 099ad1cc..37912d72 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -117,12 +117,12 @@
         app:srcCompat="@drawable/baseline_image_search_24" />
 
     <Button
-        android:id="@+id/sell_item"
+        android:id="@+id/decrement_item"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin"
         android:text="@string/decrement_count"
-        app:layout_constraintBottom_toTopOf="@+id/delete_item"
+        app:layout_constraintBottom_toTopOf="@+id/increment_item"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imageView" />
@@ -136,7 +136,7 @@
         app:layout_constraintBottom_toTopOf="@+id/delete_item"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sell_item" />
+        app:layout_constraintTop_toBottomOf="@+id/decrement_item" />
 
     <Button
         android:id="@+id/delete_item"

From 4efb5b56748ac4bd04f5bec712090a7ecab37e7a Mon Sep 17 00:00:00 2001
From: tayyaab t <tayyaabtanveer@gmail.com>
Date: Mon, 13 Mar 2023 15:20:39 -0400
Subject: [PATCH 24/36] minor fix - date formatting

---
 .../main/java/com/example/inventory/AddItemFragment.kt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 68acb92c..18bff9b0 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -146,7 +146,15 @@ class AddItemFragment : Fragment() {
 
         val dateSetListener =
             DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
-                val selectedDate = "$dayOfMonth/${monthOfYear + 1}/$year"
+                var month = (monthOfYear+1).toString()
+                var day = dayOfMonth.toString()
+                if (monthOfYear < 10) {
+                    month = "0$month"
+                }
+                if (dayOfMonth < 10) {
+                    day = "0$day"
+                }
+                val selectedDate = "$year-${month}-$day"
                 expiryDate.setText(selectedDate)
             }
 

From 52248c6c4f10cc5c858594aac5f0c26e9d949132 Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Mon, 13 Mar 2023 22:38:13 -0400
Subject: [PATCH 25/36] changed homescreen display to show days from expiry
 instead of expiry date. Also disabled selection of past dates in date picker
 widget.

---
 app/build.gradle                                |  2 +-
 .../com/example/inventory/AddItemFragment.kt    |  1 +
 .../com/example/inventory/ItemListAdapter.kt    | 17 ++++++++++++++++-
 .../java/com/example/inventory/data/Item.kt     |  1 +
 app/src/main/res/layout/item_list_fragment.xml  |  2 +-
 app/src/main/res/values/strings.xml             |  2 +-
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 069d7b33..f01396a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.inventory"
-        minSdkVersion 19
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 18bff9b0..9946c827 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -160,6 +160,7 @@ class AddItemFragment : Fragment() {
 
         val datePickerDialog =
             DatePickerDialog(requireContext(), dateSetListener, year, month, day)
+        datePickerDialog.datePicker.minDate = calendar.timeInMillis
         datePickerDialog.show()
     }
 
diff --git a/app/src/main/java/com/example/inventory/ItemListAdapter.kt b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
index 5b0a847a..5763aaeb 100644
--- a/app/src/main/java/com/example/inventory/ItemListAdapter.kt
+++ b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
@@ -23,6 +23,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.example.inventory.data.Item
 //import com.example.inventory.data.getFormattedPrice
 import com.example.inventory.databinding.ItemListItemBinding
+import java.text.SimpleDateFormat
+import java.time.LocalDateTime
+import java.util.*
 
 /**
  * [ListAdapter] implementation for the recyclerview.
@@ -54,10 +57,22 @@ class ItemListAdapter(private val onItemClicked: (Item) -> Unit) :
 
         fun bind(item: Item) {
             binding.name.text = item.name
-            binding.expiryDate.text = item.expiryDate
+            val expiredDays = getExpiredDays(item.expiryDate).toString()
+            val formatExpiredDays = "$expiredDays days"
+            binding.expiryDate.text = formatExpiredDays
+        }
+        private fun getExpiredDays(expiryDate: String): Long {
+            val formatter = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
+            val parsedExpiryDate = formatter.parse(expiryDate)
+            val parsedCurrentDate = formatter.parse(LocalDateTime.now().toString())
+            val timeDiff = parsedExpiryDate.time - parsedCurrentDate.time
+            return timeDiff / (1000 * 60 * 60 * 24)
         }
     }
 
+
+
+
     companion object {
         private val DiffCallback = object : DiffUtil.ItemCallback<Item>() {
             override fun areItemsTheSame(oldItem: Item, newItem: Item): Boolean {
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 0e45077d..1fa013d2 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -18,6 +18,7 @@ package com.example.inventory.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import java.sql.Date
 
 /**
  * Entity data class represents a single row in the database.
diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index 56dede25..c65eeae9 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -37,7 +37,7 @@
         style="@style/Widget.Inventory.Header"
         android:layout_below="@+id/name"
         android:layout_marginStart="@dimen/margin_between_elements"
-        android:text="@string/expiry_date"
+        android:text="@string/expiry_in"
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_weight="1"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1495b6f..3180190c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,5 +43,5 @@
     <string name="expiring_soon">Expiring Soon</string>
     <string name="expiration_message">%1$s expires in %2$d days</string>
     <string name="ingredient">Ingredient</string>
-    <string name="expiry_date">Expiry Date</string>
+    <string name="expiry_in">Expiry</string>
 </resources>
\ No newline at end of file

From 50f21f6753dd55f329e0917cf8fca55b6b2a0e16 Mon Sep 17 00:00:00 2001
From: FaizaanRehman <FaizaanRehman@users.noreply.github.com>
Date: Sat, 18 Mar 2023 12:15:04 -0400
Subject: [PATCH 26/36] Make push notifications automatic by running a periodic
 function to check expiry dates

---
 app/build.gradle                              |  3 ++
 .../example/inventory/ItemDetailFragment.kt   |  4 +-
 .../com/example/inventory/MainActivity.kt     | 22 ++++++++--
 .../java/com/example/inventory/data/Item.kt   | 20 ++++++++-
 .../inventory/workers/NotificationWorker.kt   | 44 +++++++++++++++++++
 build.gradle                                  |  1 +
 6 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/example/inventory/workers/NotificationWorker.kt

diff --git a/app/build.gradle b/app/build.gradle
index f01396a9..4366e711 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,6 +61,9 @@ dependencies {
     implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation "com.google.android.material:material:$material_version"
 
+    // Worker libraries
+    implementation "androidx.work:work-runtime-ktx:$work_version"
+
     // Lifecycle libraries
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index 6129db8f..42964d43 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -31,7 +31,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.example.inventory.data.Item
-//import com.example.inventory.data.getFormattedPrice
+import com.example.inventory.data.getDaysToExpiry
 import com.example.inventory.databinding.FragmentItemDetailBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
@@ -126,7 +126,7 @@ class ItemDetailFragment : Fragment() {
             val builder = NotificationCompat.Builder(this.requireContext(), MainActivity.CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notifications)
                 .setContentTitle(getString(R.string.expiring_soon))
-                .setContentText(getString(R.string.expiration_message, item.name, 5))
+                .setContentText(getString(R.string.expiration_message, item.name, item.getDaysToExpiry()))
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
 
             with(NotificationManagerCompat.from(this.requireContext())) {
diff --git a/app/src/main/java/com/example/inventory/MainActivity.kt b/app/src/main/java/com/example/inventory/MainActivity.kt
index 0ee9bed7..88e81bae 100644
--- a/app/src/main/java/com/example/inventory/MainActivity.kt
+++ b/app/src/main/java/com/example/inventory/MainActivity.kt
@@ -18,17 +18,25 @@ package com.example.inventory
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.NavigationUI.setupActionBarWithNavController
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
+import com.example.inventory.workers.NotificationWorker
+import java.util.concurrent.TimeUnit
 
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
 
     companion object {
         const val CHANNEL_ID: String = "Expirations"
+        const val WORK_ID: String = "NotificationWorker"
     }
 
     private lateinit var navController: NavController
@@ -43,8 +51,10 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
         // Set up the action bar for use with the NavController
         setupActionBarWithNavController(this, navController)
 
-        // Set up notifications channel
-        createNotificationChannel()
+        // Set up notifications channel and service
+        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS ) == PackageManager.PERMISSION_GRANTED) {
+            setupNotifications()
+        }
     }
 
     /**
@@ -55,9 +65,9 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
     }
 
     /**
-     * Setup notification channel
+     * Setup notifications
      */
-    private fun createNotificationChannel() {
+    private fun setupNotifications() {
         // Create the NotificationChannel, but only on API 26+ because
         // the NotificationChannel class is new and not in the support library
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -71,6 +81,10 @@ class MainActivity : AppCompatActivity(R.layout.activity_main) {
             val notificationManager: NotificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             notificationManager.createNotificationChannel(channel)
         }
+
+        // Setup notification service if not already running
+        val notificationsRequest = PeriodicWorkRequestBuilder<NotificationWorker>(12, TimeUnit.HOURS).build()
+        WorkManager.getInstance(this).enqueueUniquePeriodicWork(WORK_ID, ExistingPeriodicWorkPolicy.KEEP, notificationsRequest)
     }
 
 }
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 1fa013d2..d2414f5f 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -18,7 +18,10 @@ package com.example.inventory.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.sql.Date
+import java.text.SimpleDateFormat
+import java.time.LocalDateTime
+import java.util.*
+import java.util.concurrent.TimeUnit
 
 /**
  * Entity data class represents a single row in the database.
@@ -48,4 +51,17 @@ data class Item(
  * Returns the passed in price in currency format.
  */
 //fun Item.getFormattedPrice(): String =
-//    NumberFormat.getCurrencyInstance().format(itemPrice)
\ No newline at end of file
+//    NumberFormat.getCurrencyInstance().format(itemPrice)
+
+/**
+ * Returns the remaining number of days until the ingredient expired.
+ */
+fun Item.getDaysToExpiry(): Long {
+    val formatter = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
+    val parsedExpiryDate = formatter.parse(expiryDate)
+    val parsedCurrentDate = formatter.parse(LocalDateTime.now().toString())
+    val diffInMillies: Long = parsedExpiryDate.time - parsedCurrentDate.time
+    val diffInDays: Long = TimeUnit.DAYS.convert(diffInMillies, TimeUnit.MILLISECONDS)
+
+    return diffInDays
+}
diff --git a/app/src/main/java/com/example/inventory/workers/NotificationWorker.kt b/app/src/main/java/com/example/inventory/workers/NotificationWorker.kt
new file mode 100644
index 00000000..c0237675
--- /dev/null
+++ b/app/src/main/java/com/example/inventory/workers/NotificationWorker.kt
@@ -0,0 +1,44 @@
+package com.example.inventory.workers
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import com.example.inventory.MainActivity
+import com.example.inventory.R
+import com.example.inventory.data.Item
+import com.example.inventory.data.ItemRoomDatabase
+import com.example.inventory.data.getDaysToExpiry
+import kotlinx.coroutines.flow.first
+
+class NotificationWorker(appContext: Context, workerParams: WorkerParameters):
+    CoroutineWorker(appContext, workerParams) {
+
+    @SuppressLint("MissingPermission")
+    override suspend fun doWork(): Result {
+        Log.d("worker", "running task")
+        val items: List<Item> = ItemRoomDatabase.getDatabase(applicationContext).itemDao().getItems().first()
+        items.forEach { item:Item ->
+            if (item.getDaysToExpiry() <= 1) {
+                Log.d("worker", "${item.name} expires in ${item.getDaysToExpiry()} days")
+                val builder = NotificationCompat.Builder(applicationContext, MainActivity.CHANNEL_ID)
+                    .setSmallIcon(R.drawable.ic_notifications)
+                    .setContentTitle(applicationContext.getString(R.string.expiring_soon))
+                    .setContentText(applicationContext.getString(R.string.expiration_message, item.name, item.getDaysToExpiry()))
+                    .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+
+                with(NotificationManagerCompat.from(applicationContext)) {
+                    // notificationId is a unique int for each notification that you must define
+                    notify(item.id, builder.build())
+                }
+            }
+        }
+
+        Log.d("worker", "finished checking")
+        // Indicate whether the work finished successfully with the Result
+        return Result.success()
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1ee4f7e9..3e4ce561 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,7 @@ buildscript {
         appcompat_version = '1.6.0'
         constraintlayout_version = '2.1.4'
         core_ktx_version = '1.9.0'
+        work_version = "2.8.0"
         coroutines_version = '1.4.2'
         kotlin_version = '1.8.0'
         lifecycle_version = '2.5.1'

From e025e182b173c6a42bff59182d8f148c50a743d9 Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Sat, 18 Mar 2023 20:35:41 -0400
Subject: [PATCH 27/36] display error messages in add/upload forms

---
 .../com/example/inventory/AddItemFragment.kt  | 30 +++++++++++++++----
 .../example/inventory/InventoryViewModel.kt   |  4 +--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 9946c827..a1bae7b9 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -76,12 +76,30 @@ class AddItemFragment : Fragment() {
      * Returns true if the EditTexts are not empty
      */
     private fun isEntryValid(): Boolean {
-        return viewModel.isEntryValid(
-            binding.name.text.toString(),
-            binding.expiryDate.text.toString(),
-            binding.label.text.toString(),
-            binding.quantity.text.toString(),
-        )
+        val nameValid = (viewModel.isEntryValid(
+            binding.name.text.toString()
+        ))
+        val expiryDateValid = (viewModel.isEntryValid(
+            binding.expiryDate.text.toString()
+        ))
+        val quantityValid = (viewModel.isEntryValid(
+            binding.quantity.text.toString()
+        ))
+        var formValid = true
+        if (!nameValid || !expiryDateValid || !quantityValid) {
+            formValid = false
+            if (!nameValid) {
+                binding.name.error = "ingredient name cannot be empty"
+            }
+            if (!expiryDateValid) {
+                binding.expiryDate.error = "expiry date cannot be empty"
+            }
+            if (!quantityValid) {
+                binding.quantity.error = "quantity cannot be empty"
+            }
+
+        }
+        return formValid
     }
 
     /**
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index 6ee69e74..89de5590 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -127,8 +127,8 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
     /**
      * Returns true if the EditTexts are not empty
      */
-    fun isEntryValid(name: String, expiryDate: String, label: String, quantity: String): Boolean {
-        if (name.isBlank() || expiryDate.isBlank() || label.isBlank() || quantity.isBlank()) {
+    fun isEntryValid(field: String): Boolean {
+        if (field.isBlank()) {
             return false
         }
         return true

From d9f478d29d3adf66f1cf29acd0b32f43f4894423 Mon Sep 17 00:00:00 2001
From: ckalia <ckalia@uwaterloo.ca>
Date: Sat, 18 Mar 2023 20:54:30 -0400
Subject: [PATCH 28/36] allowed users to type in a 2 decimal double instead of
 an int for the quantity field for add/upload form

---
 .../com/example/inventory/AddItemFragment.kt  | 41 ++++++++++++++++++-
 .../example/inventory/InventoryViewModel.kt   |  4 +-
 .../java/com/example/inventory/data/Item.kt   |  2 +-
 .../inventory/data/ItemRoomDatabase.kt        |  2 +-
 app/src/main/res/layout/fragment_add_item.xml |  2 +-
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 9946c827..f2f0edaa 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -22,11 +22,14 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
+import android.text.Editable
+import android.text.TextWatcher
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -164,6 +167,36 @@ class AddItemFragment : Fragment() {
         datePickerDialog.show()
     }
 
+    private val MAX_DECIMAL_PLACES = 2 // Set the maximum number of decimal places here
+
+    private fun setUpQuantityText() {
+        val editQuantity = binding.quantity
+
+        editQuantity.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                // Nothing to do here
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                // Nothing to do here
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                val decimalIndex = s?.indexOf(".") ?: -1
+
+                if (s != null) {
+                    if (decimalIndex != -1 && s.length - decimalIndex - 1 > MAX_DECIMAL_PLACES) {
+                        // Too many decimal places, remove the extra ones
+                        val truncatedString = s.substring(0, decimalIndex + MAX_DECIMAL_PLACES + 1)
+                        editQuantity.setText(truncatedString)
+                        editQuantity.setSelection(truncatedString.length)
+                    }
+                }
+            }
+        })
+    }
+
+
     // File upload: Stores the image the user selects from their gallery into the 'imagePath' variable
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
@@ -184,11 +217,17 @@ class AddItemFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val expiryDate = binding.expiryDate
-        expiryDate.setOnFocusChangeListener { view, hasFocus ->
+        expiryDate.setOnFocusChangeListener { _, hasFocus ->
             if (hasFocus) {
                 callDatePicker()
             }
         }
+        val quantity = binding.quantity
+        quantity.setOnFocusChangeListener { _, hasFocus ->
+            if (hasFocus) {
+                setUpQuantityText()
+            }
+        }
         val id = navigationArgs.itemId
         // Protocol for editing an existing item
         if (id > 0) {
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index 6ee69e74..5aca373d 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -149,7 +149,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
             name = name,
             expiryDate = expiryDate,
             label = label,
-            quantity = quantity.toInt(),
+            quantity = quantity.toDouble(),
             imagePath = imagePath
         )
     }
@@ -171,7 +171,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
             name = name,
             expiryDate = expiryDate,
             label = label,
-            quantity = quantity.toInt(),
+            quantity = quantity.toDouble(),
             imagePath = imagePath
         )
     }
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 1fa013d2..6cc58199 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -28,7 +28,7 @@ data class Item(
     @PrimaryKey(autoGenerate = true)
     val id: Int = 0,
     @ColumnInfo(name = "quantity")
-    val quantity: Int,
+    val quantity: Double,
     @ColumnInfo(name = "name", defaultValue = "Apple")
     val name: String = "Apple",
     @ColumnInfo(name = "expiryDate", defaultValue = "1680291840000" /* default = March 31 2023*/)
diff --git a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
index 5b18d812..0475960e 100644
--- a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
@@ -24,7 +24,7 @@ import androidx.room.RoomDatabase
 /**
  * Database class with a singleton INSTANCE object.
  */
-@Database(entities = [Item::class], version = 5, exportSchema = false)
+@Database(entities = [Item::class], version = 6, exportSchema = false)
 abstract class ItemRoomDatabase : RoomDatabase() {
 
     abstract fun itemDao(): ItemDao
diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
index 309e1ce5..2ee20eb3 100644
--- a/app/src/main/res/layout/fragment_add_item.xml
+++ b/app/src/main/res/layout/fragment_add_item.xml
@@ -94,7 +94,7 @@
                 android:id="@+id/quantity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:inputType="number"
+                android:inputType="numberDecimal"
                 android:singleLine="true" />
         </com.google.android.material.textfield.TextInputLayout>
 

From 3332f1899fe21b091233ece4b006c782a01f3880 Mon Sep 17 00:00:00 2001
From: epheitea <ephei@outlook.com>
Date: Sun, 19 Mar 2023 22:55:02 +0800
Subject: [PATCH 29/36] Enabled image persistence upon app restart

---
 .../com/example/inventory/AddItemFragment.kt  | 37 ++++++++++++++++---
 .../example/inventory/InventoryViewModel.kt   | 16 ++++----
 .../example/inventory/ItemDetailFragment.kt   |  3 +-
 .../java/com/example/inventory/data/Item.kt   | 17 ++++++++-
 .../inventory/data/ItemRoomDatabase.kt        |  2 +-
 5 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index e94678b9..79df3b10 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -19,17 +19,19 @@ import android.app.Activity.RESULT_OK
 import android.app.DatePickerDialog
 import android.content.Context.INPUT_METHOD_SERVICE
 import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.ImageDecoder
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
 import android.text.Editable
 import android.text.TextWatcher
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -37,6 +39,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.example.inventory.data.Item
 import com.example.inventory.databinding.FragmentAddItemBinding
+import java.io.ByteArrayOutputStream
 import java.util.*
 
 /**
@@ -65,6 +68,10 @@ class AddItemFragment : Fragment() {
     // For file upload
     private val pickImage = 100
     private var imagePath: Uri? = null
+    private var imageBitmap: Bitmap? = null
+    private var imageByte: ByteArray? = null
+    private var bos: ByteArrayOutputStream? = ByteArrayOutputStream();
+    private var loadImageByte: ByteArray? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -109,13 +116,21 @@ class AddItemFragment : Fragment() {
      * Binds views with the passed in [item] information.
      */
     private fun bind(item: Item) {
+
+        // Use the uploaded user image if this is the add screen, otherwise take from database
+        loadImageByte = if (navigationArgs.itemId > 0) {
+            item.imageByte
+        } else {
+            imageByte
+        }
+
         binding.apply {
             name.setText(item.name, TextView.BufferType.SPANNABLE)
             expiryDate.setText(item.expiryDate, TextView.BufferType.SPANNABLE)
             label.setText(item.label.toString(), TextView.BufferType.SPANNABLE)
             quantity.setText(item.quantity.toString(), TextView.BufferType.SPANNABLE)
             saveAction.setOnClickListener { updateItem() }
-            binding.imageView.setImageURI(Uri.parse(item.imagePath))
+            binding.imageView.setImageBitmap(BitmapFactory.decodeByteArray(loadImageByte, 0, loadImageByte!!.size))
         }
         binding.imageView.visibility = View.VISIBLE
     }
@@ -130,7 +145,7 @@ class AddItemFragment : Fragment() {
                 binding.expiryDate.text.toString(),
                 binding.label.text.toString(),
                 binding.quantity.text.toString(),
-                imagePath.toString()
+                imageByte
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
             findNavController().navigate(action)
@@ -148,7 +163,7 @@ class AddItemFragment : Fragment() {
                 this.binding.expiryDate.text.toString(),
                 this.binding.label.text.toString(),
                 this.binding.quantity.text.toString(),
-                this.imagePath.toString(),
+                this.imageByte,
             )
             val action = AddItemFragmentDirections.actionAddItemFragmentToItemListFragment()
             findNavController().navigate(action)
@@ -220,7 +235,17 @@ class AddItemFragment : Fragment() {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == pickImage) {
             imagePath = data?.data
-            binding.imageView.setImageURI(imagePath)
+//            binding.imageView.setImageURI(imagePath)
+            if (Build.VERSION.SDK_INT >= 28) {
+                val source = ImageDecoder.createSource(requireActivity().contentResolver,imagePath!!)
+                imageBitmap = ImageDecoder.decodeBitmap(source)
+            }
+            else {
+                imageBitmap = MediaStore.Images.Media.getBitmap(requireActivity().contentResolver,imagePath!!)
+            }
+            binding.imageView.setImageBitmap(imageBitmap)
+            imageBitmap?.compress(Bitmap.CompressFormat.PNG, 100, bos)
+            imageByte = bos?.toByteArray();
             binding.imageView.visibility = View.VISIBLE
         }
     }
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index 001a3018..90386603 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -50,9 +50,9 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         expiryDate: String,
         label: String,
         quantity: String,
-        imagePath: String,
+        imageByte: ByteArray?,
     ) {
-        val updatedItem = getUpdatedItemEntry(itemId, name, expiryDate, label, quantity, imagePath)
+        val updatedItem = getUpdatedItemEntry(itemId, name, expiryDate, label, quantity, imageByte)
         updateItem(updatedItem)
     }
 
@@ -93,9 +93,9 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         expiryDate: String,
         label: String,
         quantity: String,
-        imagePath: String,
+        imageByte: ByteArray?,
     ) {
-        val newItem = getNewItemEntry(name, expiryDate, label, quantity, imagePath)
+        val newItem = getNewItemEntry(name, expiryDate, label, quantity, imageByte)
         insertItem(newItem)
     }
 
@@ -143,14 +143,14 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         expiryDate: String,
         label: String,
         quantity: String,
-        imagePath: String,
+        imageByte: ByteArray?,
     ): Item {
         return Item(
             name = name,
             expiryDate = expiryDate,
             label = label,
             quantity = quantity.toDouble(),
-            imagePath = imagePath
+            imageByte = imageByte!!
         )
     }
 
@@ -164,7 +164,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
         expiryDate: String,
         label: String,
         quantity: String,
-        imagePath: String
+        imageByte: ByteArray?
     ): Item {
         return Item(
             id = itemId,
@@ -172,7 +172,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
             expiryDate = expiryDate,
             label = label,
             quantity = quantity.toDouble(),
-            imagePath = imagePath
+            imageByte = imageByte!!
         )
     }
 }
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index 6129db8f..571bc74b 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -17,6 +17,7 @@
 package com.example.inventory
 
 import android.content.pm.PackageManager
+import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -78,7 +79,7 @@ class ItemDetailFragment : Fragment() {
             deleteItem.setOnClickListener { showConfirmationDialog() }
             sendNotification.setOnClickListener { sendNotification() }
             editItem.setOnClickListener { editItem() }
-            imageView.setImageURI(Uri.parse(item.imagePath))
+            binding.imageView.setImageBitmap(BitmapFactory.decodeByteArray(item.imageByte, 0, item.imageByte!!.size))
         }
     }
 
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 6cc58199..54ad1a07 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -36,14 +36,27 @@ data class Item(
     @ColumnInfo(name = "label", defaultValue = "")
     val label: String = "",
     @ColumnInfo(name = "image", defaultValue = "")
-    val imagePath: String = "",
+    val imageByte: ByteArray,
     @ColumnInfo(name = "discarded", defaultValue = false.toString())
     val discarded: Boolean = false,
     @ColumnInfo(name = "addedOn", defaultValue = "1678394640000" /* default = March 1 2023*/)
     val addedOn: Long = 1678394640000,
     @ColumnInfo(name = "updatedOn", defaultValue = "1678394640000" /* default = March 1 2023*/)
     val updatedOn: Long = 1678394640000,
-)
+) {
+    // Processing for ImagePath property (as it's a ByteArray)
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        other as Item
+        if (!imageByte.contentEquals(other.imageByte)) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return imageByte.contentHashCode()
+    }
+}
 /**
  * Returns the passed in price in currency format.
  */
diff --git a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
index 0475960e..50f0c3a9 100644
--- a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
@@ -24,7 +24,7 @@ import androidx.room.RoomDatabase
 /**
  * Database class with a singleton INSTANCE object.
  */
-@Database(entities = [Item::class], version = 6, exportSchema = false)
+@Database(entities = [Item::class], version = 7, exportSchema = false)
 abstract class ItemRoomDatabase : RoomDatabase() {
 
     abstract fun itemDao(): ItemDao

From c4c753996a804c2c0624bd53323fefd3763ba4ea Mon Sep 17 00:00:00 2001
From: epheitea <ephei@outlook.com>
Date: Mon, 20 Mar 2023 00:05:26 +0800
Subject: [PATCH 30/36] Hotfix for app crashing when not uploading any photos

---
 .../com/example/inventory/AddItemFragment.kt  | 34 +++++++++++++------
 .../example/inventory/InventoryViewModel.kt   |  4 +--
 .../example/inventory/ItemDetailFragment.kt   | 32 ++++++++++++++---
 .../java/com/example/inventory/data/Item.kt   |  3 +-
 .../inventory/data/ItemRoomDatabase.kt        |  2 +-
 app/src/main/res/layout/fragment_add_item.xml |  2 +-
 .../main/res/layout/fragment_item_detail.xml  |  6 ++--
 7 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 79df3b10..8a901f52 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -71,7 +71,6 @@ class AddItemFragment : Fragment() {
     private var imageBitmap: Bitmap? = null
     private var imageByte: ByteArray? = null
     private var bos: ByteArrayOutputStream? = ByteArrayOutputStream();
-    private var loadImageByte: ByteArray? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -118,10 +117,15 @@ class AddItemFragment : Fragment() {
     private fun bind(item: Item) {
 
         // Use the uploaded user image if this is the add screen, otherwise take from database
-        loadImageByte = if (navigationArgs.itemId > 0) {
-            item.imageByte
+        var loadImageByte = if (navigationArgs.itemId > 0) {
+            // Check if the user added an image with this item
+            if (item.imageByte == null) {
+                null
+            } else {
+                BitmapFactory.decodeByteArray(item.imageByte, 0, item.imageByte!!.size)
+            }
         } else {
-            imageByte
+            BitmapFactory.decodeByteArray(imageByte, 0, imageByte!!.size)
         }
 
         binding.apply {
@@ -129,10 +133,16 @@ class AddItemFragment : Fragment() {
             expiryDate.setText(item.expiryDate, TextView.BufferType.SPANNABLE)
             label.setText(item.label.toString(), TextView.BufferType.SPANNABLE)
             quantity.setText(item.quantity.toString(), TextView.BufferType.SPANNABLE)
+            binding.imageView.setImageBitmap(loadImageByte)
             saveAction.setOnClickListener { updateItem() }
-            binding.imageView.setImageBitmap(BitmapFactory.decodeByteArray(loadImageByte, 0, loadImageByte!!.size))
         }
-        binding.imageView.visibility = View.VISIBLE
+
+        if (item.imageByte == null) {
+            binding.imageView.visibility = View.GONE
+        } else {
+            binding.imageView.visibility = View.VISIBLE
+        }
+
     }
 
     /**
@@ -236,12 +246,11 @@ class AddItemFragment : Fragment() {
         if (resultCode == RESULT_OK && requestCode == pickImage) {
             imagePath = data?.data
 //            binding.imageView.setImageURI(imagePath)
-            if (Build.VERSION.SDK_INT >= 28) {
+            imageBitmap = if (Build.VERSION.SDK_INT >= 28) {
                 val source = ImageDecoder.createSource(requireActivity().contentResolver,imagePath!!)
-                imageBitmap = ImageDecoder.decodeBitmap(source)
-            }
-            else {
-                imageBitmap = MediaStore.Images.Media.getBitmap(requireActivity().contentResolver,imagePath!!)
+                ImageDecoder.decodeBitmap(source)
+            } else {
+                MediaStore.Images.Media.getBitmap(requireActivity().contentResolver,imagePath!!)
             }
             binding.imageView.setImageBitmap(imageBitmap)
             imageBitmap?.compress(Bitmap.CompressFormat.PNG, 100, bos)
@@ -272,6 +281,7 @@ class AddItemFragment : Fragment() {
             }
         }
         val id = navigationArgs.itemId
+
         // Protocol for editing an existing item
         if (id > 0) {
             viewModel.retrieveItem(id).observe(this.viewLifecycleOwner) { selectedItem ->
@@ -285,6 +295,8 @@ class AddItemFragment : Fragment() {
                 addNewItem()
             }
         }
+
+        // Opens the phone's gallery
         binding.uploadPhoto.setOnClickListener{
             val gallery = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI)
             startActivityForResult(gallery, pickImage)
diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index 90386603..f40318d0 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -150,7 +150,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
             expiryDate = expiryDate,
             label = label,
             quantity = quantity.toDouble(),
-            imageByte = imageByte!!
+            imageByte = imageByte
         )
     }
 
@@ -172,7 +172,7 @@ class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
             expiryDate = expiryDate,
             label = label,
             quantity = quantity.toDouble(),
-            imageByte = imageByte!!
+            imageByte = imageByte
         )
     }
 }
diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index 571bc74b..23c9c7b6 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -20,6 +20,7 @@ import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -67,6 +68,14 @@ class ItemDetailFragment : Fragment() {
      * Binds views with the passed in item data.
      */
     private fun bind(item: Item) {
+
+        // Only try to load the image if the user added one
+        var loadImageByte = if (item.imageByte == null) {
+            null
+        } else {
+            BitmapFactory.decodeByteArray(item.imageByte, 0, item.imageByte!!.size)
+        }
+
         binding.apply {
             name.text = item.name
             expiryDate.text = item.expiryDate
@@ -75,12 +84,19 @@ class ItemDetailFragment : Fragment() {
             decrementItem.isEnabled = viewModel.isStockAvailable(item)
             incrementItem.isEnabled = viewModel.isStockAvailable(item)
             decrementItem.setOnClickListener { viewModel.sellItem(item) }
-            incrementItem.setOnClickListener{ viewModel.incrementItem(item) }
+            incrementItem.setOnClickListener { viewModel.incrementItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
             sendNotification.setOnClickListener { sendNotification() }
             editItem.setOnClickListener { editItem() }
-            binding.imageView.setImageBitmap(BitmapFactory.decodeByteArray(item.imageByte, 0, item.imageByte!!.size))
+            binding.imageView.setImageBitmap(loadImageByte)
         }
+
+        if (item.imageByte == null) {
+            binding.imageView.visibility = View.GONE
+        } else {
+            binding.imageView.visibility = View.VISIBLE
+        }
+
     }
 
     /**
@@ -121,8 +137,16 @@ class ItemDetailFragment : Fragment() {
      * Sends a push notification to inform the user of the expiry date
      */
     private fun sendNotification() {
-        if (ContextCompat.checkSelfPermission(this@ItemDetailFragment.requireContext(), android.Manifest.permission.POST_NOTIFICATIONS ) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this@ItemDetailFragment.requireActivity(),arrayOf(android.Manifest.permission.POST_NOTIFICATIONS), 1)
+        if (ContextCompat.checkSelfPermission(
+                this@ItemDetailFragment.requireContext(),
+                android.Manifest.permission.POST_NOTIFICATIONS
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            ActivityCompat.requestPermissions(
+                this@ItemDetailFragment.requireActivity(),
+                arrayOf(android.Manifest.permission.POST_NOTIFICATIONS),
+                1
+            )
         } else {
             val builder = NotificationCompat.Builder(this.requireContext(), MainActivity.CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_notifications)
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index 54ad1a07..cb2b01d6 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -18,7 +18,6 @@ package com.example.inventory.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.sql.Date
 
 /**
  * Entity data class represents a single row in the database.
@@ -36,7 +35,7 @@ data class Item(
     @ColumnInfo(name = "label", defaultValue = "")
     val label: String = "",
     @ColumnInfo(name = "image", defaultValue = "")
-    val imageByte: ByteArray,
+    val imageByte: ByteArray?,
     @ColumnInfo(name = "discarded", defaultValue = false.toString())
     val discarded: Boolean = false,
     @ColumnInfo(name = "addedOn", defaultValue = "1678394640000" /* default = March 1 2023*/)
diff --git a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
index 50f0c3a9..33a822f1 100644
--- a/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemRoomDatabase.kt
@@ -24,7 +24,7 @@ import androidx.room.RoomDatabase
 /**
  * Database class with a singleton INSTANCE object.
  */
-@Database(entities = [Item::class], version = 7, exportSchema = false)
+@Database(entities = [Item::class], version = 8, exportSchema = false)
 abstract class ItemRoomDatabase : RoomDatabase() {
 
     abstract fun itemDao(): ItemDao
diff --git a/app/src/main/res/layout/fragment_add_item.xml b/app/src/main/res/layout/fragment_add_item.xml
index 2ee20eb3..da2799d9 100644
--- a/app/src/main/res/layout/fragment_add_item.xml
+++ b/app/src/main/res/layout/fragment_add_item.xml
@@ -102,7 +102,7 @@
             android:id="@+id/imageView"
             android:layout_width="match_parent"
             android:layout_height="150dp"
-            android:layout_marginTop="48dp"
+            android:layout_marginTop="20dp"
             android:layout_marginBottom="48dp"
             app:layout_constraintBottom_toTopOf="@+id/upload_photo"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index 37912d72..42a7e46d 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -107,12 +107,12 @@
         android:id="@+id/imageView"
         android:layout_width="match_parent"
         android:layout_height="150dp"
-        android:layout_marginTop="48dp"
-        app:layout_constraintBottom_toTopOf="@+id/delete_item"
+        android:layout_marginTop="20dp"
+        app:layout_constraintBottom_toTopOf="@+id/decrement_item"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/label"
+        app:layout_constraintTop_toBottomOf="@+id/quantity"
         app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/baseline_image_search_24" />
 

From 43d42c909351ca747030ad2c65f7dfcfcb0dce02 Mon Sep 17 00:00:00 2001
From: epheitea <ephei@outlook.com>
Date: Tue, 21 Mar 2023 11:32:09 +0800
Subject: [PATCH 31/36] Fixed app crashing upon edit

---
 app/src/main/java/com/example/inventory/AddItemFragment.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 8a901f52..9db50410 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -253,7 +253,7 @@ class AddItemFragment : Fragment() {
                 MediaStore.Images.Media.getBitmap(requireActivity().contentResolver,imagePath!!)
             }
             binding.imageView.setImageBitmap(imageBitmap)
-            imageBitmap?.compress(Bitmap.CompressFormat.PNG, 100, bos)
+            imageBitmap?.compress(Bitmap.CompressFormat.JPEG, 33, bos)
             imageByte = bos?.toByteArray();
             binding.imageView.visibility = View.VISIBLE
         }

From 556952e1bc766c09f0756fcab24e540f3d587a26 Mon Sep 17 00:00:00 2001
From: epheitea <ephei@outlook.com>
Date: Thu, 23 Mar 2023 11:17:15 +0800
Subject: [PATCH 32/36] Fixed disappearing image bug upon edit

---
 app/src/main/java/com/example/inventory/AddItemFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/example/inventory/AddItemFragment.kt b/app/src/main/java/com/example/inventory/AddItemFragment.kt
index 9db50410..686bb5dd 100644
--- a/app/src/main/java/com/example/inventory/AddItemFragment.kt
+++ b/app/src/main/java/com/example/inventory/AddItemFragment.kt
@@ -141,6 +141,7 @@ class AddItemFragment : Fragment() {
             binding.imageView.visibility = View.GONE
         } else {
             binding.imageView.visibility = View.VISIBLE
+            imageByte = item.imageByte
         }
 
     }

From 74ef53815ce2e5c22bcc75f90b5ede659c9336b2 Mon Sep 17 00:00:00 2001
From: FaizaanRehman <FaizaanRehman@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:09:05 -0400
Subject: [PATCH 33/36] Add button to launch google maps and search for food
 banks

---
 .../java/com/example/inventory/ItemListFragment.kt    |  9 +++++++++
 app/src/main/res/drawable/ic_foodbank.xml             |  5 +++++
 app/src/main/res/layout/item_list_fragment.xml        | 11 +++++++++++
 app/src/main/res/values/strings.xml                   |  1 +
 4 files changed, 26 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_foodbank.xml

diff --git a/app/src/main/java/com/example/inventory/ItemListFragment.kt b/app/src/main/java/com/example/inventory/ItemListFragment.kt
index 2ebb821c..c50f11a5 100644
--- a/app/src/main/java/com/example/inventory/ItemListFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemListFragment.kt
@@ -16,6 +16,8 @@
 
 package com.example.inventory
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -72,5 +74,12 @@ class ItemListFragment : Fragment() {
             )
             this.findNavController().navigate(action)
         }
+
+        binding.foodBankButton.setOnClickListener {
+            val gmmIntentUri = Uri.parse("geo:0,0?q=food donation")
+            val mapIntent = Intent(Intent.ACTION_VIEW, gmmIntentUri)
+            mapIntent.setPackage("com.google.android.apps.maps")
+            startActivity(mapIntent)
+        }
     }
 }
diff --git a/app/src/main/res/drawable/ic_foodbank.xml b/app/src/main/res/drawable/ic_foodbank.xml
new file mode 100644
index 00000000..90c437b7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_foodbank.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,3L4,9v12h16V9L12,3zM12.5,12.5c0,0.83 -0.67,1.5 -1.5,1.5v4h-1v-4c-0.83,0 -1.5,-0.67 -1.5,-1.5v-3h1v3H10v-3h1v3h0.5v-3h1V12.5zM15,18h-1v-3.5h-1v-3c0,-1.1 0.9,-2 2,-2V18z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_list_fragment.xml b/app/src/main/res/layout/item_list_fragment.xml
index c65eeae9..682b4a55 100644
--- a/app/src/main/res/layout/item_list_fragment.xml
+++ b/app/src/main/res/layout/item_list_fragment.xml
@@ -73,6 +73,17 @@
         app:layout_constraintBottom_toTopOf="@+id/divider1"
         app:tint="@android:color/white"/>
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/foodBankButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:contentDescription="@string/findFoodbanks"
+        android:src="@drawable/ic_foodbank"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/divider1"
+        app:tint="@android:color/white"/>
+
     <View
         android:id="@+id/divider1"
         style="@style/Divider"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3180190c..b39f2b3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,4 +44,5 @@
     <string name="expiration_message">%1$s expires in %2$d days</string>
     <string name="ingredient">Ingredient</string>
     <string name="expiry_in">Expiry</string>
+    <string name="findFoodbanks">Find nearby foodbanks</string>
 </resources>
\ No newline at end of file

From c09a6c040af3e75ee05d8c017fdd7fe17c91ce50 Mon Sep 17 00:00:00 2001
From: FaizaanRehman <FaizaanRehman@users.noreply.github.com>
Date: Fri, 24 Mar 2023 15:07:28 -0400
Subject: [PATCH 34/36] Format ingredients in list based on expired or consumed

---
 .../com/example/inventory/ItemListAdapter.kt  | 26 ++++++++++---------
 .../java/com/example/inventory/data/Item.kt   | 14 ++++++++++
 app/src/main/res/layout/item_list_item.xml    |  1 +
 app/src/main/res/values/colors.xml            |  2 ++
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/ItemListAdapter.kt b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
index 5763aaeb..1007af2c 100644
--- a/app/src/main/java/com/example/inventory/ItemListAdapter.kt
+++ b/app/src/main/java/com/example/inventory/ItemListAdapter.kt
@@ -15,17 +15,18 @@
  */
 package com.example.inventory
 
+//import com.example.inventory.data.getFormattedPrice
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.example.inventory.data.Item
-//import com.example.inventory.data.getFormattedPrice
+import com.example.inventory.data.getDaysToExpiry
+import com.example.inventory.data.hasExpired
+import com.example.inventory.data.isConsumed
 import com.example.inventory.databinding.ItemListItemBinding
-import java.text.SimpleDateFormat
-import java.time.LocalDateTime
-import java.util.*
 
 /**
  * [ListAdapter] implementation for the recyclerview.
@@ -57,16 +58,17 @@ class ItemListAdapter(private val onItemClicked: (Item) -> Unit) :
 
         fun bind(item: Item) {
             binding.name.text = item.name
-            val expiredDays = getExpiredDays(item.expiryDate).toString()
+            val expiredDays = item.getDaysToExpiry().toString()
             val formatExpiredDays = "$expiredDays days"
             binding.expiryDate.text = formatExpiredDays
-        }
-        private fun getExpiredDays(expiryDate: String): Long {
-            val formatter = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
-            val parsedExpiryDate = formatter.parse(expiryDate)
-            val parsedCurrentDate = formatter.parse(LocalDateTime.now().toString())
-            val timeDiff = parsedExpiryDate.time - parsedCurrentDate.time
-            return timeDiff / (1000 * 60 * 60 * 24)
+
+            if (item.hasExpired()) {
+                binding.card.setCardBackgroundColor(ContextCompat.getColor(binding.card.context, R.color.ingredient_expired))
+            }
+            if (item.isConsumed()) {
+                binding.name.setTextColor(ContextCompat.getColor(binding.card.context, R.color.ingredient_consumed))
+                binding.expiryDate.setTextColor(ContextCompat.getColor(binding.card.context, R.color.ingredient_consumed))
+            }
         }
     }
 
diff --git a/app/src/main/java/com/example/inventory/data/Item.kt b/app/src/main/java/com/example/inventory/data/Item.kt
index b37a6486..72d316de 100644
--- a/app/src/main/java/com/example/inventory/data/Item.kt
+++ b/app/src/main/java/com/example/inventory/data/Item.kt
@@ -78,3 +78,17 @@ fun Item.getDaysToExpiry(): Long {
 
     return diffInDays
 }
+
+/**
+ * Returns boolean indicating if item has been consumed or not.
+ */
+fun Item.isConsumed(): Boolean {
+    return quantity <= 0
+}
+
+/**
+ * Returns boolean indicating if item has expired or not.
+ */
+fun Item.hasExpired(): Boolean {
+    return getDaysToExpiry() < 0
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_item.xml b/app/src/main/res/layout/item_list_item.xml
index a2bea4e6..3bb6418d 100644
--- a/app/src/main/res/layout/item_list_item.xml
+++ b/app/src/main/res/layout/item_list_item.xml
@@ -17,6 +17,7 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:cardCornerRadius="2dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a04efddb..6376d36e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,4 +22,6 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="red_700">#FFD32F2F</color>
+    <color name="ingredient_expired">#FBE9E7</color>
+    <color name="ingredient_consumed">#66000000</color>
 </resources>
\ No newline at end of file

From 53f94ef99f2b3fefbd1869647f860e26c57a8436 Mon Sep 17 00:00:00 2001
From: FaizaanRehman <FaizaanRehman@users.noreply.github.com>
Date: Sat, 25 Mar 2023 17:47:42 -0400
Subject: [PATCH 35/36] Add messages to expired/consumed ingredients. Prompt
 delete when quantity goes to 0

---
 .../example/inventory/ItemDetailFragment.kt   | 19 ++++++++++++++++---
 .../main/res/layout/fragment_item_detail.xml  | 15 +++++++++++++--
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  2 ++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
index d7b90374..00073bbc 100644
--- a/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemDetailFragment.kt
@@ -18,9 +18,7 @@ package com.example.inventory
 
 import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
-import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -34,6 +32,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.example.inventory.data.Item
 import com.example.inventory.data.getDaysToExpiry
+import com.example.inventory.data.hasExpired
+import com.example.inventory.data.isConsumed
 import com.example.inventory.databinding.FragmentItemDetailBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
@@ -83,7 +83,12 @@ class ItemDetailFragment : Fragment() {
             quantity.text = item.quantity.toString()
             decrementItem.isEnabled = viewModel.isStockAvailable(item)
             incrementItem.isEnabled = viewModel.isStockAvailable(item)
-            decrementItem.setOnClickListener { viewModel.sellItem(item) }
+            decrementItem.setOnClickListener {
+                viewModel.sellItem(item)
+                if (item.quantity <= 1) {
+                    showConfirmationDialog()
+                }
+            }
             incrementItem.setOnClickListener { viewModel.incrementItem(item) }
             deleteItem.setOnClickListener { showConfirmationDialog() }
             sendNotification.setOnClickListener { sendNotification() }
@@ -97,6 +102,14 @@ class ItemDetailFragment : Fragment() {
             binding.imageView.visibility = View.VISIBLE
         }
 
+        binding.message.visibility = View.VISIBLE
+        if (item.hasExpired()) {
+            binding.message.text = getString(R.string.expiry_hint)
+        } else if (item.isConsumed()) {
+            binding.message.text = getString(R.string.consumed_hint)
+        } else {
+            binding.message.visibility = View.GONE
+        }
     }
 
     /**
diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
index 42a7e46d..c475cb9c 100644
--- a/app/src/main/res/layout/fragment_item_detail.xml
+++ b/app/src/main/res/layout/fragment_item_detail.xml
@@ -22,6 +22,16 @@
     android:layout_margin="@dimen/margin"
     tools:context=".ItemDetailFragment">
 
+    <TextView
+        android:id="@+id/message"
+        style="@style/Widget.Inventory.TextView"
+        android:layout_width="wrap_content"
+        android:textColor="@color/message_hint"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone" />
+
     <TextView
         android:id="@+id/name_label"
         style="@style/Widget.Inventory.TextView"
@@ -30,15 +40,16 @@
         app:layout_constraintBaseline_toBaselineOf="@+id/name"
         app:layout_constraintEnd_toStartOf="@+id/name"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/message"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/name"
         style="@style/Widget.Inventory.TextView"
         android:layout_width="wrap_content"
+        android:layout_marginTop="@dimen/margin"
         app:layout_constraintStart_toEndOf="@+id/name_label"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/message"
         android:layout_marginStart="@dimen/margin_between_elements"
         tools:text="Apple" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6376d36e..ce45946e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,4 +24,5 @@
     <color name="red_700">#FFD32F2F</color>
     <color name="ingredient_expired">#FBE9E7</color>
     <color name="ingredient_consumed">#66000000</color>
+    <color name="message_hint">#810000</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b39f2b3a..bb463f53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,4 +45,6 @@
     <string name="ingredient">Ingredient</string>
     <string name="expiry_in">Expiry</string>
     <string name="findFoodbanks">Find nearby foodbanks</string>
+    <string name="expiry_hint">Ingredient expired. Please discard and delete.</string>
+    <string name="consumed_hint">Ingredient consumed. Please delete.</string>
 </resources>
\ No newline at end of file

From f1eaa64f963efd238139974d3c714477d85deeb4 Mon Sep 17 00:00:00 2001
From: "atayal@uwaterloo.ca" <anushka@hashicorp.com>
Date: Mon, 27 Mar 2023 17:11:23 -0400
Subject: [PATCH 36/36] search bar implemented

---
 .../example/inventory/InventoryViewModel.kt   | 17 ++++++++-------
 .../com/example/inventory/ItemListFragment.kt | 21 +++++++++++++++++++
 .../com/example/inventory/data/ItemDao.kt     |  5 ++++-
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/example/inventory/InventoryViewModel.kt b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
index f40318d0..5cd49e00 100644
--- a/app/src/main/java/com/example/inventory/InventoryViewModel.kt
+++ b/app/src/main/java/com/example/inventory/InventoryViewModel.kt
@@ -16,13 +16,10 @@
 
 package com.example.inventory
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.asLiveData
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.*
 import com.example.inventory.data.Item
 import com.example.inventory.data.ItemDao
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 /**
@@ -30,9 +27,15 @@ import kotlinx.coroutines.launch
  *
  */
 class InventoryViewModel(private val itemDao: ItemDao) : ViewModel() {
-
+    val allItems: MutableLiveData<List<Item>> = MutableLiveData<List<Item>>()
     // Cache all items form the database using LiveData.
-    val allItems: LiveData<List<Item>> = itemDao.getItems().asLiveData()
+    //    val allItems: LiveData<List<Item>> = itemDao.getItems().asLiveData()
+
+    fun getItems(searchString: String=""){
+        viewModelScope.launch(Dispatchers.IO) {
+            allItems.postValue(itemDao.getSearchedItems(searchString))
+        }
+    }
 
     /**
      * Returns true if stock is available to sell, false otherwise.
diff --git a/app/src/main/java/com/example/inventory/ItemListFragment.kt b/app/src/main/java/com/example/inventory/ItemListFragment.kt
index c50f11a5..1e01cd53 100644
--- a/app/src/main/java/com/example/inventory/ItemListFragment.kt
+++ b/app/src/main/java/com/example/inventory/ItemListFragment.kt
@@ -22,6 +22,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.SearchView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
@@ -75,6 +76,21 @@ class ItemListFragment : Fragment() {
             this.findNavController().navigate(action)
         }
 
+        binding.grocerySearchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener,
+            androidx.appcompat.widget.SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(p0: String?): Boolean {
+                return true
+            }
+
+            override fun onQueryTextChange(p0: String?): Boolean {
+                p0?.let {
+                    viewModel.getItems(p0)
+                }
+                return true
+            }
+
+        })
+
         binding.foodBankButton.setOnClickListener {
             val gmmIntentUri = Uri.parse("geo:0,0?q=food donation")
             val mapIntent = Intent(Intent.ACTION_VIEW, gmmIntentUri)
@@ -82,4 +98,9 @@ class ItemListFragment : Fragment() {
             startActivity(mapIntent)
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.getItems()
+    }
 }
diff --git a/app/src/main/java/com/example/inventory/data/ItemDao.kt b/app/src/main/java/com/example/inventory/data/ItemDao.kt
index 08ef0b4f..0fdb867d 100644
--- a/app/src/main/java/com/example/inventory/data/ItemDao.kt
+++ b/app/src/main/java/com/example/inventory/data/ItemDao.kt
@@ -28,10 +28,13 @@ import kotlinx.coroutines.flow.Flow
  */
 @Dao
 interface ItemDao {
-
+    //    @Query("SELECT * from item where name like '%'||:searchText||'%'")
     @Query("SELECT * from item ORDER BY name ASC")
     fun getItems(): Flow<List<Item>>
 
+    @Query("SELECT * from item where name like '%'||:searchText||'%'")
+    fun getSearchedItems(searchText:String):List<Item>
+
     @Query("SELECT * from item WHERE id = :id")
     fun getItem(id: Int): Flow<Item>