From 49e9b35eff2f641c65210c1bb6f9ffcaa92c2c0d Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Mon, 26 Dec 2022 09:35:14 +0300
Subject: [PATCH] worklist setting ui improvements.

---
 lib/ui/work_list/worklist_settings.dart | 137 ++++++++++++------------
 1 file changed, 68 insertions(+), 69 deletions(-)

diff --git a/lib/ui/work_list/worklist_settings.dart b/lib/ui/work_list/worklist_settings.dart
index 7362028..4fc9424 100644
--- a/lib/ui/work_list/worklist_settings.dart
+++ b/lib/ui/work_list/worklist_settings.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/worklist/worklist_api_client.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
-import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
@@ -26,6 +25,7 @@ class _WorklistSettingsState extends State<WorklistSettings> {
   List<GetUserItemTypesList> getUserItemTypesList = [];
   UpdateUserItemTypesList? updateUserItemTypesList;
 
+  @override
   void initState() {
     super.initState();
     userItemTypesList();
@@ -47,8 +47,13 @@ class _WorklistSettingsState extends State<WorklistSettings> {
     try {
       Utils.showLoading(context);
       List<Map<String, dynamic>> itemList = [];
-      for (int index=0;index<getUserItemTypesList.length;index++) {
-        itemList.add(UpdateUserTypesList(itemID: index, pITEMTYPE: getUserItemTypesList[index].iTEMTYPE, pFYAENABLEDFALG: getUserItemTypesList[index].fYAENABLEDFALG, pFYIENABLEDFALG: getUserItemTypesList[index].fYIENABLEDFLAG).toJson());
+      for (int index = 0; index < getUserItemTypesList.length; index++) {
+        itemList.add(UpdateUserTypesList(
+                itemID: index,
+                pITEMTYPE: getUserItemTypesList[index].iTEMTYPE,
+                pFYAENABLEDFALG: getUserItemTypesList[index].fYAENABLEDFALG,
+                pFYIENABLEDFALG: getUserItemTypesList[index].fYIENABLEDFLAG)
+            .toJson());
       }
       updateUserItemTypesList = await WorkListApiClient().updateUserItemTypes(itemList);
       Utils.hideLoading(context);
@@ -62,87 +67,81 @@ class _WorklistSettingsState extends State<WorklistSettings> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        backgroundColor: Colors.white,
-        appBar: AppBarWidget(
-          context,
-          title: LocaleKeys.worklistSettings.tr(),
-        ),
-        body: Column(
-          children: [
-            ListView(
-              padding: const EdgeInsets.only(top: 21, left: 21, right: 21),
-              children: [
-                LocaleKeys.TurnNotificationsFor.tr().toText22(color: MyColors.blackColor),
-                16.height,
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    LocaleKeys.itemType.tr().toText14(color: MyColors.blackColor),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      children: ["FYA".tr().toText14(color: MyColors.blackColor), 30.width, "FYI".tr().toText14(color: MyColors.blackColor), 30.width],
-                    )
-                  ],
-                ),
-                const Divider(color: MyColors.greyA5Color),
-                SingleChildScrollView(
-                  scrollDirection: Axis.vertical,
-                  child: ListView.builder(
-                      scrollDirection: Axis.vertical,
-                      shrinkWrap: true,
-                      physics: ScrollPhysics(),
-                      itemCount: getUserItemTypesList == null ? 0 : getUserItemTypesList.length,
-                      itemBuilder: (BuildContext context, int index) {
-                        return Column(children: [
-                          customSwitch(getUserItemTypesList[index]),
-                          Divider(
-                            color: MyColors.greyC4Color,
-                            thickness: 0.5,
-                          ),
-                        ]);
-                      }),
-                ),
-              ],
-            ).expanded,
-            DefaultButton(LocaleKeys.save.tr(), () async {
-              updateUserItem();
-            }).insideContainer,
-          ],
-        ));
+      backgroundColor: Colors.white,
+      appBar: AppBarWidget(
+        context,
+        title: LocaleKeys.worklistSettings.tr(),
+      ),
+      body: Column(
+        children: [
+          ListView(
+            padding: const EdgeInsets.only(top: 21, left: 21, right: 21),
+            children: [
+              LocaleKeys.TurnNotificationsFor.tr().toText22(color: MyColors.blackColor),
+              16.height,
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  LocaleKeys.itemType.tr().toText14(color: MyColors.blackColor),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: ["FYA".tr().toText14(color: MyColors.blackColor), 30.width, "FYI".tr().toText14(color: MyColors.blackColor), 30.width],
+                  )
+                ],
+              ),
+              const Divider(color: MyColors.greyA5Color),
+              ListView.separated(
+                shrinkWrap: true,
+                physics: const NeverScrollableScrollPhysics(),
+                itemCount: getUserItemTypesList.length,
+                separatorBuilder: (cxt, index) => 1.divider,
+                itemBuilder: (BuildContext context, int index) => customSwitch(getUserItemTypesList[index]),
+              ),
+            ],
+          ).expanded,
+          DefaultButton(LocaleKeys.save.tr(), () async {
+            updateUserItem();
+          }).insideContainer,
+        ],
+      ),
+    );
   }
 
   Widget customSwitch(GetUserItemTypesList list) {
     return Padding(
-      padding: const EdgeInsets.only(top: 21),
+      padding: const EdgeInsets.only(top: 8, bottom: 8),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Text(
-            list.iTEMTYPE.toString(),
-            style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: MyColors.blackColor),
-          ),
+          list.iTEMTYPE!.toText16(),
           const Spacer(),
           Row(
             children: [
-              CupertinoSwitch(
-                  trackColor: MyColors.grey57Color,
-                  activeColor: MyColors.textMixColor,
-                  value: list?.fYAENABLEDFALG == 'Y' ? true : false,
-                  onChanged: (value) {
-                    setState(() {
-                      list?.fYAENABLEDFALG = value == true ? 'Y' : 'N';
-                    });
-                  }),
-              CupertinoSwitch(
+              Transform.scale(
+                scale: 0.8,
+                child: CupertinoSwitch(
+                    trackColor: MyColors.grey57Color,
+                    activeColor: MyColors.textMixColor,
+                    value: list.fYAENABLEDFALG == 'Y',
+                    onChanged: (value) {
+                      setState(() {
+                        list.fYAENABLEDFALG = value ? 'Y' : 'N';
+                      });
+                    }),
+              ),
+              Transform.scale(
+                scale: 0.8,
+                child: CupertinoSwitch(
                   trackColor: MyColors.grey57Color,
                   activeColor: MyColors.textMixColor,
-                  value: list?.fYIENABLEDFLAG == 'Y' ? true : false,
+                  value: list.fYIENABLEDFLAG == 'Y',
                   onChanged: (value) {
                     setState(() {
-                      // list.isFYI  = value;
-                      list?.fYIENABLEDFLAG = value == true ? 'Y' : 'N';
+                      list.fYIENABLEDFLAG = value ? 'Y' : 'N';
                     });
-                  }),
+                  },
+                ),
+              ),
             ],
           )
         ],