Skip to content

Feature/FIT-10-Details-Food #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: development
Choose a base branch
from
Open

Feature/FIT-10-Details-Food #10

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
faf8b84
Refactor: Remove GitHub Actions workflows for branch name validation,…
PeshoOReda Jun 22, 2025
67ca7ad
feat: Update dependencies and add localization support
PeshoOReda Jun 23, 2025
c4557c2
fix: Remove unused code in meals_retrofit_client test
PeshoOReda Jun 23, 2025
32da7b5
fix: Clean up code formatting and improve readability in various files
PeshoOReda Jun 23, 2025
cece112
Refactor meal details feature to use new details_food module
PeshoOReda Jun 24, 2025
abaf124
feat: Implement meal details feature with Retrofit client and data so…
PeshoOReda Jun 24, 2025
18a6a0c
refactor(meal_details): move meal details functionality to meals feature
PeshoOReda Jun 24, 2025
1460fb9
refactor(meal_details): move meal details functionality to meals feature
PeshoOReda Jul 1, 2025
bf5e316
refactor(meal_details): move meal details functionality to meals feature
PeshoOReda Jul 1, 2025
ab8f0e5
feat(meal_details): enhance meal details screen with argument handlin…
EslamMagdy12 Jul 19, 2025
e1e8a29
Merge remote-tracking branch 'origin/development' into feature/fit-10…
EslamMagdy12 Jul 19, 2025
7ac2bcf
feat(meal-details): add meal details screen and related components
EslamMagdy12 Jul 19, 2025
a7d4cb2
fix(auth-repo): correct expected result type in registration test
EslamMagdy12 Jul 20, 2025
ceaa855
fix(ingredient-body): remove unnecessary check for empty ingredients
EslamMagdy12 Jul 24, 2025
4b53608
feat(meal-navigation): add back button to meal image and refactor mea…
EslamMagdy12 Jul 25, 2025
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
1 change: 0 additions & 1 deletion .github/CODEOWNERS
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions .github/pull_request_template.md
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/branch_name_validation.yaml
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions .github/workflows/dart-linting.yaml
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/flutter-unit-tests.yaml
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/pull_request_title_validation.yaml
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions .github/workflows/sonar_qube_cloud.yaml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion assets/translations/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,6 @@
"PasswordChangedSuccessfully": "تم تغيير كلمة المرور بنجاح",
"ProfileUpdatedSuccessfully": "تم تحديث الملف الشخصي بنجاح",
"Loading": "جار التحميل...",
"Ok": "حسنا"
"Ok": "حسنا",
"Ingredients": "المكونات"
}
3 changes: 2 additions & 1 deletion assets/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,6 @@
"PasswordChangedSuccessfully": "Password changed successfully",
"ProfileUpdatedSuccessfully": "Profile updated successfully",
"Loading": "Loading...",
"Ok": "Ok"
"Ok": "Ok",
"Ingredients": "Ingredients"
}
1 change: 1 addition & 0 deletions lib/core/assets/app_colors.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class AppColors {
static const Color black = Color(0xFF000000);
static const Color darkBlack = Color(0xFF0B0B0B);
static const Color darkgrey = Color(0xFF242424);
static const Color containerBackGround = Color(0x19242424);
static const MaterialColor white = MaterialColor(0xFFFFFFFF, <int, Color>{
baseColor: Color(0xFFFFFFFF),
colorCode10: Color(0xFFE9E9E9),
Expand Down
1 change: 1 addition & 0 deletions lib/core/assets/app_icons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ class AppIcons {
static const String fitnessThirtyTwo = 'assets/svgs/fitness_32.svg';
static const String fitnessThirtyThree = 'assets/svgs/fitness_33.svg';
static const String fitnessThirtyFour = 'assets/svgs/fitness_34.svg';
static const String arrowBack = 'assets/svgs/arrow_back.svg';
}
3 changes: 2 additions & 1 deletion lib/core/functions/inital_route_function.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:injectable/injectable.dart';
import 'package:shared_preferences/shared_preferences.dart';

import '../utils/constants.dart';
import '../utils/routes/app_routes.dart';

Expand All @@ -18,7 +19,7 @@ class RouteInitializer {
var firstTime = sharedPreferences.getBool(Constants.firstTime);
var token = await flutterSecureStorage.read(key: Constants.token);
if (firstTime == null || firstTime == false) {
return AppRoutes.onBoardingRoute;
return AppRoutes.loginRoute;
}
if (token != null) {
return AppRoutes.mainLayoutRoute;
Expand Down
3 changes: 2 additions & 1 deletion lib/core/utils/datasource_excution/api_constants.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class ApiConstants {
ApiConstants._();

static const String baseUrl = "https://fitness.elevateegy.com/api/v1/";
static const String mealsBaseUrl = "https://www.themealdb.com/api/json/v1/";
//////////////////////////// Auth Routes ////////////////////////////
static const String signupRoute = "auth/signup";
static const String loginRoute = "auth/signin";
Expand All @@ -28,7 +29,7 @@ class ApiConstants {
//////////////////////////// Meals Routes ////////////////////////////
static const String mealsCategories = "1/categories.php";
static const String filterMealsByCategory = "1/filter.php";
static const String mealDetails = "1/lookup.php";
static const String mealDetails = "lookup.php?i=";
/////////////////////////// Exercises Routes ////////////////////////////
static const String allExercises = "exercises";
static const String exercisesByMuscleDifficulty =
Expand Down
Loading