From d6315b067423d8c220adec7867fbc277a65d238b Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 10 Oct 2022 12:40:26 +0300 Subject: [PATCH] fixes. --- lib/ui/work_list/work_list_screen.dart | 6 +- .../attachments_fragment.dart | 10 +- lib/ui/work_list/worklist_settings.dart | 179 ++++++++---------- 3 files changed, 84 insertions(+), 111 deletions(-) diff --git a/lib/ui/work_list/work_list_screen.dart b/lib/ui/work_list/work_list_screen.dart index 8db019c..2fa5156 100644 --- a/lib/ui/work_list/work_list_screen.dart +++ b/lib/ui/work_list/work_list_screen.dart @@ -165,11 +165,7 @@ class _WorkListScreenState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - width: double.infinity, - height: 1, - color: MyColors.lightGreyEFColor, - ), + Container(width: double.infinity, height: 1, color: MyColors.lightGreyEFColor), SizedBox( height: 40, child: ListView.separated( diff --git a/lib/ui/work_list/worklist_fragments/attachments_fragment.dart b/lib/ui/work_list/worklist_fragments/attachments_fragment.dart index 0497823..ebc3db9 100644 --- a/lib/ui/work_list/worklist_fragments/attachments_fragment.dart +++ b/lib/ui/work_list/worklist_fragments/attachments_fragment.dart @@ -28,9 +28,12 @@ class AttachmentsFragment extends StatelessWidget { (getAttachmentList[index].fILENAME?.capitalizeFirstofEach ?? "").toText16().expanded, ], ).objectContainerView().onPress(() async { - // print("calling"); - // String path = await _createFileFromString(getAttachmentList[index].fILEDATA ?? "", getAttachmentList[index].fILECONTENTTYPE ?? ""); - // OpenFile.open(path); + try { + String path = await _createFileFromString(getAttachmentList[index].fILEDATA ?? "", getAttachmentList[index].fILECONTENTTYPE ?? ""); + OpenFile.open(path); + } catch (ex) { + debugPrint("FileErorr:$ex"); + } }); }, separatorBuilder: (BuildContext context, int index) => 12.height, @@ -67,7 +70,6 @@ class AttachmentsFragment extends StatelessWidget { String dir = (await getApplicationDocumentsDirectory()).path; File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext); await file.writeAsBytes(bytes); - // print(file.path); return file.path; } } diff --git a/lib/ui/work_list/worklist_settings.dart b/lib/ui/work_list/worklist_settings.dart index 7bdec80..77c1d81 100644 --- a/lib/ui/work_list/worklist_settings.dart +++ b/lib/ui/work_list/worklist_settings.dart @@ -1,4 +1,3 @@ - import 'package:easy_localization/src/public_ext.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -6,6 +5,7 @@ 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'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; @@ -15,7 +15,7 @@ import 'package:mohem_flutter_app/models/worklist/update_user_type_list.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart'; -class WorklistSettings extends StatefulWidget { +class WorklistSettings extends StatefulWidget { const WorklistSettings({Key? key}) : super(key: key); @override @@ -26,7 +26,6 @@ class _WorklistSettingsState extends State { List getUserItemTypesList = []; UpdateUserItemTypesList? updateUserItemTypesList; - void initState() { super.initState(); userItemTypesList(); @@ -47,10 +46,9 @@ class _WorklistSettingsState extends State { void updateUserItem() async { try { Utils.showLoading(context); - List> itemList=[]; + List> itemList = []; for (var element in getUserItemTypesList) { - itemList.add(UpdateUserTypesList(itemID: element.uSERITEMTYPEID, pITEMTYPE: element.iTEMTYPE,pFYAENABLEDFALG: element.fYAENABLEDFALG, pFYIENABLEDFALG: element.fYIENABLEDFLAG).toJson()); - + itemList.add(UpdateUserTypesList(itemID: element.uSERITEMTYPEID, pITEMTYPE: element.iTEMTYPE, pFYAENABLEDFALG: element.fYAENABLEDFALG, pFYIENABLEDFALG: element.fYIENABLEDFLAG).toJson()); } updateUserItemTypesList = await WorkListApiClient().updateUserItemTypes(itemList); Utils.hideLoading(context); @@ -64,115 +62,92 @@ class _WorklistSettingsState extends State { @override Widget build(BuildContext context) { - return Scaffold(backgroundColor: Colors.white, + return Scaffold( + backgroundColor: Colors.white, appBar: AppBarWidget( context, title: LocaleKeys.worklistSettings.tr(), ), - body:ListView( + body: Column( children: [ - Expanded( - child: Container( - margin: const EdgeInsets.only(top: 21, left: 21, right: 21), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + 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: [ - Container( - child: LocaleKeys.TurnNotificationsFor.tr().toText22(color: MyColors.blackColor), - ).paddingOnly(top: 10, bottom: 50), + LocaleKeys.itemType.tr().toText14(color: MyColors.blackColor), Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Container( - child: LocaleKeys.itemType.tr().toText14(color: MyColors.blackColor) , - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - Container( - child: "FYA".tr().toText14(color: MyColors.blackColor) , - ), - Container( - child: "FYI".tr().toText14(color: MyColors.blackColor) , - ).paddingOnly(left: 30, right: 30), - ], - ) - ], - ), - 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,), - ]); - } - ), - ), + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: ["FYA".tr().toText14(color: MyColors.blackColor), 30.width, "FYI".tr().toText14(color: MyColors.blackColor), 30.width], + ) ], ), - ), - ), - DefaultButton( - LocaleKeys.save.tr(), () async { + 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, ], - ) - - ); + )); } - - Widget customSwitch(GetUserItemTypesList list){ - return Padding( - padding: const EdgeInsets.only(top: 21), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text(list.iTEMTYPE.toString(), style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w600, - color: MyColors.blackColor - ),), - const Spacer(), - Row( - children: [ - CupertinoSwitch( - trackColor: Colors.grey, - activeColor: MyColors.gradiantEndColor, - value: list?.fYAENABLEDFALG =='Y' ?true : false, - onChanged: (value){ - setState(() { - list?.fYAENABLEDFALG = value == true ? 'Y': 'N'; - }); - } - ), - CupertinoSwitch( - trackColor: Colors.grey, - activeColor: MyColors.gradiantEndColor, - value: list?.fYIENABLEDFLAG =='Y' ?true : false, - onChanged: (value){ - setState(() { - // list.isFYI = value; - list?.fYIENABLEDFLAG = value ==true ? 'Y': 'N'; - }); - } - ), - ], - ) - ], - ), - ); + Widget customSwitch(GetUserItemTypesList list) { + return Padding( + padding: const EdgeInsets.only(top: 21), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + list.iTEMTYPE.toString(), + style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: MyColors.blackColor), + ), + 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( + trackColor: MyColors.grey57Color, + activeColor: MyColors.textMixColor, + value: list?.fYIENABLEDFLAG == 'Y' ? true : false, + onChanged: (value) { + setState(() { + // list.isFYI = value; + list?.fYIENABLEDFLAG = value == true ? 'Y' : 'N'; + }); + }), + ], + ) + ], + ), + ); } - }