item for sale improvement cont.

assets/images/files.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30.776" height="24.337" viewBox="0 0 30.776 24.337">
+  <g id="folder" transform="translate(0 -42.679)">
+    <g id="Group_8637" data-name="Group 8637" transform="translate(0 45.895)">
+      <g id="Group_8636" data-name="Group 8636" transform="translate(0 0)">
+        <path id="Path_5021" data-name="Path 5021" d="M25.043,88.08H13.94l-2.209-2.625a.377.377,0,0,0-.3-.136H2.471A2.489,2.489,0,0,0,0,87.808v16.145a2.489,2.489,0,0,0,2.486,2.486H25.043a2.489,2.489,0,0,0,2.486-2.486V90.566A2.489,2.489,0,0,0,25.043,88.08Z" transform="translate(0 -85.319)" fill="#2bb8a6"/>
+      </g>
+    </g>
+    <g id="Group_8639" data-name="Group 8639" transform="translate(3.274 42.679)">
+      <g id="Group_8638" data-name="Group 8638" transform="translate(0 0)">
+        <path id="Path_5022" data-name="Path 5022" d="M68.431,45.44H57.324l-2.209-2.625a.377.377,0,0,0-.3-.136H45.859A2.486,2.486,0,0,0,43.4,44.827h8.168a1.445,1.445,0,0,1,1.11.516l1.886,2.242H65.169a3.56,3.56,0,0,1,3.554,3.554V63.775A2.486,2.486,0,0,0,70.9,61.31V47.923A2.489,2.489,0,0,0,68.431,45.44Z" transform="translate(-43.4 -42.679)" fill="#2bb8a6"/>
+      </g>
+    </g>
+  </g>
+</svg>

assets/images/gallery.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="30.996" height="28.414" viewBox="0 0 30.996 28.414">
+  <g id="image-gallery" transform="translate(-0.001 -2)">
+    <g id="Group_8635" data-name="Group 8635" transform="translate(0.001 5.875)">
+      <g id="Group_8634" data-name="Group 8634" transform="translate(0 5.078)">
+        <path id="Path_5018" data-name="Path 5018" d="M8.072,22.581A4.836,4.836,0,0,1,3.5,19.286l-.045-.149a4.711,4.711,0,0,1-.223-1.4V8.932L.1,19.391a2.933,2.933,0,0,0,2.056,3.558L22.123,28.3a2.962,2.962,0,0,0,.744.1,2.88,2.88,0,0,0,2.791-2.112l1.164-3.7Z" transform="translate(-0.001 -8.932)" fill="#2bb8a6"/>
+      </g>
+      <path id="Path_5019" data-name="Path 5019" d="M9.583,10.166A2.583,2.583,0,1,0,7,7.583,2.586,2.586,0,0,0,9.583,10.166Z" transform="translate(2.04 -5)" fill="#2bb8a6"/>
+    </g>
+    <path id="Path_5020" data-name="Path 5020" d="M26.6,2H7.229A3.233,3.233,0,0,0,4,5.229V19.436a3.233,3.233,0,0,0,3.229,3.229H26.6a3.233,3.233,0,0,0,3.229-3.229V5.229A3.233,3.233,0,0,0,26.6,2ZM7.229,4.583H26.6a.646.646,0,0,1,.646.646V14.4l-4.08-4.761a2.313,2.313,0,0,0-1.732-.794,2.258,2.258,0,0,0-1.726.815l-4.8,5.758-1.563-1.559a2.267,2.267,0,0,0-3.2,0L6.583,17.42V5.229a.646.646,0,0,1,.646-.646Z" transform="translate(1.166)" fill="#2bb8a6"/>
+  </g>
+</svg>

