bottom sheet ui improvements,safe area added.

lib/new_views/common_widgets/app_drawer.dart

@@ -26,6 +26,8 @@ class AppDrawer extends StatelessWidget {
     return Drawer(
       backgroundColor: AppColor.background(context),
       width: MediaQuery.of(context).size.width * .8,
+      child: SafeArea(
+        top: false,
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -97,9 +99,9 @@ class AppDrawer extends StatelessWidget {
                 }
               }
             }),
-          18.height,
+            16.height,
             const Divider().defaultStyle(context),
-          18.height,
+            16.height,
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -114,6 +116,7 @@ class AppDrawer extends StatelessWidget {
             )
           ],
         ).paddingOnly(top: 66, start: 16, end: 24, bottom: 18),
+      ),
     );
   }
 

lib/new_views/pages/land_page/create_request-type_bottomsheet.dart

@@ -10,7 +10,6 @@ import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/pages/gas_refill_request_form.dart';
 import 'package:test_sa/views/pages/device_transfer/create__device_transfer_request.dart';
 
-
 class CreateRequestTypeBottomSheet extends StatelessWidget {
   final bool isEngineer;
 
@@ -20,7 +19,9 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
   Widget build(BuildContext context) {
     List<CreateRequestModel> requestList = CreateRequestModel.requestsList(context, isEngineer);
 
-    return Container(
+    return SafeArea(
+      top: false,
+      child: Container(
         padding: const EdgeInsets.all(16.0),
         width: double.infinity,
         color: AppColor.background(context),
@@ -30,7 +31,7 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
           children: [
             context.translation.selectWorkOrder.heading4(context),
             GridView(
-            padding: const EdgeInsets.only(top: 16, bottom: 16),
+              padding: const EdgeInsets.only(top: 16, bottom: 0),
               shrinkWrap: true,
               physics: const NeverScrollableScrollPhysics(),
               gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 16, mainAxisSpacing: 16),
@@ -48,6 +49,7 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
             ),
           ],
         ),
+      ),
     );
     return const Placeholder();
   }

lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart

@@ -48,7 +48,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
   @override
   Widget build(BuildContext context) {
     bool isEngineer = (Provider.of<UserProvider>(context, listen: false).user?.type) == UsersTypes.engineer;
-    bool isUserFMS = Provider.of<SettingProvider>(context, listen: false).isUserFMS;
+    // bool isUserFMS = Provider.of<SettingProvider>(context, listen: false).isUserFMS;
     if (search == null) {
       search = SearchAllRequestsModel(
         requestNumber: SearchByRequestNumberModel(context, controller: TextEditingController()),
@@ -65,7 +65,6 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
       context.translation.gasRefill: 2,
       context.translation.transferAsset: 3,
       context.translation.preventiveMaintenance: 4,
-      //TODO unCommit this to enable task.
       context.translation.task: 6,
     };
 
@@ -73,8 +72,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
       types[context.translation.recurrentWo] = 5;
     }
 
-    if (!isUserFMS) {
+    if (context.settingProvider.isUserFlowMedical) {
-      // replace with translation
       types['Recall and Alert'] = 7;
     }
     final statuses = {

lib/new_views/pages/land_page/my_request/my_requests_page.dart

@@ -34,7 +34,6 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
   @override
   Widget build(BuildContext context) {
     if (_provider == null) {
-      bool isUserFMS = Provider.of<SettingProvider>(context, listen: false).isUserFMS;
       requestsList = [
         Request(null, context.translation.allWorkOrder),
         Request(1, context.translation.correctiveMaintenance),
@@ -48,7 +47,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
       //TODO unCommit this to enable task
       requestsList.add(Request(6, context.translation.taskRequest));
       //after confirm name add this to translation...
-      if (!isUserFMS) {
+      if (context.settingProvider.isUserFlowMedical) {
         requestsList.add(Request(7, 'Recall and Alert'));
       }
 

lib/views/widgets/images/multi_image_picker.dart

@@ -484,29 +484,41 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
       context: context,
       builder: (BuildContext context) {
         Widget listCard({required String icon, required String label, required VoidCallback onTap}) {
-          return GestureDetector(
+          return Container(
-            onTap: onTap,
+            padding: const EdgeInsets.all(12),
-            child: Container(
+            decoration: BoxDecoration(
-              constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight),
+              color: Colors.white,
-              padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight),
+              borderRadius: BorderRadius.circular(12),
-              decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)),
+              border: Border.all(color: const Color(0xffF1F1F1), width: 1),
+            ),
             child: Column(
-                mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                  icon.toSvgAsset(),
+                icon.toSvgAsset(color: const Color(0xff7D859A), width: 36, height: 36),
-                  24.height,
+                // Icon(iconData, color: const Color(0xff7D859A), size: 36),
-                  label.bodyText2(context).custom(color: AppColor.black20),
+                Text(
-                ],
+                  label,
+                  style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500),
                 ),
+              ],
             ),
-          );
+          ).onPress(onTap);
         }
 
-        return Container(
+        return SafeArea(
-          padding: const EdgeInsets.all(16.0),
+          top: false,
-          child: Row(
+          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              "Attach File".heading4(context),
+              12.height,
+              GridView(
+                padding: const EdgeInsets.all(0),
+                shrinkWrap: true,
+                physics: const NeverScrollableScrollPhysics(),
+                gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12),
                 children: <Widget>[
                   listCard(
                     icon: 'camera_icon',
@@ -532,6 +544,38 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
                   ),
                 ],
               ),
+              // Container(
+              //   padding: const EdgeInsets.all(16.0),
+              //   child: Row(
+              //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              //     children: <Widget>[
+              //       listCard(
+              //         icon: 'camera_icon',
+              //         label: '${context.translation.open}\n${context.translation.camera}',
+              //         onTap: () {
+              //           Navigator.of(context).pop(ImageSource.camera);
+              //         },
+              //       ),
+              //       listCard(
+              //         icon: 'gallery_icon',
+              //         label: '${context.translation.open}\n${context.translation.gallery}',
+              //         onTap: () {
+              //           Navigator.of(context).pop(ImageSource.gallery);
+              //         },
+              //       ),
+              //       listCard(
+              //         icon: 'file_icon',
+              //         label: '${context.translation.open}\n${context.translation.files}',
+              //         onTap: () async {
+              //           await fromFilePicker();
+              //           Navigator.pop(context);
+              //         },
+              //       ),
+              //     ],
+              //   ),
+              // ),
+            ],
+          ).paddingAll(16),
         );
       },
     );