Clean up code and fix showing Items Category name after adding a new menu item

Author: vuevska

lib/pages/home_page.dart

@@ -7,8 +7,6 @@ import 'package:menu_craft/widgets/home_page/list_restaurants.dart';
 import '../models/restaurant_category_model.dart';
 import '../widgets/home_page/restaurant_categories/restaurant_category_grid.dart';
 
-
-
 class HomePage extends StatefulWidget {
   const HomePage({super.key});
 
@@ -40,12 +38,12 @@ class _HomePageState extends State<HomePage> {
                     setState(() {
                       selectedCategory = category;
                     });
-                    // Navigate to the new page
                     if (selectedCategory != null) {
                       Navigator.of(context).push(
                         CupertinoPageRoute(
                           builder: (BuildContext context) {
-                            return RestaurantListPage(category: selectedCategory!);
+                            return RestaurantListPage(
+                                category: selectedCategory!);
                           },
                         ),
                       );
@@ -61,4 +59,3 @@ class _HomePageState extends State<HomePage> {
     );
   }
 }
-

lib/pages/introduction_scene.dart

@@ -1,12 +1,11 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:introduction_screen/introduction_screen.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../widgets/init_load_widget.dart';
 
 class FirstTimeWidget extends StatelessWidget {
-  const FirstTimeWidget({Key? key}) : super(key: key);
+  const FirstTimeWidget({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/pages/profile/profile_page.dart

@@ -7,7 +7,7 @@ import 'package:menu_craft/widgets/profile/profile.dart';
 import 'package:provider/provider.dart';
 
 class ProfilePage extends StatefulWidget {
-  const ProfilePage({Key? key});
+  const ProfilePage({super.key});
 
   @override
   State<ProfilePage> createState() => _ProfilePageState();
@@ -20,18 +20,18 @@ class _ProfilePageState extends State<ProfilePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<UserProvider>(
-        builder: (context, userProvider, child) {
-          if (AuthService.isUserLoggedIn() && userProvider.user != null) {
-            context.read<LocationService>().determinePosition().catchError((
-                onError) {
-              //TODO: mozebi i ovde error code
-            });
-            return Profile(refresh: refresh);
-          } else {
-            return LoginPage(refresh: refresh);
-          }
-        }
-    );
+    return Consumer<UserProvider>(builder: (context, userProvider, child) {
+      if (AuthService.isUserLoggedIn() && userProvider.user != null) {
+        context
+            .read<LocationService>()
+            .determinePosition()
+            .catchError((onError) {
+          //TODO: mozebi i ovde error code
+        });
+        return Profile(refresh: refresh);
+      } else {
+        return LoginPage(refresh: refresh);
+      }
+    });
   }
 }

lib/pages/restaurant/add_category_page.dart

@@ -72,8 +72,6 @@ class _AddCategoryPageState extends State<AddCategoryPage> {
     );
 
     try {
-      // await _db.addCategory(newCategory);
-
       Map<String, dynamic> categoryMap = newCategory.toMap();
 
       await _db.addItemsCategoryToRestaurant(

lib/pages/restaurant/add_menu_item_page.dart

@@ -13,12 +13,12 @@ import 'package:toastification/toastification.dart';
 import 'package:uuid/uuid.dart';
 
 class AddMenuItemPage extends StatefulWidget {
-  final String categoryId;
+  final ItemsCategoryModel category;
   final RestaurantModel restaurant;
 
   const AddMenuItemPage({
     super.key,
-    required this.categoryId,
+    required this.category,
     required this.restaurant,
   });
 
@@ -80,7 +80,7 @@ class _AddMenuItemPageState extends State<AddMenuItemPage> {
 
       await _db.addMenuItemToCategory(
         widget.restaurant.restaurantId,
-        widget.categoryId,
+        widget.category.categoryId,
         menuItem,
       );
 
@@ -96,8 +96,8 @@ class _AddMenuItemPageState extends State<AddMenuItemPage> {
         MaterialPageRoute(
           builder: (context) => ViewMenuItemsPage(
             category: ItemsCategoryModel(
-              categoryId: widget.categoryId,
-              name: _nameController.text,
+              categoryId: widget.category.categoryId,
+              name: widget.category.name,
               icon: Icons.restaurant.codePoint,
             ),
             restaurant: widget.restaurant,

lib/pages/restaurant/add_menu_page.dart

@@ -127,7 +127,6 @@ class _AddMenuPageState extends State<AddMenuPage> {
       restaurantId: uuid.v4(),
       owningUserID: AuthService.user!.uid,
       category: _selectedCategory!.name,
-      //categories: _categories,
     );
 
     if (!context.mounted) {

lib/pages/restaurant/edit_category_page.dart

@@ -8,7 +8,6 @@ import 'package:menu_craft/services/db_restaurant_service.dart';
 import 'package:menu_craft/utils/toastification.dart';
 import 'package:menu_craft/widgets/appbar/secondary_custom_appbar.dart';
 import 'package:toastification/toastification.dart';
-import 'package:uuid/uuid.dart';
 
 class EditCategoryPage extends StatefulWidget {
   final ItemsCategoryModel category;

lib/pages/restaurant/edit_menu_page.dart

@@ -31,7 +31,6 @@ class _EditMenuPageState extends State<EditMenuPage> {
   final _picker = ImagePicker();
   final _db = DbRestaurantService();
 
-
   File? _pickedImage;
   RestaurantCategoryModel? _selectedCategory;
 
@@ -82,7 +81,6 @@ class _EditMenuPageState extends State<EditMenuPage> {
                   categories: _categories,
                   onCategorySelected: _onCategorySelected,
                   restaurant: widget.restaurant,
-
                 ),
               ],
             ),
@@ -120,9 +118,11 @@ class _EditMenuPageState extends State<EditMenuPage> {
 
     String imageUrl = widget.restaurant.imageUrl;
 
-    _selectedCategory ??= _categories.where((element) => element.name == widget.restaurant.category).first;
+    _selectedCategory ??= _categories
+        .where((element) => element.name == widget.restaurant.category)
+        .first;
 
-    if(_pickedImage != null){
+    if (_pickedImage != null) {
       const uuid = Uuid();
       imageUrl = await _db.uploadRestaurantImage(
         uuid.v4(),
@@ -138,10 +138,8 @@ class _EditMenuPageState extends State<EditMenuPage> {
       restaurantId: widget.restaurant.restaurantId,
       owningUserID: AuthService.user!.uid,
       category: _selectedCategory!.name,
-      //categories: _categories,
     );
 
-
     if (!context.mounted) {
       return;
     }
@@ -154,7 +152,7 @@ class _EditMenuPageState extends State<EditMenuPage> {
     Navigator.pushAndRemoveUntil(
       context,
       CupertinoPageRoute(builder: (context) => const OwnerMenusPage()),
-          (route) => route.isFirst,
+      (route) => route.isFirst,
     );
   }
 }

lib/pages/restaurant/filtered_restaurants.dart

@@ -5,33 +5,32 @@ import '../../models/restaurant_model.dart';
 import '../../services/db_restaurant_service.dart';
 import '../../widgets/home_page/restaurant_card.dart';
 
-
 class RestaurantListPage extends StatelessWidget {
   final RestaurantCategoryModel category;
 
-  const RestaurantListPage({Key? key, required this.category}) : super(key: key);
+  const RestaurantListPage({super.key, required this.category});
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: const Color.fromRGBO(29, 27, 32, 1), // Adjust the color here
+      backgroundColor: const Color.fromRGBO(29, 27, 32, 1),
       appBar: AppBar(
-        title: Text('${category.name}'),
-        backgroundColor: const Color.fromRGBO(29, 27, 32, 1),
-        foregroundColor: Colors.white,// Adjust the color here
-        elevation: 0,
-        iconTheme: IconThemeData(color: Colors.white)// Remove the elevation of the app bar
-      ),
+          title: Text(category.name),
+          backgroundColor: const Color.fromRGBO(29, 27, 32, 1),
+          foregroundColor: Colors.white,
+          elevation: 0,
+          iconTheme: const IconThemeData(color: Colors.white)),
       body: FutureBuilder<List<RestaurantModel>>(
         future: DbRestaurantService().getRestaurantsByCategory(category),
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.waiting) {
-            return Center(
+            return const Center(
               child: CircularProgressIndicator(),
             );
           } else if (snapshot.hasError) {
             return Center(
-              child: Text('Error: ${snapshot.error}', style: TextStyle(color: Colors.red)),
+              child: Text('Error: ${snapshot.error}',
+                  style: const TextStyle(color: Colors.red)),
             );
           } else {
             final List<RestaurantModel> restaurants = snapshot.data!;

lib/pages/restaurant/view_menu_items_page.dart

@@ -250,11 +250,10 @@ class _ViewMenuItemsPageState extends State<ViewMenuItemsPage> {
                                                             }
                                                             Navigator.of(
                                                                     context)
-                                                                .pop(); // Close the dialog
+                                                                .pop();
                                                           } catch (e) {
-                                                            print(
+                                                            debugPrint(
                                                                 'Error deleting restaurant: $e');
-                                                            // Handle error if needed
                                                           }
                                                         },
                                                       );
@@ -288,7 +287,7 @@ class _ViewMenuItemsPageState extends State<ViewMenuItemsPage> {
                   CupertinoPageRoute(
                     builder: (BuildContext context) {
                       return AddMenuItemPage(
-                        categoryId: widget.category.categoryId,
+                        category: widget.category,
                         restaurant: widget.restaurant,
                       );
                     },

lib/pages/restaurant/view_menu_page.dart

@@ -226,11 +226,10 @@ class _ViewMenuPageState extends State<ViewMenuPage> {
                                                               }
                                                               Navigator.of(
                                                                       context)
-                                                                  .pop(); // Close the dialog
+                                                                  .pop();
                                                             } catch (e) {
-                                                              print(
+                                                              debugPrint(
                                                                   'Error deleting restaurant: $e');
-                                                              // Handle error if needed
                                                             }
                                                           },
                                                         );