Commit Graph

65 Commits

Author SHA1 Message Date
LilleBRG
4a935514cf updates to editrecipe 2025-05-14 11:58:49 +02:00
LilleBRG
5c924026ed Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-14 09:53:48 +02:00
LilleBRG
4b8dcb865c changed addrecipe to shoppinglist 2025-05-14 09:53:46 +02:00
37757cbf46
Reload dish list after generating, fix ingredient list when no amount 2025-05-14 09:30:52 +02:00
LilleBRG
fd85841daf changed multiplier to string, kotlin weird 2025-05-14 09:17:16 +02:00
6e72f549cf
Add buttons for incrementing/decrementing portion size, fix decimal numbers 2025-05-14 08:40:36 +02:00
48b3622542
Redesign dish details page 2025-05-13 22:09:50 +02:00
7a25b0708b
Implement editing shopping items 2025-05-13 21:19:42 +02:00
LilleBRG
b04f385bdb very close to add to shopping list wrks 2025-05-13 15:52:41 +02:00
LilleBRG
2c22f8d8e1 more fixes idk 2025-05-13 15:38:11 +02:00
LilleBRG
1e01d1ee90 fixed errors in merge 2025-05-13 15:24:25 +02:00
LilleBRG
12427a85f8 merge 2025-05-13 15:14:54 +02:00
LilleBRG
00cc8101f1 need to merge but trying to add recipe to shoppinglist 2025-05-13 15:11:57 +02:00
dbb25a394d
Use popup menu for creating dish 2025-05-13 14:56:34 +02:00
1c085a4262
Finish generating recipe, refactor directions property and request helpers 2025-05-13 12:59:18 +02:00
4772c0ef26
Create recipe fragment 2025-05-13 12:42:09 +02:00
LilleBRG
cb2df85e5b merge 2025-05-13 10:56:42 +02:00
LilleBRG
56017f745d dishlist works and dishgdetails soon done 2025-05-13 10:55:24 +02:00
59af36b3f2
Use string array for directions in recipes 2025-05-13 10:33:39 +02:00
f0e7e67d77
Allow generating recipes with AI 2025-05-13 10:33:39 +02:00
LilleBRG
b882bc09a7 create and diushlist works 2025-05-09 17:03:50 +02:00
LilleBRG
5c1a569906 made new getallrecipedto and return on getallrecipe 2025-05-09 10:22:02 +02:00
LilleBRG
3b01992eed code towards create manual and getallrecipies made but not working 2025-05-08 18:48:59 +02:00
LilleBRG
80e52cd22b Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-08 12:12:04 +02:00
LilleBRG
799ddb76e5 made modal for ai and manual creation of dish 2025-05-08 12:12:00 +02:00
1b4f9059f4
Fix adding items of the same name on frontend 2025-05-08 11:52:54 +02:00
df0c951100
Add progress bar and empty message to shopping list 2025-05-08 11:02:25 +02:00
fa877b2c5e
Show shopping item immediately as it is added to the list 2025-05-08 11:02:25 +02:00
39bcdd9a9b
Implement deleting shopping items 2025-05-08 11:02:25 +02:00
b3b4562f21
Allow checking/unchecking shopping items 2025-05-08 10:06:48 +02:00
f924d2083b
Show shopping list 2025-05-08 10:06:48 +02:00
LilleBRG
dc7e94b37b merge 2025-05-07 13:52:43 +02:00
LilleBRG
536b693085 create dish done but not checked with api 2025-05-07 13:51:54 +02:00
f9296f05c1
Implement adding items to shopping list 2025-05-07 13:34:58 +02:00
87b5fbb014
Update profile page immediately as user info has changed 2025-05-06 14:37:48 +02:00
bdd7a0dfdb
Group activities and fragments by domain 2025-05-06 08:50:09 +02:00
0c1f167e20
Implement updating username/email and changing password and logout 2025-05-05 13:24:46 +02:00
a446ad934c
Add button to add shopping item 2025-05-05 13:23:56 +02:00
LilleBRG
16d1d3459d creadish layout done and ready to test http connection on monday 2025-05-02 18:17:26 +02:00
7c45526563
Add profile page, implement authentication 2025-05-01 12:04:19 +02:00
LilleBRG
9d9a2975f5 create dish button moved to dishesfragment 2025-05-01 10:13:52 +02:00
a63b98e180
Save tokens when logging in and implement refresh token 2025-05-01 09:43:21 +02:00
d00bace5b7
Add progress dialogs when signing up/logging in 2025-04-30 13:23:52 +02:00
dfa9abc4b9
Fix errors in api calls, move base url to gradle properties 2025-04-30 12:31:54 +02:00
0f791cc642
Merge branch 'master' into api-connection 2025-04-29 13:57:21 +02:00
5e32ad7133
Implement registering user 2025-04-29 13:55:50 +02:00
93057d43d5
Implement send http requests to the api 2025-04-29 13:18:43 +02:00
LilleBRG
6743e9c7aa multiple ingredient rows can now be added 2025-04-29 09:56:44 +02:00
LilleBRG
1aa98f2bcf fixed double dish list 2025-04-28 13:59:47 +02:00
LilleBRG
4f5c0de725 fixed errors 2025-04-28 13:58:31 +02:00