assets/images/open_camera.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="31.908" height="29.134" viewBox="0 0 31.908 29.134">
+  <g id="Group_8579" data-name="Group 8579" transform="translate(0 -100)">
+    <path id="Path_4556" data-name="Path 4556" d="M88.972,88.108h-4.4l-2.539-2.775H72.324v4.162H68.162v4.162H64V107.53a2.783,2.783,0,0,0,2.775,2.775h22.2a2.783,2.783,0,0,0,2.775-2.775V90.882A2.783,2.783,0,0,0,88.972,88.108Zm-11.1,18.035a6.937,6.937,0,1,1,6.937-6.937A6.939,6.939,0,0,1,77.873,106.143Z" transform="translate(-59.838 18.829)" fill="#2bb8a6"/>
+    <path id="Path_4557" data-name="Path 4557" d="M4.162,32.432H6.937V28.27H11.1V25.495H6.937V21.333H4.162v4.162H0V28.27H4.162Z" transform="translate(0 78.667)" fill="#2bb8a6"/>
+    <path id="Path_4558" data-name="Path 4558" d="M213.505,230.4a4.435,4.435,0,0,0-4.439,4.439h0a4.439,4.439,0,1,0,4.439-4.439Z" transform="translate(-195.47 -116.804)" fill="#2bb8a6"/>
+  </g>
+</svg>

lib/classes/colors.dart

