From a3053fa38318500ca53c604807e15a528bce705d Mon Sep 17 00:00:00 2001 From: GG_Host Date: Mon, 1 Jul 2024 23:17:47 +0300 Subject: [PATCH 1/8] updated file to pipeline --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ed1e36d..9479e09 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,7 +20,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.22.1 + flutter-version: 3.22.2 - name: Install dependencies run: flutter pub get From 7921f9b4fd60fb08a8e227826f81b04e40109dd9 Mon Sep 17 00:00:00 2001 From: GG_Host Date: Mon, 1 Jul 2024 23:37:35 +0300 Subject: [PATCH 2/8] attempt to fix deploy --- .nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .nojekyll diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 0000000..e69de29 From aa86d96251b35eb4d0ac92948889510983f7f260 Mon Sep 17 00:00:00 2001 From: GG_Host Date: Mon, 1 Jul 2024 23:45:17 +0300 Subject: [PATCH 3/8] attempt 2 to fix deploy --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9479e09..52f4a1d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,7 +26,7 @@ jobs: run: flutter pub get - name: Build web - run: flutter build web --release --target=lib/main.dart + run: flutter build web --release lib/main.dart - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 From 8a19c33662fe946b87f9905b4059631b84a2cb2a Mon Sep 17 00:00:00 2001 From: vozamhcak <157967947+vozamhcak@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:51:12 +0300 Subject: [PATCH 4/8] Update README --- lib/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/README b/lib/README index 1274aaa..63913c3 100644 --- a/lib/README +++ b/lib/README @@ -2,7 +2,7 @@ Description Application for calculating calories based on a photograph of food. Just take a picture of your meal, and the application with the implemented AI will determine the overall information about your dish: name, calories, proteins, fats, carbohydrates. -Functionality +Functionality: Photography: The application allows the user to photograph his dish using the device camera. Image analysis: the application analyzes the photo, determines the food in the image and their quantity. Caloria calculation: the application uses LLAMA Model to identify information about the dish. @@ -30,4 +30,4 @@ Installation Install Android Studio or Xcode, depending on your platform, and configure the developer's environment. Clon the application repository with GitHub. Go to the project directory and execute the Flutter Pub Get command to install dependencies. - Run the application using the Flutter Run command. \ No newline at end of file + Run the application using the Flutter Run command. From 08afc0397cb8760adeddfba2227f8e840a6b3864 Mon Sep 17 00:00:00 2001 From: vozamhcak <157967947+vozamhcak@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:51:35 +0300 Subject: [PATCH 5/8] Update dataModel.dart --- lib/models/dataModel.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/models/dataModel.dart b/lib/models/dataModel.dart index 18a8f5b..0e4c97e 100644 --- a/lib/models/dataModel.dart +++ b/lib/models/dataModel.dart @@ -16,5 +16,4 @@ class DataModel { required this.caloris, required this.date, }); - } From 94b42274f7793d1b3bc4f2b05864e1d84fcb19cc Mon Sep 17 00:00:00 2001 From: vozamhcak <157967947+vozamhcak@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:52:56 +0300 Subject: [PATCH 6/8] Update camera_page_test.dart --- test/camera_page_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/camera_page_test.dart b/test/camera_page_test.dart index ad4c41e..90cb863 100644 --- a/test/camera_page_test.dart +++ b/test/camera_page_test.dart @@ -8,7 +8,7 @@ import 'package:provider/provider.dart'; void main() { testWidgets('CameraPage shows camera preview', (WidgetTester tester) async { // Mock DataProvider - await tester.pumpWidget( + await tester.pumpWidget( ChangeNotifierProvider( create: (context) => DataProvider(), child: MaterialApp( From 436eb0fb36b26589abe812e8829ba76fe32f7a46 Mon Sep 17 00:00:00 2001 From: vozamhcak <157967947+vozamhcak@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:53:16 +0300 Subject: [PATCH 7/8] Update README.md --- README.md | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3b2566c..63913c3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,33 @@ -# final_project +Description -A new Flutter project. +Application for calculating calories based on a photograph of food. Just take a picture of your meal, and the application with the implemented AI will determine the overall information about your dish: name, calories, proteins, fats, carbohydrates. + +Functionality: + Photography: The application allows the user to photograph his dish using the device camera. + Image analysis: the application analyzes the photo, determines the food in the image and their quantity. + Caloria calculation: the application uses LLAMA Model to identify information about the dish. + Product Information: the application provides information about each food product, including the name, calorie content and other important characteristics. + +Why was the product created? +The project was inspired by the desire to simplify the process of monitoring nutrition and health. Many people are faced with difficulties in calculating calories and macro elements in their diet due to the complexity of diets and the lack of time for a thorough analysis of each product. We sought to create a convenient solution that would allow users to easily and quickly find out the calorie content of their meal, simply photographing it. + +The purpose of the product? +The purpose of our application is to satisfy the needs of users in the exact and quick calculation of calories based on a photograph of food. We want to help people who want to control their food, but have difficulties with accurate calculation of calories and macro elements. Our application helps to make this process easier and more effective, freeing user time for other tasks. + +What is the best anallain? +Our application differs in its simplicity of use. In the difference from many other applications that require the entry of each ingredient manually, our application analyzes the photo and determines the food products on it, and then uses the calorie database to calculate the total number of calories. This makes the process much faster and more convenient for the user + + +Requirements + iOS 11.0 or higher + Android 5.0 (API LEVEL 21) or higher + Camera of a device for photographing dishes + Internet connection to download the database of food and calorie products + +Installation + + Install Flutter SDK on your computer, following the instructions on the official Flutter website. + Install Android Studio or Xcode, depending on your platform, and configure the developer's environment. + Clon the application repository with GitHub. + Go to the project directory and execute the Flutter Pub Get command to install dependencies. + Run the application using the Flutter Run command. From 878825d806d97ccfea9361216bc8c62fd311a436 Mon Sep 17 00:00:00 2001 From: samerspc <114020091+samerspc@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:56:08 +0300 Subject: [PATCH 8/8] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 63913c3..1a0244e 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,14 @@ The purpose of our application is to satisfy the needs of users in the exact and What is the best anallain? Our application differs in its simplicity of use. In the difference from many other applications that require the entry of each ingredient manually, our application analyzes the photo and determines the food products on it, and then uses the calorie database to calculate the total number of calories. This makes the process much faster and more convenient for the user - + Requirements iOS 11.0 or higher Android 5.0 (API LEVEL 21) or higher Camera of a device for photographing dishes Internet connection to download the database of food and calorie products + Installation Install Flutter SDK on your computer, following the instructions on the official Flutter website.