sync main #1

Merged
apoloz merged 357 commits from :main into main 2024-06-21 10:46:00 +00:00

357 Commits

Author SHA1 Message Date
apoloz
4dca1f1dec Merge pull request 'feat(ci): add artifact' (#96) from mso7nueh/eatvio_app_mso7nueh:main into main
Some checks failed
Android Release / build (pull_request) Failing after 3m7s
Eatvio App Android Test / build (pull_request) Successful in 8m6s
Reviewed-on: eatvio/eatvio_app#96
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-06-21 10:13:38 +00:00
mso7nueh
6d99b7fe9f feat(ci): v3 2024-06-21 13:01:56 +03:00
mso7nueh
d8fe9841f9 feat(ci): v4 gitea 2024-06-21 12:57:47 +03:00
mso7nueh
1fd68a9554 feat(ci): v4 2024-06-21 12:45:15 +03:00
mso7nueh
b2785d635f feat(ci): add env 2024-06-21 12:33:27 +03:00
mso7nueh
cd955ca4b9 feat(ci): add artifact 2024-06-21 12:19:00 +03:00
apoloz
b70c2a466a Merge pull request 'feat(ci): build apk' (#95) from mso7nueh/eatvio_app_mso7nueh:main into main
Reviewed-on: eatvio/eatvio_app#95
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-06-21 09:17:09 +00:00
apoloz
f3545b892d Update .gitea/workflows/test.yml 2024-06-21 09:06:52 +00:00
apoloz
bae84fd6cf Update .gitea/workflows/test.yml 2024-06-21 09:02:21 +00:00
mso7nueh
b21409116a feat(ci): error ignore 2024-06-21 11:57:54 +03:00
mso7nueh
68bef1b0cd feat(ci): back 2024-06-21 11:52:21 +03:00
mso7nueh
75dfc19eb1 feat(ci): sdk manager 2024-06-21 11:47:30 +03:00
mso7nueh
746f39a056 feat(ci): install sdk manager 2024-06-21 11:41:46 +03:00
mso7nueh
22285017e1 feat(ci): remove 2024-06-21 11:39:42 +03:00
mso7nueh
eb2312d2d7 feat(ci): add sdk manager 2024-06-21 11:32:29 +03:00
mso7nueh
c04e8118c7 feat(ci); accept lic 2024-06-21 11:09:20 +03:00
mso7nueh
2d92b2da72 feat(ci): accept lic 2024-06-21 11:02:08 +03:00
mso7nueh
4e761901e3 feat(ci): add flutter docotor 2024-06-21 10:17:01 +03:00
mso7nueh
104c0c993c feat(ci): android home 2024-06-20 15:42:52 +03:00
mso7nueh
6a240ddcf9 feat(ci): jq 2024-06-20 14:18:32 +03:00
mso7nueh
a83db37a2d feat(ci): jq 2024-06-20 14:15:40 +03:00
mso7nueh
5ecd3fcccd feat(ci): remove sdk manager 2024-06-20 13:55:38 +03:00
mso7nueh
3c22baae33 feat(ci): add sdk home 2024-06-20 13:49:39 +03:00
mso7nueh
273c08d374 feat(ci): debug sdk_home 2024-06-20 13:37:27 +03:00
mso7nueh
cca2768d3d feat(ci): move config 2024-06-19 19:59:52 +03:00
mso7nueh
045f967cec feat(ci): move config 2024-06-19 19:52:38 +03:00
mso7nueh
4ecce48172 feat(ci): flutter config sdk 2024-06-19 19:50:29 +03:00
mso7nueh
08c6f6d584 feat(ci): fix home + chat search 2024-06-19 17:34:50 +03:00
mso7nueh
bac1d2ccb6 feat(ci): export sdk root 2024-06-19 17:25:31 +03:00
mso7nueh
f540154ba7 feat(ci): remove licenses 2024-06-19 17:17:14 +03:00
mso7nueh
00b3ea3447 feat(ci): remove sudo 2024-06-19 17:13:26 +03:00
mso7nueh
0be58ac6a3 feat(ci): sdk not found 2024-06-19 17:11:32 +03:00
mso7nueh
70f6ea5d97 feat(ci): licenses agree 2024-06-19 17:05:20 +03:00
mso7nueh
2e4545d5a6 feat(ci): <sdk>/cmdline-tools/latest/ 2024-06-19 17:02:12 +03:00
mso7nueh
96f5fa3d12 feat(ci): add android sdk without sudo 2024-06-19 16:58:11 +03:00
mso7nueh
943502f78d feat(ci): add android sdk install for mac 2024-06-19 16:51:01 +03:00
mso7nueh
cd68e9db30 feat(ci): add android sdk install 2024-06-19 16:47:40 +03:00
mso7nueh
657dfdc142 feat(ci): build test apk 2024-06-19 16:39:27 +03:00
mso7nueh
55cb15896b Merge branch 'main' into main 2024-06-19 13:37:36 +00:00
mso7nueh
25aeef9426 feat(ci): build apk 2024-06-19 16:36:36 +03:00
apoloz
ce2e00585e Merge pull request 'sync from mso7 to eatvio' (#94) from mso7nueh/eatvio_app_mso7nueh:main into main
Reviewed-on: eatvio/eatvio_app#94
2024-06-19 13:06:32 +00:00
mso7nueh
76d33623c7 refactor(fix): performance metrics 2024-06-19 16:00:18 +03:00
mso7nueh
4b22f1c638 refactor(fix): bottomBar 2024-06-19 14:38:21 +03:00
Anatoliy Poloz
f8541e3a17 Merge ssh://10.55.5.123:222/maxxkim/eatvio_app 2024-06-19 14:32:50 +03:00
mso7nueh
f15c893a41 Merge branch 'main' into main 2024-06-19 11:07:16 +00:00
mso7nueh
7329c5747f refactor(analyzer): add ignore JsonKey 2024-06-19 14:03:20 +03:00
Anatoliy Poloz
662d0bab2c merge fromdiary to main 2024-06-19 12:12:00 +03:00
mso7nueh
dd6e343736 feat(chat): add image gallery and file loading, request for websocket 2024-06-18 13:10:58 +03:00
mso7nueh
45bd1e4356 refactor(gradle+chat): migrate gradle version + chat screen 2024-06-13 18:41:39 +03:00
mso7nueh
b52251a9d1 feat(chat): bubbles 2024-06-13 17:28:53 +03:00
mso7nueh
46d374d87e feat(chat): text field 2024-06-11 15:38:59 +03:00
apoloz
9c3f69de69 Merge pull request 'GoRouter finished' (#87) from mso7nueh/eatvio_app_mso7nueh:main into diary
Reviewed-on: https://gittea.eatv.io/eatvio/eatvio_app/pulls/87
2024-06-11 12:30:26 +00:00
mso7nueh
1d47e28202 refactor(go_router): add pages to go router, fix screens 2024-06-11 11:57:45 +03:00
mso7nueh
ddc908da57 go router fix 2024-06-11 05:13:30 +03:00
mso7nueh
647e9e9133 go router full 2024-06-06 16:02:39 +03:00
mso7nueh
7b55204659 go router 3 2024-06-06 13:50:00 +03:00
mso7nueh
4e62ebe60d go router 2 2024-06-06 13:42:56 +03:00
mso7nueh
d49030c3dd go router 2 2024-06-06 13:42:46 +03:00
mso7nueh
8de91e6f7e fixes warning 2024-06-05 17:40:09 +03:00
mso7nueh
c9f825c374 fixes 2024-06-05 17:39:53 +03:00
b7101c72ec Merge pull request 'diary' (#2) from eatvio/eatvio_app:diary into main
Reviewed-on: mso7nueh/eatvio_app_mso7nueh#2
2024-06-05 13:46:11 +00:00
51875dd802 Merge pull request 'feat(app): Keyboard dismisser and FocusNode fix' (#86) from maxxkim/eatvio_app:revert into diary
Reviewed-on: eatvio/eatvio_app#86
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 13:45:52 +00:00
2899c2220a feat(app): Keyboard dismisser and FocusNode fix 2024-06-05 16:41:26 +03:00
aa66f25aa4 Merge pull request 'diary' (#1) from eatvio/eatvio_app:diary into main
Reviewed-on: mso7nueh/eatvio_app_mso7nueh#1
2024-06-05 13:26:22 +00:00
28ded0267b Merge pull request 'Recipe layouts' (#85) from maxxkim/eatvio_app:revert into diary
Reviewed-on: eatvio/eatvio_app#85
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 13:25:14 +00:00
6947b9bea0 feat(app): Recipe layouts 2024-06-05 16:20:14 +03:00
f4b331f280 Merge pull request 'diary' (#31) from eatvio/eatvio_app:diary into revert
Reviewed-on: maxxkim/eatvio_app#31
2024-06-05 12:33:53 +00:00
c28bb3fcd1 Merge pull request 'main' (#83) from mso7nueh/eatvio_app_mso7nueh:main into diary
Reviewed-on: eatvio/eatvio_app#83
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 12:15:50 +00:00
2b9e85e342 Merge pull request 'revert' (#82) from maxxkim/eatvio_app:revert into diary
Reviewed-on: eatvio/eatvio_app#82
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 11:33:14 +00:00
316a525e8d Merge pull request 'revert 8c8bcb4aab967c5b036f5c6b09899e3362487e34' (#80) from maxxkim-patch-3 into main
Reviewed-on: eatvio/eatvio_app#80
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 11:17:35 +00:00
627a16fd14 Merge pull request 'revert dbc0e7aad2b1f2b1a654bd3c57dc624f40113d51' (#81) from maxxkim-patch-4 into main
Reviewed-on: eatvio/eatvio_app#81
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 11:16:53 +00:00
527c89f01f Merge pull request 'revert e72a55f8760296cce741cb36d7eef570703f05dd' (#79) from maxxkim-patch-1 into main
Reviewed-on: eatvio/eatvio_app#79
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 11:15:48 +00:00
d061adba26 revert dbc0e7aad2
revert revert f0506dfe6c

revert feat(app) Keyboard dismisser implemented
2024-06-05 11:11:41 +00:00
16f2ed6d98 revert 8c8bcb4aab
revert fix(app): merge conflict fix
2024-06-05 11:11:06 +00:00
8dd85fdf1a revert e72a55f876
revert revert 6b997a69fe

revert refactor(app): Some issues fixed
2024-06-05 11:09:51 +00:00
4bf827ba1b Merge pull request 'revert 6b997a69fe7f69d53c776736f1a45c088571087e' (#78) from maxxkim-patch-2 into main
Reviewed-on: eatvio/eatvio_app#78
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 11:06:18 +00:00
e72a55f876 revert 6b997a69fe
revert refactor(app): Some issues fixed
2024-06-05 11:00:45 +00:00
5e8bae56f7 revert 8c8bcb4aab
revert fix(app): merge conflict fix
2024-06-05 10:39:58 +00:00
mso7nueh
fc743727c2 fix style! warning 2024-06-05 13:23:02 +03:00
mso7nueh
bd88d80034 fix style warning 2024-06-05 13:13:35 +03:00
d3c896f384 Merge pull request 'revert f0506dfe6c4209038d7c395c6f443cfb59d20c5c' (#71) from maxxkim-patch-1 into main
Reviewed-on: https://gittea.eatv.io/eatvio/eatvio_app/pulls/71
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-05 10:05:08 +00:00
mso7nueh
60c372fb4c fix warnings 2024-06-05 12:53:38 +03:00
dbc0e7aad2 revert f0506dfe6c
revert feat(app) Keyboard dismisser implemented
2024-06-05 09:53:09 +00:00
mso7nueh
1951edd8f8 go router 2024-06-05 12:52:03 +03:00
DmitriyLabutin
ed0c3fcef1 fix warnings 2024-06-04 18:02:00 +03:00
a07a0fef12 Merge pull request 'Keyboard dismisser, focusNode fix for CustomTextField, SafeArea inside Scaffold' (#66) from maxxkim/eatvio_app:main into main
Reviewed-on: https://gittea.eatv.io/eatvio/eatvio_app/pulls/66
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-04 10:09:23 +00:00
28a205f3e7 Merge branch 'main' into main 2024-06-04 10:03:16 +00:00
8c8bcb4aab fix(app): merge conflict fix 2024-06-04 12:58:14 +03:00
3d08c3e76c fix(app): merge conflict fix 2024-06-04 12:57:57 +03:00
f2921a5136 refactor(app): Fix 2024-06-04 12:42:32 +03:00
DmitriyLabutin
425c6600ae go router + bottom nav bar 2024-06-04 12:35:12 +03:00
4642629edf Merge pull request 'Keyboard dismisser implemented' (#62) from maxxkim/eatvio_app:keyboard_dismiss into main
Reviewed-on: https://gittea.eatv.io/eatvio/eatvio_app/pulls/62
Reviewed-by: mike <reshetnick.mike@gmail.com>
2024-06-04 09:30:35 +00:00
6b997a69fe refactor(app): Some issues fixed 2024-06-04 10:13:21 +03:00
05ba633361 Merge pull request 'feat(app): SafeArea insets refactoring' (#26) from refactoring into main
Reviewed-on: maxxkim/eatvio_app#26
2024-06-03 13:09:10 +00:00
d9e846fe53 Merge pull request 'feat(app) Keyboard dismisser implemented' (#25) from keyboard_dismiss into main
Reviewed-on: maxxkim/eatvio_app#25
2024-06-03 13:08:53 +00:00
795dc48629 feat(app): SafeArea insets refactoring 2024-06-03 16:00:48 +03:00
DmitriyLabutin
ffcf1a98f4 debugShowCheckedModeBanner 2024-06-03 12:12:54 +03:00
d3a041d951 Merge pull request 'Main branch update' (#24) from diary into main
Reviewed-on: maxxkim/eatvio_app#24
2024-06-03 08:54:12 +00:00
f0506dfe6c feat(app) Keyboard dismisser implemented 2024-06-03 10:57:56 +03:00
apoloz
de1e5c8538 Merge pull request 'Изменил переходы, обернув роуты в новый класс' (#61) from maxxkim/eatvio_app:glossary into main
Reviewed-on: eatvio/eatvio_app#61
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-05-29 09:12:50 +00:00
1d1e25b1dd feat(recipe): Recipe create layouts 2024-05-28 14:23:49 +03:00
b80eb6b33a feat(app): Fade transition applied 2024-05-27 16:57:26 +03:00
apoloz
2396b87cdb Merge pull request 'Запилил глоссарий: все необходимые классы, контроль состояний, верстка, коннкет АПИ (загрузка и отображение продуктов и их категорий)' (#60) from maxxkim/eatvio_app:glossary into main
Reviewed-on: eatvio/eatvio_app#60
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-05-24 12:57:10 +00:00
563024a661 refactor(glossary): Removed unused model argument 2024-05-24 15:26:32 +03:00
1c17a93428 feat(glossary): Glossary layouts and catergory load and change API 2024-05-24 15:01:59 +03:00
apoloz
3c6bc4530b Merge pull request 'Новый функционал ленты и верстка:' (#58) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#58
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
fixes #57
fixes #56
fixes #50
2024-05-23 16:50:42 +00:00
20126c912a feat(glossary): Classes, state management and routing for glossary 2024-05-23 13:52:39 +03:00
8c0021f413 feat(feed):= Front-end validation and improved layouts for BloGPosts 2024-05-23 12:08:55 +03:00
e262c6993a feat(feed): Search field (static), menu bar added. Feed and comment scroll fixed 2024-05-22 15:23:55 +03:00
6ad23e240f feat(feed): Comment creation API and state update 2024-05-21 16:04:00 +03:00
35bafdc701 feat(feed): Author name and avatar fetched from API 2024-05-21 12:30:49 +03:00
8dbc7de7f3 Merge branch 'diary' of ssh://10.55.5.123:222/maxxkim/eatvio_app into diary
asdasd# Please enter a commit message to explain why this merge is necessary,
2024-05-21 11:38:10 +03:00
0eab98cb79 feat(feed): Layouts by Figma for feed 2024-05-21 11:37:57 +03:00
a27355516c refactor(feed): Removed unused class and changed reply button size 2024-05-20 17:29:19 +03:00
4642fea47e feat(feed): BlogPost comment creation event and API 2024-05-20 16:07:00 +03:00
e71f15f664 feat(feed): Blog post show layouts finished 2024-05-20 12:00:59 +03:00
705dd15bf0 feat(feed): Figma layouts implementation 2024-05-17 10:58:23 +03:00
02cd34a4ad feat(feed): Comment and author info display 2024-05-16 16:04:04 +03:00
fc8301bbe1 feat(feed): Fetching author and comments for blog posts 2024-05-15 14:49:19 +03:00
6cdd0ac2a6 feat(feed): Author fetch API connect 2024-05-15 14:33:15 +03:00
apoloz
b64a5fed6b Merge pull request 'Сделал экраны чата, ленты, блог постов, рецептов, диет и планов, подвязал к ним API методы' (#54) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#54
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-05-14 13:57:58 +00:00
660d846b66 refactor(app): Native analysys and warning refactoring 2024-05-14 16:46:28 +03:00
8770177a50 feat(app): Delete methods for recipes, blog posts, diets and plans 2024-05-14 15:04:24 +03:00
a440d31ab6 feat(recipe): Main menu buttons and API implementtion 2024-05-14 12:14:33 +03:00
a32117953d feat(recipe): Layout state and navigation for Recipe create & update 2024-05-14 11:05:31 +03:00
fb2ebe5a70 feat(plans) Plans create and edit API connect, TextController management and redirect 2024-05-13 17:15:07 +03:00
e7e48905cf feat(diets) Diets create and edit API connect, TextController management and redirect 2024-05-13 16:21:23 +03:00
1ad58f8f42 feat(feed) Blog post edit API connect, TextController management and redirect 2024-05-13 12:49:47 +03:00
96ad5a7cfb Blog post edit layouts and BloC 2024-05-13 11:53:42 +03:00
76a29ebf67 feat(app): Feed, recipe, blog posts, diet and plan show and index pages, state management, API implementation and layouts 2024-05-08 14:11:18 +03:00
404b22e78a fix(version): Version reset to 0.0 2024-05-07 13:19:07 +03:00
7279ff69a8 feat(chat): Messages list fill, message model 2024-05-07 13:02:59 +03:00
d537a05fac feat(chat): API method info success 2024-05-07 11:59:37 +03:00
d9956ed549 Data transfer and state control 2024-05-07 11:22:17 +03:00
150e6dc1f9 Lanscape orientation and more chat layouts 2024-05-06 14:30:08 +03:00
6576ce4bc4 feat(chat): More layoouts 2024-05-03 16:36:44 +03:00
apoloz
398fa6abf2 Merge pull request 'Добавил совместимость с TestFlight и исправил ошибки в iOS версии приложения' (#49) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#49
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-05-03 11:16:17 +00:00
6869287c85 feat(chat): Cheatroom layouts and API data load 2024-05-03 13:20:52 +03:00
c8a612186e fix(iOS): Warning fix 2024-05-02 17:28:42 +03:00
374ae06cb1 fix(iOS): Warning fix 2024-05-02 16:18:33 +03:00
7a39d2ec19 fix(iOS): Data type fix 2024-05-02 16:14:03 +03:00
e1932ff2ff refactor(iOS): Layout fixes to avoid crashes 2024-05-02 16:10:29 +03:00
2b5da83e38 refactor(iOS): Refactoring for iOS bundle 2024-05-02 13:56:39 +03:00
7c30667aec Chat select navigation and data transfer 2024-04-27 13:59:25 +03:00
c05ca6eaae refactor(iOS): Platform compilation fix 2024-04-26 17:25:17 +03:00
3acb5124b7 refactor(iOS): More assets 2024-04-26 16:20:01 +03:00
abb1c68a4f refactor(iOS): Assets 2024-04-26 14:42:37 +03:00
59f6f85029 refactor(iOS): Compilation error fix iOS 2024-04-26 10:44:53 +03:00
c1d2f4595d feat(chat): Layout Improvements and user avatars load 2024-04-25 16:06:27 +03:00
c7c8a52786 feat(chat): API data fetched and added to the screen 2024-04-25 15:33:11 +03:00
f5ac02c020 Multiple states for chatRoom select 2024-04-25 14:13:52 +03:00
6db3caf969 Token verification and API data load 2024-04-25 11:17:38 +03:00
apoloz
9e2f5bacdd Merge pull request 'Отображение аватара пользователя в профиле + загрузка нового аватара при нажатии на старый' (#46) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#46
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-04-24 14:12:26 +00:00
782ecbcd5c feat(profile): User profile pic upload finished + BloC event for that 2024-04-24 17:04:25 +03:00
7680abb61b feat(profile): New layouts for profile, default avatar and moved exit button to navbar 2024-04-24 15:47:41 +03:00
ed6b3332fa feat(settings): New background layouts for settings screen 2024-04-24 13:53:41 +03:00
apoloz
686cc3ebdb Merge pull request 'Отображение аватара пользователя в профиле' (#45) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#45
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-04-23 13:25:54 +00:00
9d1762b7d1 feat(settings): Code metrix fix 2024-04-23 13:26:57 +03:00
94f61f733b feat(settings): User Avatar display 2024-04-23 12:14:53 +03:00
8392135698 revert c486ee6b98
revert
2024-04-23 08:48:19 +00:00
514d4ed945 revert d1fca66b4b
Я  все сломал(
2024-04-23 08:46:32 +00:00
b43b7edf79 Merge branch 'diary' of ssh://10.55.5.123:222/maxxkim/eatvio_app into diary
Merge
2024-04-22 18:40:09 +03:00
12832d6874 feat(chat): Initial layouts for single chat screen 2024-04-22 18:39:53 +03:00
c486ee6b98 refactor(app): Dart fix applied 2024-04-22 14:48:22 +03:00
d1fca66b4b feat(ios): Some fixed for iOS build 2024-04-22 14:47:03 +03:00
2e99f579b6 feat(diary): Navbar added to diary edit screen 2024-04-22 13:54:54 +03:00
d549f01a23 feat(chat): Layouts for chat select finished 2024-04-22 12:46:36 +03:00
apoloz
a6c2495275 Merge pull request 'BloC и верстка для экрана выбора чата' (#44) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#44
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-04-19 13:58:26 +00:00
35115a6dad fix(chat): Fix 2024-04-19 16:51:20 +03:00
1b606d9fa6 Some more layouts and state control 2024-04-19 16:41:40 +03:00
8c93d57492 Initial Layouts for chat select screen 2024-04-19 15:56:58 +03:00
apoloz
db151b4da3 Merge pull request 'Инпут с названием продкта зачищается после добавления' (#43) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#43
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
resolves #39
2024-04-19 10:10:48 +00:00
88f800a630 feat(diary): Text field cleared after product addition 2024-04-19 11:54:57 +03:00
apoloz
301a852209 Merge pull request 'Прелоадер и выпадающее меню' (#42) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#42
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
fixes #38
2024-04-18 12:42:20 +00:00
f93b314a61 feat(diary): Preloader added when uploading images 2024-04-18 15:32:41 +03:00
8c4b5c520d Merge pull request 'fix_metrics' (#22) from fix_metrics into diary
Reviewed-on: maxxkim/eatvio_app#22
2024-04-18 11:58:36 +00:00
e602e5d239 feat(app): Added a popup menu to bottom navbar 2024-04-18 14:49:45 +03:00
apoloz
c8bd2921b4 Merge pull request 'feat(app): Created a navbar by new design and added logic for existing screens.' (#37) from maxxkim/eatvio_app:fix_metrics into main
Reviewed-on: eatvio/eatvio_app#37
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
fixes #36
2024-04-18 07:59:12 +00:00
ca74cc80a1 feat(app): Created a navbar by new design and added logic for existing screens. 2024-04-17 18:33:30 +03:00
apoloz
646385f6b0 Merge pull request 'refactor(registration): Autocomplete for city, numeric inputs for weight & height, examples for sports and add info' (#35) from maxxkim/eatvio_app:fix_metrics into main
Reviewed-on: eatvio/eatvio_app#35
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-04-16 13:37:17 +00:00
146a1ba136 fix(registration): Fix 2024-04-16 16:25:58 +03:00
7bb9ba8bc1 refactor(registration): Autocomplete for city, numeric inputs for weight & height, examples for sports and add info 2024-04-16 15:49:04 +03:00
apoloz
fb5dc5c753 Merge pull request 'refactor(auth): Fixed a kyboard overflowing login button' (#34) from maxxkim/eatvio_app:fix_metrics into main
Reviewed-on: eatvio/eatvio_app#34
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-04-16 11:30:45 +00:00
454c8081cd refactor(registration): Eatvio logo fix 2024-04-16 14:20:11 +03:00
8cf11f1913 revert 1e032c1fb2
revert Eatvio logo fix
2024-04-16 11:16:35 +00:00
1e032c1fb2 Eatvio logo fix 2024-04-16 14:16:12 +03:00
3a383dac6f refactor(registration): Height and weight are now inputs instead of DropDowns 2024-04-16 14:11:55 +03:00
8f84f15977 refactor(auth): Fixed a kyboard overflowing login button 2024-04-16 12:57:37 +03:00
apoloz
e8981a9e10 Merge pull request 'Рефакторинг и сохранение авторизованного пользователя' (#31) from maxxkim/eatvio_app:fix_metrics into main
Reviewed-on: eatvio/eatvio_app#31
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>

resolve #30
2024-04-15 14:05:05 +00:00
e815ad9e3d refactor(diary): Emitter warnings resolved 2024-04-15 16:46:04 +03:00
881c534763 refactor(diary): Emitter warnings resolved 2024-04-15 16:35:23 +03:00
apoloz
ac1f88c6bc Merge pull request 'добавил "образ жизни"' (#28) from maxxkim/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#28
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-04-15 13:09:29 +00:00
5ba9c15dd2 feat(app): Auth token is now saved after app close 2024-04-15 15:14:15 +03:00
ab9227de42 refactor(profile): Refactoring 2024-04-12 15:09:49 +03:00
5122665370 refactor(app): Assemble release 2024-04-11 16:24:10 +03:00
bbbc20a15a refactor(diary): Compiled version apk: profile, settings, diarym registration, auth, navigation bar 2024-04-10 17:07:56 +03:00
f4ddb7285c refactor(diary): New apk compile 2024-04-08 16:45:20 +03:00
c951558f2a refactor(metrics): Refactoring cyclomatic complexity for code metrics 2024-04-05 14:47:43 +03:00
0bd4a1c82c Merge pull request 'main' (#21) from main into chat
Reviewed-on: maxxkim/eatvio_app#21
2024-04-04 11:56:11 +00:00
368ffbd9ff Merge pull request 'feat(profile): Activity level select added to settings profile edit' (#20) from diary into main
Reviewed-on: maxxkim/eatvio_app#20
2024-04-04 11:51:50 +00:00
9862892636 feat(profile): Activity level select added to settings profile edit 2024-04-04 14:49:10 +03:00
8386bcf137 feat(chat): Classes added to chat screen 2024-04-04 13:28:15 +03:00
28d6525c78 feat(chat): Classes added to chat select 2024-04-04 13:26:17 +03:00
79a6fcbd88 feat(chat): Initial directories for chat + BloC state manager stump 2024-04-04 13:01:08 +03:00
b85940b995 Merge pull request 'diary' (#19) from diary into main
Reviewed-on: maxxkim/eatvio_app#19
2024-04-04 09:59:59 +00:00
apoloz
439bef8496 Merge pull request 'diary' (#24) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#24
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-04-04 09:48:44 +00:00
c5c7033ada fix(profile): Error is not server related (Ivalid data in mySQL database - garbage seeded in city and country fields) 2024-04-04 12:23:31 +03:00
64c25f11fe feat(diary): Nutrition chart API methods implemented 2024-04-03 14:03:06 +03:00
76a421bba5 profile(refactor): New functionalityy for settings screen 2024-04-02 17:14:17 +03:00
a2998c1fc7 feat(diary): Image remove layout and API method 2024-04-01 17:21:26 +03:00
ce19460af3 feat(diary): Added portion change (pcs gr) 2024-04-01 13:24:56 +03:00
apoloz
8fe8f77a09 Merge pull request 'diary' (#23) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#23
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-03-30 14:47:55 +00:00
aa9ccd26e7 feat(diary): Image layout fixed by figma design 2024-03-29 16:40:46 +03:00
0dbf487108 feat(diary): Image upload and display works properly 2024-03-29 16:22:19 +03:00
04dba8d486 feat(diary): Photo added to state manager 2024-03-29 15:22:32 +03:00
a712471d0c fix(diary) Fix 2024-03-29 14:30:23 +03:00
7cd867806c feat(diary): Fixed a moderation send issue. Dynamic product moderation now works 2024-03-29 12:44:22 +03:00
2eaf096ade feat(diary): Trying to fix redirect after API call 2024-03-27 18:13:17 +03:00
20a0df7525 feat(diary): Trying to fix redirect after API call 2024-03-27 18:12:55 +03:00
9923d06e82 fix(diary) Fixed an issue 2024-03-26 17:03:24 +03:00
825c2ddc2d feat(diary): Consumed surpasses recomended value alert 2024-03-26 16:52:09 +03:00
392d03250d fix(diary) Fixed a multiple focus node issue 2024-03-26 16:11:42 +03:00
6384128f6f diary(feat): Fixed a state update after portion add 2024-03-25 17:00:27 +03:00
ffbae3b502 feat(diary): Refresh page after product remove 2024-03-25 15:07:25 +03:00
e22a32b645 feat(diary): Data load and screen update on scroll TODO: Fix an error on product remove 2024-03-25 13:33:50 +03:00
ae52ccf99b feat(diary): Refresh on screen scroll 2024-03-22 15:13:20 +03:00
37670aefaf feat(diary): Nutrition chart with fl_charts 2024-03-22 14:46:16 +03:00
0b65a9b7a7 feat(diary): Nutrition chart with fl_charts 2024-03-22 14:45:04 +03:00
d736479741 feat(diary): New charts fl_charts 2024-03-22 10:20:58 +03:00
3c6c79beeb feat(diary): Moderation send network method 2024-03-20 17:17:46 +03:00
89a9918ea5 feat(diary): Moderation fields refactored. TEst re now passed 2024-03-20 16:35:25 +03:00
ca385118d1 feat(diary): Moderation send dialog added to the screen 2024-03-20 15:27:21 +03:00
5681a8df1c feat(diary): New state variable for moderation button control 2024-03-20 14:31:21 +03:00
37c7a41efa Image upload and portion state control 2024-03-20 13:54:08 +03:00
fd41af1d5c fix(diary): Meal change dropdown fixed 2024-03-18 18:15:56 +03:00
078694abf2 fix(diary): Meal change dropdown fixed 2024-03-18 18:15:54 +03:00
118130fbcc feat(diary): New way of portion send 2024-03-18 17:38:48 +03:00
9c6f7e8aaa feat(diary): Modal window for finishDay, event and bloc method forFinishDay. addPortion and removePortion 2024-03-18 14:48:53 +03:00
cda9b1c1ad feat(diary) Portion data send displayy fix 2024-03-15 15:27:28 +03:00
apoloz
343adfd8ad Merge pull request 'registration_refactor_fix' (#22) from maxxkim/eatvio_app:registration_refactor_fix into main
Reviewed-on: eatvio/eatvio_app#22
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-03-15 06:24:58 +00:00
00c951ea04 fix(diary) Layout padding fix 2024-03-15 09:11:31 +03:00
156ce1675d Merge branch 'main' into registration_refactor_fix 2024-03-14 13:29:06 +00:00
4a5fa3dd5c fix(registration) Finished fixing registration after code refactoring 2024-03-14 16:24:33 +03:00
e4637d54e8 fix(registration) Broken layouts fixed for weight screen 2024-03-14 15:59:28 +03:00
77dadba8fc Fixed broken layouts after refactoring. Fixed a bug (onTapNext() is called on screen build 2024-03-14 15:54:19 +03:00
52c62988e6 refactor(registration) Fixing issues in registration after refactoring Run Code Metrics 2024-03-14 15:46:08 +03:00
apoloz
a34d295a42 Merge pull request 'diary' (#21) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#21
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
2024-03-13 17:50:27 +00:00
687a0dfd85 Merge pull request 'diary' (#18) from diary into main
Reviewed-on: maxxkim/eatvio_app#18
2024-03-13 12:26:00 +00:00
b616ee898e Merge branch 'main' into diary 2024-03-13 12:25:03 +00:00
0ab2449766 Fix 2024-03-13 15:23:40 +03:00
08587bf230 test(registration): All tests passed! SMOKE TESTING FINISHED 2024-03-13 15:22:15 +03:00
bf93025074 test(registration): More test passed 2024-03-13 15:22:15 +03:00
c57e683aa0 test(registration): Favorite foods and birth date screen test passed 2024-03-13 15:22:15 +03:00
3a77aca131 test(registration): Credentials and city screen test passed 2024-03-13 15:22:15 +03:00
1228e19683 test(registration): Pressure and circ screen test passed 2024-03-13 15:22:15 +03:00
ce5288f0c4 test(registration): Allergies screen test passed 2024-03-13 15:22:15 +03:00
fdb0f87fee test(registration): Additional info screen test passed 2024-03-13 15:22:15 +03:00
f18066daa7 Settings screen test passed 2024-03-13 15:22:15 +03:00
34a1ae5ab1 test(profile) Profile test passed 2024-03-13 15:22:15 +03:00
c8ca293bde test(auth) Auth screen smoke test passed 2024-03-13 15:22:15 +03:00
c11b4bdea9 refactor(diary) Auth test localization mock 2024-03-13 15:22:15 +03:00
c7d0973356 refactor(diary) Some refactoring for test passsing 2024-03-13 15:22:15 +03:00
1141034b49 test(profile) Tried to make and debug the profile smoke test 2024-03-13 15:22:15 +03:00
d346256f87 test(test): Added sample smoke test 2024-03-13 15:22:15 +03:00
4b4e0dd814 test(registration): All tests passed! SMOKE TESTING FINISHED 2024-03-13 12:51:50 +03:00
37a5fdf51c test(registration): More test passed 2024-03-13 11:57:51 +03:00
77591f4fd2 test(registration): Favorite foods and birth date screen test passed 2024-03-13 11:20:27 +03:00
2822238532 test(registration): Credentials and city screen test passed 2024-03-12 17:11:57 +03:00
9ada1d3833 test(registration): Pressure and circ screen test passed 2024-03-12 17:03:23 +03:00
64ade028d9 test(registration): Allergies screen test passed 2024-03-12 16:57:10 +03:00
d74ffb37c6 test(registration): Additional info screen test passed 2024-03-12 16:32:58 +03:00
f312c318b4 Settings screen test passed 2024-03-12 15:40:39 +03:00
d23716c35b test(profile) Profile test passed 2024-03-12 15:16:37 +03:00
d0adebaa35 test(auth) Auth screen smoke test passed 2024-03-12 14:26:28 +03:00
94af7240b9 refactor(diary) Auth test localization mock 2024-03-12 14:11:11 +03:00
c7aa468027 refactor(diary) Some refactoring for test passsing 2024-03-12 13:08:47 +03:00
7a37fe5e39 test(profile) Tried to make and debug the profile smoke test 2024-03-11 17:16:06 +03:00
95f609bfd3 test(test): Added sample smoke test 2024-03-11 14:53:44 +03:00
116fcf5b7c Merge remote-tracking branch 'upstream/main'
Fix # Please enter a commit message to explain why this merge is necessary,
2024-03-11 13:18:16 +03:00
6abc865880 Merge pull request 'diary' (#16) from diary into main
Reviewed-on: maxxkim/eatvio_app#16
2024-03-11 08:01:35 +00:00
7b20842853 test(diary) App launch test 2024-03-07 11:57:27 +03:00
2c5e9a1749 fix(diary): Remove sample test 2024-03-06 14:49:21 +03:00
b62c3b4923 Refactoring diary finished 2024-03-06 14:22:30 +03:00
a4586f91c2 Refactoring diary started 2024-03-06 13:12:55 +03:00
43da826fa4 refactor(diary): Refactoring done for profille_screen 2024-03-06 12:32:58 +03:00
47cf17c927 refactor(diary): Refactoring continues 2024-03-06 11:57:48 +03:00
00b1452cef refactor(diary): Refactoring for settings done 2024-03-06 11:44:20 +03:00
3019a5a264 refactor(diary): Even more refactoring 2024-03-05 17:35:48 +03:00
3cf61ce5ca refactor(diary): Some more refactoring 2024-03-05 17:22:14 +03:00
ba10b5bdb8 Refactoring 2024-03-05 16:42:23 +03:00
2723861b04 refactor(diary): Another efatoring 2024-03-05 15:26:35 +03:00
59db676f7a refactor(diary): Refatoring 2024-03-05 15:18:09 +03:00
1c3fc731f7 refactor(diary): Refactoring forever 2024-03-05 15:14:19 +03:00
5d7467db51 refactor(diary): Revenge of the Refactoring 2024-03-05 14:44:04 +03:00
2f338b04d1 refactor(diary): Refactoring returns 2024-03-05 14:34:27 +03:00
700bef2576 refactor(diary): Refactoring once more 2024-03-05 14:32:15 +03:00
247d4b9fee refactor(diary): Refactoring again 2024-03-05 14:28:08 +03:00
9251e65d13 refactor(diary): More refactoring 2024-03-05 14:20:32 +03:00
cb17172cb0 refactor(diary): Refactoring metrics for CustomOutlinedButton 2024-03-05 12:58:37 +03:00
882ffef180 Merge branch 'diary' of ssh://10.55.5.123:222/maxxkim/eatvio_app into diary 2024-03-05 12:46:23 +03:00
0f37f378a3 refactor(diary): Refactoring flutter analyze finished. Started refactoring Run Code Metrics 2024-03-05 12:46:01 +03:00
ba4d3dce90 Merge branch 'main' into diary 2024-03-05 08:21:56 +00:00
d5a5ac3ebe Update .env 2024-03-05 08:18:24 +00:00
e72367c656 refactor(diary): Flutter analyze mediaQueryData issue fix attempt 2024-03-05 11:12:10 +03:00
94ffa3040b refactor(diary): Removed unused imports 2024-03-05 11:05:58 +03:00
5a56836d92 feat(diary): Add portion finished 2024-03-04 17:05:15 +03:00
d47081493e feat(diary): Encoding error fix finished 2024-03-04 15:07:46 +03:00
d21cd39e9e feat(diary): Encoding error fix for mood 2024-03-04 14:54:07 +03:00
8bde4d43a9 feat(diary): Encoding error fix for satiety 2024-03-04 14:44:52 +03:00
1fa05eae5f Impoved autocomplete and partial encoding error fix 2024-03-04 14:04:09 +03:00
6c03971f18 feat(diary): Comments and autocomplete finished 2024-03-04 10:12:01 +03:00
e6b7e78940 feat(diary): Debugginng for autocomplete (TODO: Pass the TextEditingController to the builder from the state) 2024-03-01 17:14:55 +03:00
8132e296d2 feat(diary): Custom autocomplete 2024-03-01 15:09:40 +03:00
ea78cc8f91 Tried to implement autocomplete 2024-03-01 11:57:28 +03:00
173b131eda Autocomplete class 2024-02-29 23:06:06 +03:00
56355f4e31 feat(diary): Saving filtering value to the state 2024-02-29 22:29:22 +03:00
65f94c535a feat(diary): Filtering finished 2024-02-29 22:10:08 +03:00
8eea92c4c6 feat(diary): More work on API methods 2024-02-29 21:27:06 +03:00
f0e9202b86 (debug)diary: Some debugging for API 2024-02-28 17:32:42 +03:00
a3162e4ec8 Merge pull request 'diary' (#15) from diary into main
Reviewed-on: maxxkim/eatvio_app#15
2024-02-28 09:03:35 +00:00
b389a2a13f refactor(test): Flutter Analyze fix 2024-02-28 11:57:23 +03:00
3749d66d89 Merge pull request 'main' (#14) from main into diary
Reviewed-on: maxxkim/eatvio_app#14
2024-02-28 08:11:35 +00:00
8f3244f607 refactor(diary): Usnused imports and deprecated metods removed 2024-02-28 11:08:57 +03:00
791122beb8 Merge pull request 'diary' (#16) from maxxkim/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#16
2024-02-28 08:06:31 +00:00
99abe0f308 Merge pull request 'CI(tests) main' (#13) from eatvio/eatvio_app:main into main
Reviewed-on: maxxkim/eatvio_app#13
2024-02-28 08:01:41 +00:00
apoloz
8ba9d0e437 Merge pull request 'main' (#15) from apoloz/eatvio_app:main into main
Reviewed-on: http://10.55.5.123:3000/eatvio/eatvio_app/pulls/15
2024-02-27 15:29:03 +00:00
apoloz
90ed160f8f Merge pull request 'ci(main): code metrix added' (#14) from apoloz/eatvio_app:main into main
Reviewed-on: http://10.55.5.123:3000/eatvio/eatvio_app/pulls/14
2024-02-27 13:16:45 +00:00
c072d46dee Autocomplete product names 2024-02-27 16:10:11 +03:00
c0bffe5ae2 feat(diary): Mood and satiety finished 2024-02-26 15:24:02 +03:00
77bc29c3d5 feat(diary) Added network methods and routes 2024-02-21 20:19:15 +03:00
05e04c444f fix(diary) Fix 2024-02-21 15:29:37 +03:00
75f7d52d39 feat(diary) Default Meal time values and Portions dynamic display for each meal 2024-02-21 15:29:10 +03:00
becf515acc feat(diary) Dynamic current meal display 2024-02-21 14:34:04 +03:00
65c465ab9d refactor(diary) Prepared front-end methods for API intergration 2024-02-21 12:18:25 +03:00
6d04d1a688 fix(diary) Fix meal list 2024-02-20 19:53:07 +03:00
3e4b683c33 feat(diary) Dynamic Meal list and Meal List object 2024-02-20 15:57:15 +03:00
f52c929b20 feat(diary) New time convert function, comment display and more 2024-02-20 15:27:07 +03:00
c46f612e1d refactor(diary) Podfile for iOS Cocoapods 2024-02-20 10:27:42 +03:00
bd61687a96 fix(diary) fix 2024-02-20 10:23:10 +03:00
1903896cf6 fix(diary) fix 2024-02-20 10:22:15 +03:00
d2371ef8ce fix(diary) No comment on this.. 2024-02-20 10:18:23 +03:00
c7e19718a3 feat(diary) Added a new event for meal time change 2024-02-20 10:14:00 +03:00
ba6c0f06f6 Meal time chhange front 2024-02-19 16:47:01 +03:00
7d0de42488 feat(diary) API methods added 2024-02-19 14:27:39 +03:00
0091e00060 feat(diary) dynnapic expandlists and mood/satiety scale 2024-02-19 09:28:25 +03:00
faf0439349 feat(diary) Image upload package and logic 2024-02-16 15:15:26 +03:00
139f57e1b5 feat(diary) More events for api methods. Stump for photo upload 2024-02-16 13:27:21 +03:00
a6ab577d20 feat(diary) Made an event expanded list display for mood 2024-02-15 16:02:13 +03:00
8e49d056c5 feat(diary) Made an event for satieety and mood change 2024-02-15 15:11:38 +03:00
397b579e56 feat(diary) Addeed mood and satiety picker scale to the screen 2024-02-15 13:08:50 +03:00
57a7f9bd91 feat(diary) Added controllers and improved form build logic 2024-02-14 14:56:16 +03:00
2fdf3979da feat(diary) Finished static layouts 2024-02-14 13:44:50 +03:00
2c2508840d feat(diary) New layoutsa and styles, build method edits 2024-02-14 13:06:01 +03:00
f25bbfecbf feat(diary) Comment layouts and controllers 2024-02-14 10:59:15 +03:00
5118697a02 feat(diary) Mood list layouts 2024-02-14 10:02:48 +03:00
7da4cb8014 refactor(diary) Added more layouts and constrollers 2024-02-13 18:24:35 +03:00
82eca66ae4 feat(diary) Improved layouts and TimePicker 2024-02-12 15:02:43 +03:00