Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
7a1c261
chetan stuff
Ckalia11 Mar 7, 2023
bb0d16c
Created barebones front end for Search and Filter
Mar 8, 2023
d22b5fc
got an additional itemSum field working on all screens.
Ckalia11 Mar 8, 2023
e7d6834
Added Search Bar and Filter Buttons to Home page
Mar 8, 2023
a3396f9
Search Bar and harizontal filters Front End
Mar 8, 2023
f619363
Add Button send to top of search
Mar 8, 2023
4a97b9f
Horizontal Padding added to Filter Buttons
Mar 8, 2023
295aea9
Fixed Button Styling
Mar 9, 2023
a10702d
updated form and all screens to use food expiry information. fixed it…
Ckalia11 Mar 9, 2023
5f6456a
Merge pull request #1 from Ckalia11/chetan-branch
Ckalia11 Mar 9, 2023
1a98ee5
Added push notification button on details page
FaizaanRehman Mar 9, 2023
db102f6
Minimal implementation of image mock
Mar 9, 2023
81b901f
Added new fields to Database schema
FaizaanRehman Mar 9, 2023
e6e2726
Fixed ordering of Labels and Owner fields in homepage UI
Ckalia11 Mar 9, 2023
432c80f
Merge pull request #6 from Ckalia11/feature/update-database
FaizaanRehman Mar 9, 2023
c4cd20f
Merge branch 'main' into feature/push-notifications
FaizaanRehman Mar 10, 2023
ad0fbc2
Merge pull request #7 from Ckalia11/fix_homepage_ui
Ckalia11 Mar 10, 2023
cc1727c
Merge pull request #5 from Ckalia11/feature/demo-camera
Ckalia11 Mar 10, 2023
2db39e8
Merge branch 'main' into feature/push-notifications
FaizaanRehman Mar 10, 2023
35e8ad3
Merge pull request #8 from Ckalia11/feature/push-notifications
FaizaanRehman Mar 10, 2023
bda7ecd
Added file upload, need help persisting images
Mar 11, 2023
43ae832
Updated layout of columns and alignment on main page
FaizaanRehman Mar 11, 2023
4c84b68
Merge pull request #10 from Ckalia11/feature/align-columns
BenjaminLuo Mar 11, 2023
86d97c6
Merge pull request #11 from Ckalia11/feature/file_upload
BenjaminLuo Mar 13, 2023
b97fc01
Update AddItemFragment.kt
BenjaminLuo Mar 13, 2023
b23dbf2
renaming db attributes throughout app
t-tanveer Mar 13, 2023
1a57927
Add DatePicker dialog to set expiry date
Mar 13, 2023
0f51cfe
Merge pull request #12 from Ckalia11/task/refactor-db
t-tanveer Mar 13, 2023
46dfb9e
Merge branch 'demo' into feature/datepicker
Mar 13, 2023
d82a087
Update naming
Mar 13, 2023
298acea
testing permissions
tayyaab-wonolo Mar 13, 2023
e459bea
Merge pull request #15 from tayyaab-wonolo/patch-1
tayyaab-wonolo Mar 13, 2023
d59fee2
Revert "testing permissions"
tayyaab-wonolo Mar 13, 2023
bfd5f41
Merge pull request #16 from Ckalia11/revert-15-patch-1
tayyaab-wonolo Mar 13, 2023
8d45f89
Merge pull request #14 from Ckalia11/demo
tayyaab-wonolo Mar 13, 2023
b14f65a
Add buttons on the detail screen to increment and decrement quantity …
Ckalia11 Mar 13, 2023
ec149e9
renamed sell item id in detail layout to decrement item
Ckalia11 Mar 13, 2023
4efb5b5
minor fix - date formatting
t-tanveer Mar 13, 2023
0c1f9f4
Merge pull request #17 from Ckalia11/change_quantity_button
BenjaminLuo Mar 13, 2023
80ac5a0
Merge pull request #13 from Ckalia11/feature/datepicker
Ckalia11 Mar 13, 2023
52248c6
changed homescreen display to show days from expiry instead of expiry…
Ckalia11 Mar 14, 2023
31135d0
Merge pull request #18 from Ckalia11/fix_display_of_expiry_dates
Ckalia11 Mar 14, 2023
50f21f6
Make push notifications automatic by running a periodic function to c…
FaizaanRehman Mar 18, 2023
e025e18
display error messages in add/upload forms
Ckalia11 Mar 19, 2023
d9f478d
allowed users to type in a 2 decimal double instead of an int for the…
Ckalia11 Mar 19, 2023
cd9c79e
Merge pull request #21 from Ckalia11/allow_decimal_values_for_quantit…
BenjaminLuo Mar 19, 2023
cccc4c6
Merge pull request #20 from Ckalia11/display_errors_in_add_form
BenjaminLuo Mar 19, 2023
3332f18
Enabled image persistence upon app restart
Mar 19, 2023
c4c7539
Hotfix for app crashing when not uploading any photos
Mar 19, 2023
87b3c17
Merge pull request #19 from Ckalia11/feature/automatic-notifications
FaizaanRehman Mar 20, 2023
43d42c9
Fixed app crashing upon edit
Mar 21, 2023
cb9c5ff
got recipes from API and parsed into objects
Ckalia11 Mar 22, 2023
5ae5741
Merge branch 'main' into hotfix/upload-picture
BenjaminLuo Mar 23, 2023
abc1189
Merge pull request #25 from Ckalia11/hotfix/upload-picture
BenjaminLuo Mar 23, 2023
556952e
Fixed disappearing image bug upon edit
Mar 23, 2023
74ef538
Add button to launch google maps and search for food banks
FaizaanRehman Mar 23, 2023
98bf510
Merge pull request #27 from Ckalia11/feature/map
Ckalia11 Mar 24, 2023
6f9a801
Merge pull request #26 from Ckalia11/hotfix/disappearing-image-on-edit
Ckalia11 Mar 24, 2023
c09a6c0
Format ingredients in list based on expired or consumed
FaizaanRehman Mar 24, 2023
7a7ee24
Merge pull request #28 from Ckalia11/feature/consume-ingredient
BenjaminLuo Mar 25, 2023
9013a16
Implemented camera tool, added button icons
Mar 25, 2023
7023896
Implemented camera tool, added button icons
Mar 25, 2023
53f94ef
Add messages to expired/consumed ingredients. Prompt delete when quan…
FaizaanRehman Mar 25, 2023
201ca74
implement simple recyclerView
t-tanveer Mar 26, 2023
b955230
displayed recipe name and image in the RecyclerView
Ckalia11 Mar 26, 2023
aec85f5
Merge pull request #32 from Ckalia11/chetan-recipe-feature
Ckalia11 Mar 26, 2023
ff45124
logged recipe title and image in recipe detail page for any recipe in…
Ckalia11 Mar 27, 2023
5ad415f
Merge pull request #33 from Ckalia11/add_recipe_detail_page
Ckalia11 Mar 27, 2023
3effa56
Merge pull request #30 from Ckalia11/feature/messages
Ckalia11 Mar 27, 2023
f1eaa64
search bar implemented
anushkatayal Mar 27, 2023
f657339
refactoring of file names and navgraph conenctions
Ckalia11 Mar 28, 2023
b69aaeb
Merge pull request #35 from Ckalia11/develop_recipe_detail_screen
Ckalia11 Mar 28, 2023
02a3df6
fixed arguments to pass in missedIngredients as a String
Ckalia11 Mar 28, 2023
6f86e53
Merge pull request #34 from Ckalia11/anushka/search-bar
Ckalia11 Mar 28, 2023
aeeccce
Implemented Parcelable interface for Recipe and Ingredient data class…
Ckalia11 Mar 29, 2023
2d2c1fc
Merge pull request #36 from Ckalia11/build_recipe_detail_screen
Ckalia11 Mar 29, 2023
7fee91e
Displayed recipe image in circle and created labels for missing and u…
Ckalia11 Mar 29, 2023
cfe2452
Merge pull request #37 from Ckalia11/display_recipe_details
Ckalia11 Mar 29, 2023
4e4daf2
New dropdowns
Mar 29, 2023
90e57fd
Created Ingredient Adapater and recycler views to display used and mi…
Ckalia11 Mar 29, 2023
39c406d
Merge pull request #39 from Ckalia11/create_list_to_display_missed_in…
Ckalia11 Mar 29, 2023
ce079df
parse ingredients from csv and default unit=count
t-tanveer Mar 29, 2023
d92c583
Merge pull request #38 from Ckalia11/feature/new-dropdowns
t-tanveer Mar 29, 2023
1947612
Added function to query database for items with selected label
Mar 29, 2023
fa7051e
Function added to get list of labels from db
Mar 29, 2023
3b16e35
bring branch upto-date
t-tanveer Mar 29, 2023
74d58e9
add spacing between items in missed and unused ingredients
Ckalia11 Mar 29, 2023
a123326
Merge pull request #29 from Ckalia11/feature/camera-tool
BenjaminLuo Mar 29, 2023
871abfa
Added recycler view to display dietary restrictions
Ckalia11 Mar 30, 2023
94d9b54
wip
Ckalia11 Mar 30, 2023
945be16
Merge pull request #40 from Ckalia11/clean_up_ingredients_list_detail…
Ckalia11 Mar 30, 2023
80839c5
displayed button(s) for dietary restrictions on recipe detail screen
Ckalia11 Mar 30, 2023
42add3e
Merge pull request #42 from Ckalia11/add_dietary_restrictions
Ckalia11 Mar 30, 2023
4c60b15
Add new table for labels and give access in view model
FaizaanRehman Mar 30, 2023
cf9c4c0
Enter custom labels, and save new ones too
FaizaanRehman Mar 31, 2023
5848fc0
fixed dietary restriction blue field on recipe detail screen to not t…
Ckalia11 Mar 31, 2023
c110b35
parsed JSON response from Recipe Instructions API endpoint into data …
Ckalia11 Mar 31, 2023
8cf2789
Merge pull request #44 from Ckalia11/fix_dietary_restriction_button
Ckalia11 Mar 31, 2023
9d037e5
Hotfix: Can now modify which image you uploaded, fixed padding issue
Mar 31, 2023
661c42a
Feature: Validation against unrecognized food names
Mar 31, 2023
a42d29f
Add default labels back into dropdown
FaizaanRehman Mar 31, 2023
146ec09
handled case when there is no instruction for recipe and displayed li…
Ckalia11 Mar 31, 2023
4d27924
Merge pull request #47 from Ckalia11/display_recipe_instructions
Ckalia11 Mar 31, 2023
89f8b77
Add navigation bar to bottom of screen
FaizaanRehman Mar 31, 2023
e54c729
Merge pull request #43 from Ckalia11/feature/custom-labels
t-tanveer Apr 1, 2023
6dac283
merge MAIN into branch
t-tanveer Apr 1, 2023
3a0459b
Merge pull request #45 from Ckalia11/hotfix/change-selected-image
t-tanveer Apr 1, 2023
8632067
Merge branch 'main' into feature/no-unrecognized-food-names
t-tanveer Apr 1, 2023
74a69bc
quick fix for error states not showing on off-focus and edit
t-tanveer Apr 1, 2023
95d6cb5
Merge pull request #46 from Ckalia11/feature/no-unrecognized-food-names
t-tanveer Apr 1, 2023
09f1938
Merge pull request #48 from Ckalia11/feature/bottom-navigation
t-tanveer Apr 1, 2023
57dc7db
merge MAIN into branch :)
t-tanveer Apr 1, 2023
6c58df3
Merge pull request #49 from Ckalia11/recipe_feature
t-tanveer Apr 1, 2023
ac8d72d
Added database queries
Apr 1, 2023
675983c
Filter buttons working. Added 13 Predefined labels to Add Item screen
Apr 2, 2023
1993262
Dropdown Fixes
Apr 2, 2023
10f2bc6
Merge branch 'main' into filterDropDown
Sidallica Apr 2, 2023
cf1a548
Merge pull request #50 from Ckalia11/filterDropDown
Sidallica Apr 2, 2023
8719bb0
Merge branch 'main' into dropdown-fixes
Apr 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ plugins {
id 'kotlin-android'
id 'androidx.navigation.safeargs.kotlin'
id 'com.google.devtools.ksp' version '1.8.0-1.0.8'
id 'kotlin-parcelize'
}

android {
compileSdkVersion 33

defaultConfig {
applicationId "com.example.inventory"
minSdkVersion 19
minSdkVersion 26
targetSdkVersion 33
versionCode 1
versionName "1.0"
Expand Down Expand Up @@ -61,6 +62,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"
Expand All @@ -71,6 +75,17 @@ dependencies {

// Room libraries
implementation "androidx.room:room-runtime:$room_version"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
ksp "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"

// Recipe libraries
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.mikhaellopez:circularimageview:4.3.1'
}
7 changes: 5 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,20 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.INTERNET" />
<application
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">
<activity
android:exported="true"
android:name="com.example.inventory.MainActivity">
android:name="com.example.inventory.MainActivity"
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
Loading