new changes done

android/app/src/main/AndroidManifest.xml

@@ -22,8 +22,8 @@
 
     <application
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/launcher_icon"
-        android:label="cheminova">
+        android:label="Retailer">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

ios/Runner.xcodeproj/project.pbxproj

@@ -427,7 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -484,7 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1 @@
-{
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

lib/controller/cart_controller.dart

@@ -94,6 +94,15 @@ class CartController extends GetxController {
   void initializeSelections() {
     selectAllProducts(true);
   }
+
+
+  void updateQuantity(Product product, int quantity) {
+    final existingProduct = cartList.firstWhereOrNull((p) => p.id == product.id);
+    if (existingProduct != null) {
+      existingProduct.quantity = quantity;
+      updateTotalPrice();// Notify listeners
+    }
+  }
 }
 
 

lib/main.dart

@@ -8,6 +8,7 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+
 import 'package:get/get.dart';
 
 import 'firebase_options.dart';

lib/notification_services.dart

@@ -1,10 +1,12 @@
 import 'dart:io';
 
+
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 
+
 class NotificationServices {
   //initialising firebase message plugin
   FirebaseMessaging messaging = FirebaseMessaging.instance;

lib/screens/inventory/inventory_product_detail_screen.dart

@@ -96,7 +96,8 @@ class _InventoryProductDetailScreenState
                               child: ClipRRect(
                                 borderRadius: BorderRadius.circular(10),
                                 child: Image.asset(
-                                  'assets/images/product.png',
+                                  "assets/images/new_product.jpeg",
+                                //  'assets/images/product.png',
                                   fit: BoxFit.cover,
                                 ),
                               ),

lib/screens/inventory/update_stock_screen.dart

@@ -96,7 +96,8 @@ class _UpdateStockScreenState extends State<UpdateStockScreen> {
                               child: ClipRRect(
                                 borderRadius: BorderRadius.circular(10),
                                 child: Image.asset(
-                                  'assets/images/product.png',
+                                  "assets/images/new_product.jpeg",
+                                 // 'assets/images/product.png',
                                   fit: BoxFit.cover,
                                 ),
                               ),

lib/screens/order_management/order_management_detail_screen.dart

@@ -226,7 +226,8 @@ Future<void> adduni()async {
                                       child: Row(
                                         children: [
                                           Image.asset(
-                                           "assets/images/product.png", // Add the image URL here
+                                            "assets/images/new_product.jpeg",
+                                         //  "assets/images/product.png", // Add the image URL here
                                             height: 50,
                                             width: 50,
                                             fit: BoxFit.cover,

lib/screens/product/cart_screen.dart

@@ -145,7 +145,8 @@ class _CartScreenState extends State<CartScreen> {
               }
 
               // If there are items in the cart, show the cart list and summary.
-              return Column(
+              return SingleChildScrollView(
+                child: Column(
                   children: [
                     SizedBox(
                       height: Get.height * 0.02,
@@ -165,21 +166,21 @@ class _CartScreenState extends State<CartScreen> {
                           mainAxisSize: MainAxisSize.min,
                           children: [
                             // Row for "Select All" checkbox and label.
-                          Row(
+                            // Row(
-                            children: [
+                            //   children: [
-                              Checkbox(
+                            //     Checkbox(
-                                value: _selectAll, // Checkbox value linked to _selectAll flag.
+                            //       value: _selectAll, // Checkbox value linked to _selectAll flag.
-                                onChanged: _toggleSelectAll, // Toggle all selections when changed.
+                            //       onChanged: _toggleSelectAll, // Toggle all selections when changed.
-                              ),
+                            //     ),
-                              Text(
+                            //     Text(
-                                "Select All", // Label for the select all checkbox.
+                            //       "Select All", // Label for the select all checkbox.
-                                style: GoogleFonts.roboto(
+                            //       style: GoogleFonts.roboto(
-                                  fontSize: 16,
+                            //         fontSize: 16,
-                                  fontWeight: FontWeight.w500,
+                            //         fontWeight: FontWeight.w500,
-                                ),
+                            //       ),
-                              ),
+                            //     ),
-                            ],
+                            //   ],
-                          ),
+                            // ),
                 
                             // List of products in the cart.
                             SizedBox(
@@ -191,17 +192,17 @@ class _CartScreenState extends State<CartScreen> {
                                   return Row(
                                     children: [
                                       // Checkbox for individual product selection.
-                                    Checkbox(
+                                      // Checkbox(
-                                      value: _cartController.selectedProducts.contains(
+                                      //   value: _cartController.selectedProducts.contains(
-                                          _cartController.cartList[index]),
+                                      //       _cartController.cartList[index]),
-                                      onChanged: (value) {
+                                      //   onChanged: (value) {
-                                        _cartController.toggleProductSelection(
+                                      //     _cartController.toggleProductSelection(
-                                          _cartController.cartList[index],
+                                      //       _cartController.cartList[index],
-                                          value!, // Toggle product selection.
+                                      //       value!, // Toggle product selection.
-                                        );
+                                      //     );
-                                        _checkIfAllSelected(); // Recheck if all products are selected.
+                                      //     _checkIfAllSelected(); // Recheck if all products are selected.
-                                      },
+                                      //   },
-                                    ),
+                                      // ),
                 
                                       // ProductCard displaying product details in the cart.
                                       Expanded(
@@ -298,6 +299,7 @@ class _CartScreenState extends State<CartScreen> {
                       ),
                     ),
                   ],
+                ),
               );
             }),
           ),

lib/screens/product/product_detail_screen.dart

@@ -109,7 +109,8 @@ class _ProductDetailScreenState extends State<ProductDetailScreen> {
                             child: ClipRRect(
                               borderRadius: BorderRadius.circular(10), // Clip the corners of the image.
                               child: Image.asset(
-                                "assets/images/product.png", // Product image.
+                                "assets/images/new_product.jpeg",
+                                //"assets/images/product.png", // Product image.
                                 fit: BoxFit.cover, // Cover the container.
                               ),
                             ),

lib/screens/retail/retail_distributer_detail_screen.dart

@@ -43,7 +43,7 @@ class _RetailDistributerDetailScreenState
           ),
         ],
         title: const Text(
-          "Retail Distributer Detail",
+          "Retailer Detail",
         ),
       ),
       body: Stack(

lib/widgets/inventory_product_card.dart

@@ -28,7 +28,10 @@ class InventoryProductCard extends StatelessWidget {
                 width: Get.width * 0.30,
                 decoration: BoxDecoration(
                   image: DecorationImage(
-                    image: Image.asset('assets/images/product.png').image,
+                    image: Image.asset(
+                      "assets/images/new_product.jpeg",
+                        //'assets/images/product.png'
+                    ).image,
                     fit: BoxFit.cover,
                   ),
                 ),

lib/widgets/my_drawer.dart

@@ -1,9 +1,115 @@
+// import 'package:cheminova/controller/home_controller.dart';
+// import 'package:cheminova/screens/authentication/change_password_screen.dart';
+// import 'package:cheminova/screens/authentication/login_screen.dart';
+// import 'package:cheminova/screens/home_screen.dart';
+// import 'package:flutter/material.dart';
+// import 'package:get/get.dart';
+//
+// import '../screens/authentication/Profile.dart';
+//
+// class MyDrawer extends StatefulWidget {
+//   const MyDrawer({super.key});
+//
+//   @override
+//   State<MyDrawer> createState() => _MyDrawerState();
+// }
+//
+// class _MyDrawerState extends State<MyDrawer> {
+//   final HomeController _homeController = Get.find();
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return Drawer(
+//       child: ListView(
+//         padding: EdgeInsets.zero,
+//         children: <Widget>[
+//           SizedBox(
+//             height: 150,
+//             child: Obx(() {
+//               if (_homeController.isLoading.value) {
+//                 return const Center(child: CircularProgressIndicator());
+//               } else if (_homeController.error.value.isNotEmpty) {
+//                 return Center(child: Text(_homeController.error.value));
+//               } else {
+//                 final user = _homeController.userProfile.value;
+//                 return user == null ?const SizedBox(): DrawerHeader(
+//                   decoration: const BoxDecoration(
+//                     color: Colors.black87,
+//                   ),
+//                   child: Column(
+//                     crossAxisAlignment: CrossAxisAlignment.start,
+//                     mainAxisAlignment: MainAxisAlignment.start,
+//                     children: [
+//                       Text(
+//                         user!.myData!.name ?? "username",
+//                         style: const TextStyle(
+//                           color: Colors.white,
+//                           fontSize: 18,
+//                         ),
+//                       ),
+//                       Text(
+//                         user!.myData!.uniqueId ?? 'Employee ID',
+//                         style: const TextStyle(
+//                           color: Colors.white,
+//                           fontSize: 20,
+//                         ),
+//                       ),
+//                     ],
+//                   ),
+//                 );
+//               }
+//             }),
+//           ),
+//           ListTile(
+//             leading: const Icon(Icons.home),
+//             title: const Text('Home'),
+//             onTap: () => Get.offAll(() => const HomeScreen()),
+//           ),
+//           ListTile(
+//             leading: const Icon(Icons.account_circle),
+//             title: const Text('Profile'),
+//             onTap: () => Get.to(() => const ProfileScreen()),
+//           ),
+//           ListTile(
+//             leading: const Icon(Icons.settings),
+//             title: const Text('Change Password'),
+//             onTap: () {
+//               Get.to(const ChangePasswordScreen());
+//             },
+//           ),
+//           ListTile(
+//             leading: const Icon(Icons.exit_to_app),
+//             title: const Text('Logout'),
+//             onTap: () => Get.offAll(() => const LoginScreen()),
+//           ),
+//           SizedBox(
+//             height: 700,
+//             child: Padding(
+//               padding: const EdgeInsets.all(8.0),
+//               child: Center(
+//                 child: Text(
+//                   'App Version 2.0.0',
+//                   style: TextStyle(color: Colors.grey[600], fontSize: 12),
+//                 ),
+//               ),
+//             ),
+//           ),
+//         ],
+//       ),
+//     );
+//   }
+// }
+
+
+
+
 import 'package:cheminova/controller/home_controller.dart';
 import 'package:cheminova/screens/authentication/change_password_screen.dart';
 import 'package:cheminova/screens/authentication/login_screen.dart';
 import 'package:cheminova/screens/home_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 import '../screens/authentication/Profile.dart';
 
@@ -17,14 +123,30 @@ class MyDrawer extends StatefulWidget {
 class _MyDrawerState extends State<MyDrawer> {
   final HomeController _homeController = Get.find();
 
+  String _appVersion = '';
+
+  @override
+  void initState() {
+    super.initState();
+    _getAppVersion();
+  }
+
+  Future<void> _getAppVersion() async {
+    PackageInfo packageInfo = await PackageInfo.fromPlatform(
+
+    );
+    setState(() {
+      _appVersion = packageInfo.version; // 1.0.0
+    });
+  }
   @override
   Widget build(BuildContext context) {
     return Drawer(
-      child: ListView(
+      child: Column(
-        padding: EdgeInsets.zero,
+        children: [
-        children: <Widget>[
           SizedBox(
             height: 150,
+            width: double.infinity,
             child: Obx(() {
               if (_homeController.isLoading.value) {
                 return const Center(child: CircularProgressIndicator());
@@ -32,7 +154,9 @@ class _MyDrawerState extends State<MyDrawer> {
                 return Center(child: Text(_homeController.error.value));
               } else {
                 final user = _homeController.userProfile.value;
-                return user == null ?const SizedBox(): DrawerHeader(
+                return user == null
+                    ? const SizedBox()
+                    : DrawerHeader(
                   decoration: const BoxDecoration(
                     color: Colors.black87,
                   ),
@@ -41,14 +165,14 @@ class _MyDrawerState extends State<MyDrawer> {
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
                       Text(
-                        user!.myData!.name ?? "username",
+                        user.myData!.name ?? "username",
                         style: const TextStyle(
                           color: Colors.white,
                           fontSize: 18,
                         ),
                       ),
                       Text(
-                        user!.myData!.uniqueId ?? 'Employee ID',
+                        user.myData!.uniqueId ?? 'Employee ID',
                         style: const TextStyle(
                           color: Colors.white,
                           fontSize: 20,
@@ -82,6 +206,16 @@ class _MyDrawerState extends State<MyDrawer> {
             title: const Text('Logout'),
             onTap: () => Get.offAll(() => const LoginScreen()),
           ),
+          const Spacer(),
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Center(
+              child: Text(
+                'Version: $_appVersion',
+                style: TextStyle(color: Colors.grey[600], fontSize: 12),
+              ),
+            ),
+          ),
         ],
       ),
     );

lib/widgets/product_card.dart

@@ -48,13 +48,15 @@ class _ProductCardState extends State<ProductCard> {
   @override
   Widget build(BuildContext context) {
     final CartController _cartController = Get.put(CartController());
+
     bool showQuantity = widget.isInCart || widget.isCheckout || widget.isConfirmation;
     bool isProductInCart = _cartController.cartList.any((p) => p.id == widget.productModel!.id);
 
     int currentQuantity = isProductInCart
         ? _cartController.cartList.firstWhere((p) => p.id == widget.productModel!.id).quantity
         : widget.productModel!.quantity;
-
+    TextEditingController quantityController =
+    TextEditingController(text: currentQuantity.toString());
     return GestureDetector(
       onTap: () => widget.isInCart || widget.isCheckout
           ? null
@@ -67,11 +69,14 @@ class _ProductCardState extends State<ProductCard> {
               child: ClipRRect(
                 borderRadius: BorderRadius.circular(15.0),
                 child: Container(
-                  height: Get.height * 0.15,
+                  height: Get.height * 0.19,
-                  width: Get.width * 0.31,
+                  width: Get.width * 0.32,
                   decoration: BoxDecoration(
                     image: DecorationImage(
-                      image: AssetImage("assets/images/product.png"),
+                      image: AssetImage(
+                        "assets/images/new_product.jpeg",
+                         // "assets/images/product.png"
+                      ),
                       fit: BoxFit.cover,
                     ),
                   ),
@@ -98,6 +103,12 @@ class _ProductCardState extends State<ProductCard> {
                         fontWeight: FontWeight.w400,
                       ),
                     ),
+                    if (!widget.isCheckout)
+                      widget.isInCart
+                          ?
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
                         Text(
                           "₹ ${widget.productModel!.price.toString()}",
                           style: GoogleFonts.roboto(
@@ -105,98 +116,6 @@ class _ProductCardState extends State<ProductCard> {
                             fontWeight: FontWeight.w700,
                           ),
                         ),
-                    if (showQuantity)
-                      Text(
-                        "Quantity: ${currentQuantity}",
-                        style: GoogleFonts.roboto(
-                          fontSize: 15,
-                          fontWeight: FontWeight.w700,
-                        ),
-                      ),
-                    if (!widget.isCheckout)
-                      widget.isInCart
-                          ? Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          Container(
-                            height: Get.height * 0.04,
-                            width: Get.width * 0.21,
-                            decoration: BoxDecoration(
-                              color: const Color(0xFF004791),
-                              borderRadius: BorderRadius.circular(10),
-                            ),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceAround,
-                              children: [
-                                SizedBox(
-                                  height: 24,
-                                  width: 24,
-                                  child: ElevatedButton(
-                                    onPressed: () {
-                                      _cartController.decreaseQuantity(widget.productModel!);
-                                      setState(() {
-                                        currentQuantity = _cartController
-                                            .cartList
-                                            .firstWhere((p) => p.id == widget.productModel!.id)
-                                            .quantity;
-                                      });
-                                    },
-                                    style: ElevatedButton.styleFrom(
-                                      padding: EdgeInsets.zero,
-                                      shape: RoundedRectangleBorder(
-                                        borderRadius: BorderRadius.circular(8.0),
-                                      ),
-                                    ),
-                                    child: Text(
-                                      '-',
-                                      style: GoogleFonts.roboto(
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.w800,
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                                Text(
-                                  "${currentQuantity}",
-                                  style: const TextStyle(
-                                    color: Colors.white,
-                                    fontSize: 16,
-                                  ),
-                                ),
-                                SizedBox(
-                                  height: 22,
-                                  width: 22,
-                                  child: ElevatedButton(
-                                    onPressed: () {
-                                      _cartController.increaseQuantity(widget.productModel!);
-                                      setState(() {
-                                        currentQuantity = _cartController
-                                            .cartList
-                                            .firstWhere((p) => p.id == widget.productModel!.id)
-                                            .quantity;
-                                      });
-                                    },
-                                    style: ElevatedButton.styleFrom(
-                                      padding: EdgeInsets.zero,
-                                      shape: RoundedRectangleBorder(
-                                        borderRadius: BorderRadius.circular(8.0),
-                                      ),
-                                    ),
-                                    child: Text(
-                                      '+',
-                                      style: GoogleFonts.roboto(
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.w800,
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                          SizedBox(
-                            width: 2.0,
-                          ),
                         IconButton(
                           onPressed: () {
                             _cartController.removeFromCart(widget.productModel!);
@@ -211,6 +130,191 @@ class _ProductCardState extends State<ProductCard> {
                           ),
                         ),
                       ],
+                    ) :SizedBox(),
+                    if (showQuantity)
+                      SizedBox(
+                    height:     Get.height * 0.04,
+                        child: Text(
+                          "Quantity: ${currentQuantity}",
+                          style: GoogleFonts.roboto(
+                            color: Color(0xFF004791),
+                            fontSize: 15,
+                            fontWeight: FontWeight.w700,
+                          ),
+                        ),
+                      ),
+                    if (!widget.isCheckout)
+                      widget.isInCart
+                          ? Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Container(
+                            height: Get.height * 0.05,
+                            width: Get.width * 0.40,
+                            decoration: BoxDecoration(
+                              color: const Color(0xFF004791),
+                              borderRadius: BorderRadius.circular(10),
+                            ),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceAround,
+                              children: [
+                                SizedBox(
+                                  height: 25,
+                                  width: 25,
+                                  child: ElevatedButton(
+                                    onPressed: () {
+                                      _cartController.decreaseQuantity(widget.productModel!);
+                                      setState(() {
+                                        currentQuantity = _cartController
+                                            .cartList
+                                            .firstWhere((p) => p.id == widget.productModel!.id)
+                                            .quantity;
+                                      });
+                                    },
+                                    style: ElevatedButton.styleFrom(
+                                      padding: EdgeInsets.zero,
+                                      backgroundColor:Color(0xFF004791),
+                                      shape: RoundedRectangleBorder(
+                                        borderRadius: BorderRadius.circular(8.0),
+                                      ),
+                                    ),
+                                    child: Text(
+                                      '-',
+                                      style: GoogleFonts.roboto(
+                                        color: Colors.white,
+                                        fontSize: 18,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                                // Text(
+                                //   "${currentQuantity}",
+                                //   style: const TextStyle(
+                                //     color: Colors.white,
+                                //     fontSize: 16,
+                                //   ),
+                                // ),
+                                SizedBox(width: 5,),
+                                Expanded(
+                                  child: TextFormField(
+                                    controller: quantityController,
+                                    style: const TextStyle(
+                                      color: Color(0xFF004791),
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 16,
+                                    ),
+                                    keyboardType: TextInputType.number,
+                                    textAlign: TextAlign.center,
+                                    onFieldSubmitted: (value) {
+                                      int enteredQuantity = int.tryParse(value) ?? currentQuantity;
+                                      if (enteredQuantity <= 0) {
+                                        showSnackbar("Quantity must be at least 1");
+                                        enteredQuantity = 1;
+                                      }
+                                      setState(() {
+                                        currentQuantity = enteredQuantity;
+                                        _cartController.updateQuantity(widget.productModel!, currentQuantity);
+                                      });
+                                    },
+                                    decoration: InputDecoration(
+                                      labelText: "Enter Quantity",
+                                      labelStyle: const TextStyle(
+                                        color: Color(0xFF004791),
+                                        fontWeight: FontWeight.w600,
+                                        fontSize: 14,
+                                      ),
+                                      hintText: "",
+                                      hintStyle: const TextStyle(
+                                        color: Colors.grey,
+                                        fontWeight: FontWeight.w400,
+                                        fontSize: 14,
+                                      ),
+                                      filled: true,
+                                      fillColor: Colors.white,
+                                      contentPadding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 16.0),
+                                      enabledBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(12),
+                                        borderSide: const BorderSide(
+                                          color: Color(0xFF004791),
+                                          width: 1.5,
+                                        ),
+                                      ),
+                                      focusedBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(12),
+                                        borderSide: const BorderSide(
+                                          color: Color(0xFF004791),
+                                          width: 2,
+                                        ),
+                                      ),
+                                      errorBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(12),
+                                        borderSide: const BorderSide(
+                                          color: Colors.red,
+                                          width: 1.5,
+                                        ),
+                                      ),
+                                      focusedErrorBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(12),
+                                        borderSide: const BorderSide(
+                                          color: Colors.red,
+                                          width: 2,
+                                        ),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                                SizedBox(width: 5,),
+                                SizedBox(
+                                  height: 25,
+                                  width: 25,
+                                  child: ElevatedButton(
+                                    onPressed: () {
+                                      _cartController.increaseQuantity(widget.productModel!);
+                                      setState(() {
+                                        currentQuantity = _cartController
+                                            .cartList
+                                            .firstWhere((p) => p.id == widget.productModel!.id)
+                                            .quantity;
+                                      });
+                                    },
+                                    style: ElevatedButton.styleFrom(
+                                      padding: EdgeInsets.zero,
+                                      backgroundColor: Color(0xFF004791),
+                                      shape: RoundedRectangleBorder(
+                                        borderRadius: BorderRadius.circular(8.0),
+                                      ),
+                                    ),
+                                    child: Text(
+                                      '+',
+                                      style: GoogleFonts.roboto(
+                                        color: Colors.white,
+                                        fontSize: 18,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                          SizedBox(
+                            width: 2.0,
+                          ),
+                          // IconButton(
+                          //   onPressed: () {
+                          //     _cartController.removeFromCart(widget.productModel!);
+                          //     showSnackbar("Product has been removed successfully!");
+                          //     setState(() {
+                          //       currentQuantity = 1;
+                          //     });
+                          //   },
+                          //   icon: const Icon(
+                          //     Icons.delete_outline_rounded,
+                          //     color: Colors.red,
+                          //   ),
+                          // ),
+                        ],
                       )
                           : ElevatedButton(
                         onPressed: () {

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -12,6 +12,7 @@ import firebase_core
 import firebase_crashlytics
 import firebase_messaging
 import flutter_local_notifications
+import package_info_plus
 import path_provider_foundation
 import shared_preferences_foundation
 import syncfusion_pdfviewer_macos
@@ -25,6 +26,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
   FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SyncfusionFlutterPdfViewerPlugin.register(with: registry.registrar(forPlugin: "SyncfusionFlutterPdfViewerPlugin"))

pubspec.lock

@@ -9,6 +9,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.42"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
   args:
     dependency: transitive
     description:
@@ -49,6 +57,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -302,14 +326,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_lints:
+  flutter_launcher_icons:
     dependency: "direct dev"
     description:
-      name: flutter_lints
+      name: flutter_launcher_icons
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "0.14.3"
   flutter_local_notifications:
     dependency: "direct main"
     description:
@@ -416,6 +440,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.2"
   image_picker:
     dependency: "direct main"
     description:
@@ -496,6 +528,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.1"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -520,14 +560,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
   logger:
     dependency: "direct main"
     description:
@@ -568,6 +600,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.6"
+  package_info_plus:
+    dependency: "direct main"
+    description:
+      name: package_info_plus
+      sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.3"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   path:
     dependency: transitive
     description:
@@ -664,6 +712,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.1"
   pretty_dio_logger:
     dependency: "direct main"
     description:
@@ -1021,6 +1077,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.5.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
 sdks:
   dart: ">=3.4.1 <4.0.0"
   flutter: ">=3.22.0"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+version: 2.0.0+1
 
 environment:
   sdk: ">=3.4.1 <4.0.0"
@@ -55,10 +55,18 @@ dependencies:
   firebase_crashlytics: ^4.0.4
   firebase_analytics: ^11.2.1
   pretty_dio_logger: ^1.3.1
+  package_info_plus: ^8.1.3
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_launcher_icons: ^0.14.3
+
+
+flutter_launcher_icons:
+    android: "launcher_icon"
+    ios: true
+    image_path: "assets/images/app-icon-retailer.png"
 
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is