Merge pull request #14 from devq8/temp

Merge conflects

Author: Engiineeer

wasfat_frontend/android/app/build.gradle

@@ -21,7 +21,7 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
+apply plugin: 'com.example.firebase'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 

wasfat_frontend/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -76,7 +76,6 @@
 				22670F5EC4097EEAEA61697F /* Pods-Runner.release.xcconfig */,
 				CD49A2AF674E9D63F67E8AAB /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -356,13 +355,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = NVGF9RCE9P;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.wasfatFrontend;
+				PRODUCT_BUNDLE_IDENTIFIER = khaled.alghanim.wasfatFrontend;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -484,13 +484,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = NVGF9RCE9P;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.wasfatFrontend;
+				PRODUCT_BUNDLE_IDENTIFIER = khaled.alghanim.wasfatFrontend;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -506,13 +507,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = NVGF9RCE9P;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.wasfatFrontend;
+				PRODUCT_BUNDLE_IDENTIFIER = khaled.alghanim.wasfatFrontend;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

wasfat_frontend/ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -24,6 +26,8 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

wasfat_frontend/lib/models/profile_model.dart

@@ -0,0 +1,22 @@
+import 'package:image_picker/image_picker.dart';
+
+class Profile {
+  int id;
+  String username;
+  XFile? image;
+
+  Profile({
+    required this.id,
+    required this.username,
+    this.image,
+  });
+
+  factory Profile.fromJson(Map<String, dynamic> json) {
+    return Profile(
+      id: json['id'],
+      username: json['username'],
+      image: json['image'] ??
+          'https://st4.depositphotos.com/4329009/19956/v/600/depositphotos_199564354-stock-illustration-creative-vector-illustration-default-avatar.jpg',
+    );
+  }
+}

wasfat_frontend/lib/pages/ingredient/ingredients.dart

@@ -7,15 +7,27 @@ import 'package:wasfat_frontend/providers/ingredient_provider.dart';
 import 'package:wasfat_frontend/widgets/category_card.dart';
 import 'package:wasfat_frontend/widgets/ingredient_card.dart';
 
-class Ingredients extends StatelessWidget {
+class Ingredients extends StatefulWidget {
   final Category category;
   Ingredients({required this.category});
 
+  @override
+  State<Ingredients> createState() => _IngredientsState();
+}
+
+class _IngredientsState extends State<Ingredients> {
+  @override
+  void initState() {
+    context
+        .read<IngredientProvider>()
+        .loadIngredients(category_id: widget.category.id);
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('Ingredients of ${category.title}'),
+        title: Text('Ingredients of ${widget.category.title}'),
         backgroundColor: Color(0xFFf14b24),
       ),
       floatingActionButton: FloatingActionButton(
@@ -31,7 +43,7 @@ class Ingredients extends StatelessWidget {
               onRefresh: () async {
                 context
                     .read<IngredientProvider>()
-                    .loadIngredients(category_id: category.id);
+                    .loadIngredients(category_id: widget.category.id);
               },
               child: Padding(
                 padding: EdgeInsets.all(7),

wasfat_frontend/lib/pages/recipe/list.dart

@@ -115,6 +115,16 @@ class _RecipesListState extends State<RecipesList> {
                               ),
                             )),
                   ),
+                  // Container(
+                  //   height: 50,
+                  //   child: SliverList(
+                  //     delegate: SliverChildBuilderDelegate((context, index) {
+                  //       return Container(
+                  //         height: 20,
+                  //       );
+                  //     }),
+                  //   ),
+                  // ),
                   Expanded(
                     child: Padding(
                       padding: const EdgeInsets.all(7.0),