@@ -12,6 +12,7 @@ class MyColors {
   static const Color grey57Color = Color(0xff575757);
   static const Color grey67Color = Color(0xff676767);
   static const Color grey77Color = Color(0xff777777);
+  static const Color greyF7Color = Color(0xffF7F7F7);
   static const Color grey80Color = Color(0xff808080);
   static const Color grey70Color = Color(0xff707070);
   static const Color greyACColor = Color(0xffACACAC);
@@ -22,6 +23,7 @@ class MyColors {
   static const Color lightGreyE3Color = Color(0xffE3E3E3);
   static const Color lightGreyE6Color = Color(0xffE6E6E6);
   static const Color lightGreyEAColor = Color(0xffEAEAEA);
+  static const Color lightGreyE5Color = Color(0xffE5E5E5);
   static const Color darkWhiteColor = Color(0xffE0E0E0);
   static const Color redColor = Color(0xffD02127);
   static const Color yellowColor = Color(0xffF4E31C);

lib/extensions/string_extensions.dart

@@ -21,11 +21,11 @@ extension EmailValidator on String {
         style: TextStyle(fontSize: 10, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.4),
       );
 
-  Widget toText11({Color? color, bool isUnderLine = false, bool isBold = false}) => Text(
+  Widget toText11({Color? color, FontWeight? weight, bool isUnderLine = false, bool isBold = false}) => Text(
         this,
         style: TextStyle(
           fontSize: 11,
-          fontWeight: isBold ? FontWeight.bold : FontWeight.w600,
+          fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.w600),
           color: color ?? MyColors.darkTextColor,
           letterSpacing: -0.33,
           decoration: isUnderLine ? TextDecoration.underline : null,

lib/extensions/widget_extensions.dart

@@ -42,7 +42,7 @@ extension WidgetExtensions on Widget {
         child: this,
       );
 
-  Widget objectContainerView({String title = "", String note = "", bool disablePadding = false,double radius =15}) {
+  Widget objectContainerView({String title = "", String note = "", bool disablePadding = false, double radius = 15}) {
     return Container(
       padding: disablePadding ? EdgeInsets.zero : const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14),
       decoration: BoxDecoration(
@@ -69,14 +69,14 @@ extension WidgetExtensions on Widget {
     );
   }
 
-  Widget objectContainerBorderView({String title = "", String note = ""}) {
+  Widget objectContainerBorderView({String title = "", String note = "", bool disablePadding = false, double radius = 15, Color? color, Color borderColor = MyColors.lightGreyEFColor}) {
     return Container(
-      padding: const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14),
-      alignment: Alignment.center,
+      padding: disablePadding ? EdgeInsets.zero : const EdgeInsets.only(top: 15, bottom: 15, left: 14, right: 14),
       decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(15),
+        borderRadius: BorderRadius.circular(radius),
+        color: color,
         border: Border.all(
-          color: MyColors.lightGreyEFColor,
+          color: borderColor,
           width: 1,
         ),
       ),

lib/ui/screens/items_for_sale/add_new_item_for_sale.dart

@@ -28,7 +28,7 @@ class _AddNewItemForSaleState extends State<AddNewItemForSale> {
   List<GetSaleCategoriesList> getSaleCategoriesList = [];
   late PageController _controller;
   ItemReviewModel? itemReviewModel;
-  int pageIndex = 0;
+  int? pageIndex;
 
   @override
   void initState() {
@@ -43,7 +43,7 @@ class _AddNewItemForSaleState extends State<AddNewItemForSale> {
 
   @override
   Widget build(BuildContext context) {
-    getRequestID();
+    pageIndex ??= (ModalRoute.of(context)?.settings.arguments as int?) ?? 0;
     return Scaffold(
       backgroundColor: Colors.white,
       appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
@@ -147,11 +147,6 @@ class _AddNewItemForSaleState extends State<AddNewItemForSale> {
     );
   }
 
-  void getRequestID() async {
-    int args = (ModalRoute.of(context)?.settings.arguments ?? <String, dynamic>{}) as int;
-    pageIndex = args;
-  }
-
   void getItemForSaleCategory() async {
     try {
       Utils.showLoading(context);

lib/ui/screens/items_for_sale/fragments/add_details_fragment.dart

@@ -188,11 +188,11 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
           children: [
             title.toText16().expanded,
             6.width,
-            SimpleButton(LocaleKeys.add.tr(), () async {
-              ImageOptions.showImageOptions(context, (String image, File file) {
-                setState(() {
-                  images.add(image);
-                });
+            SimpleButton(LocaleKeys.add.tr(), () {
+              ImageOptions.showImageOptionsNew(context, (String image, File file) {
+                // setState(() {
+                //   images.add(image);
+                // });
               });
             }, fontSize: 14),
           ],

lib/ui/work_list/sheets/search_options_sheet.dart

@@ -47,11 +47,7 @@ class SearchOptionsSheet extends StatelessWidget {
               });
             },
             separatorBuilder: (context, index) {
-              return Container(
-                width: double.infinity,
-                height: 1,
-                color: Color(0xffE3E3E3),
-              );
+              return 1.divider;
             },
             itemCount: searchOptions.length,
             physics: NeverScrollableScrollPhysics(),

lib/widgets/bottom_sheets/attachment_options.dart

@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:mohem_flutter_app/classes/colors.dart';
+import 'package:mohem_flutter_app/extensions/string_extensions.dart';
+import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
+
+class AttachmentOptions extends StatelessWidget {
+  VoidCallback onCameraTap;
+  VoidCallback onGalleryTap;
+  VoidCallback onFilesTap;
+
+  AttachmentOptions({Key? key, required this.onCameraTap, required this.onGalleryTap, required this.onFilesTap}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: double.infinity,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          "Upload Attachment".toSectionHeading(),
+          "Select from gallery or open camera".toText11(weight: FontWeight.w500),
+          GridView(
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 105 / 105, crossAxisSpacing: 9, mainAxisSpacing: 9),
+            physics: const NeverScrollableScrollPhysics(),
+            padding: const EdgeInsets.only(top: 21, bottom: 14),
+            shrinkWrap: true,
+            children: [
+              itemView("open_camera.svg", "Open\nCamera"),
+              itemView("gallery.svg", "Upload from\nGallery"),
+              itemView("files", "Upload from\nFiles"),
+            ],
+          )
+        ],
+      ).paddingOnly(left: 21, right: 21, bottom: 21),
+    );
+  }
+
+  Widget itemView(String icon, String title) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Icon(Icons.photo),
+        title.toText11(isBold: true),
+      ],
+    ).paddingOnly(left: 13, right: 13, top: 16, bottom: 12).expanded.objectContainerBorderView(
+          disablePadding: true,
+          radius: 10,
+          color: MyColors.greyF7Color.withOpacity(.48),
+          borderColor: MyColors.lightGreyE5Color.withOpacity(.48),
+        );
+  }
+}

lib/widgets/image_picker.dart

@@ -1,16 +1,31 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
+import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
+import 'package:mohem_flutter_app/widgets/bottom_sheets/attachment_options.dart';
 
 class ImageOptions {
-  static void showImageOptions(
-    BuildContext context,
-    Function(String, File) image,
-  ) {
+  static void showImageOptionsNew(BuildContext context, Function(String, File) image) {
+    showMyBottomSheet(
+      context,
+      child: AttachmentOptions(
+        onCameraTap: () async {
+          PickedFile? path = await ImagePicker.platform.pickImage(source: ImageSource.camera, imageQuality: 20);
+        },
+        onGalleryTap: () {},
+        onFilesTap: () async {
+          FilePickerResult? result = await FilePicker.platform.pickFiles();
+        },
+      ),
+    );
+  }
+
+  static void showImageOptions(BuildContext context, Function(String, File) image) {
     showModalBottomSheet(
         backgroundColor: Colors.transparent,
         context: context,