From e64a91855f60e715bb729849876b2c53a651f067 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 21 Aug 2023 16:41:38 +0300 Subject: [PATCH] fixes --- lib/pages/medical/reports/reports_page.dart | 4 +- .../dialogs/radio_selection_dialog.dart | 231 +++++++++--------- 2 files changed, 121 insertions(+), 114 deletions(-) diff --git a/lib/pages/medical/reports/reports_page.dart b/lib/pages/medical/reports/reports_page.dart index bdd638e5..0dfa2ac9 100644 --- a/lib/pages/medical/reports/reports_page.dart +++ b/lib/pages/medical/reports/reports_page.dart @@ -24,7 +24,9 @@ class MedicalReports extends StatelessWidget { message: TranslationBase.of(context).confirmMsgReport, onTap: () => reportsViewModel.insertRequestForMedicalReport(model, TranslationBase.of(context).successSendReport), ), - ); + ).then((value) { + Navigator.pop(context); + }); return; } diff --git a/lib/widgets/dialogs/radio_selection_dialog.dart b/lib/widgets/dialogs/radio_selection_dialog.dart index b6380a3c..dc460009 100644 --- a/lib/widgets/dialogs/radio_selection_dialog.dart +++ b/lib/widgets/dialogs/radio_selection_dialog.dart @@ -50,126 +50,131 @@ class RadioSelectionDialogState extends State { insetPadding: EdgeInsets.only(left: 21, right: 21), child: Padding( padding: EdgeInsets.only(left: 20, right: 20, top: 18, bottom: 28), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - child: Padding( - padding: const EdgeInsets.only(top: 16.0), - child: Text( - TranslationBase.of(context).select, - style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: Color(0xff2B353E), height: 35 / 24, letterSpacing: -0.96), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Padding( + padding: const EdgeInsets.only(top: 16.0), + child: Text( + TranslationBase.of(context).select, + style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: Color(0xff2B353E), height: 35 / 24, letterSpacing: -0.96), + ), ), ), - ), - IconButton( - padding: EdgeInsets.zero, - icon: Icon(Icons.close), - color: Color(0xff2B353E), - constraints: BoxConstraints(), - onPressed: () { - Navigator.pop(context); - }, - ) - ], - ), - SizedBox(height: 21), - Text( - TranslationBase.of(context).pleaseSelectFromBelowOptions, - style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56), - ), - widget.isShowSearch ? Padding( - padding: const EdgeInsets.all(8.0), - child: TextField( - controller: controller, - onChanged: (v) { - if (v.length > 0) { - tempListData.clear(); - for (int i = 0; i < widget.listData.length; i++) { - if (widget.listData[i].title.toLowerCase().contains(v.toLowerCase())) { - tempListData.add(widget.listData[i]); - } - } - } else { - addAllData(); - } - setState(() {}); - }, - decoration: InputDecoration( - hintStyle: TextStyle(fontSize: 17), - hintText: 'Search Insurance', - suffixIcon: Icon(Icons.search), - border: InputBorder.none, - contentPadding: EdgeInsets.all(12), - ), + IconButton( + padding: EdgeInsets.zero, + icon: Icon(Icons.close), + color: Color(0xff2B353E), + constraints: BoxConstraints(), + onPressed: () { + Navigator.pop(context); + }, + ) + ], ), - ) : Container(), - SizedBox(height: widget.isScrollable ? 12 : 0), - SizedBox( - height: widget.isScrollable ? MediaQuery.of(context).size.height * .4 : null, - child: ListView.separated( - physics: widget.isScrollable ? BouncingScrollPhysics() : NeverScrollableScrollPhysics(), - shrinkWrap: !widget.isScrollable, - padding: EdgeInsets.only(bottom: widget.isScrollable ? 21 : 42, top: 10), - itemBuilder: (context, index) { - return InkWell( - onTap: () { - setState(() { - selectedIndex = tempListData[index].value; - }); - }, - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - width: 22, - height: 22, - child: Radio( - value: tempListData[index].value, - groupValue: selectedIndex, - onChanged: (value) { - setState(() { - selectedIndex = value; - }); - }, + SizedBox(height: 21), + Text( + TranslationBase.of(context).pleaseSelectFromBelowOptions, + style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56), + ), + widget.isShowSearch + ? Padding( + padding: const EdgeInsets.all(8.0), + child: TextField( + controller: controller, + onChanged: (v) { + if (v.length > 0) { + tempListData.clear(); + for (int i = 0; i < widget.listData.length; i++) { + if (widget.listData[i].title.toLowerCase().contains(v.toLowerCase())) { + tempListData.add(widget.listData[i]); + } + } + } else { + addAllData(); + } + setState(() {}); + }, + decoration: InputDecoration( + hintStyle: TextStyle(fontSize: 17), + hintText: 'Search Insurance', + suffixIcon: Icon(Icons.search), + border: InputBorder.none, + contentPadding: EdgeInsets.all(12), + ), + ), + ) + : Container(), + SizedBox(height: widget.isScrollable ? 12 : 0), + SizedBox( + height: widget.isScrollable ? MediaQuery.of(context).size.height * .4 : null, + child: ListView.separated( + physics: widget.isScrollable ? BouncingScrollPhysics() : NeverScrollableScrollPhysics(), + // shrinkWrap: !widget.isScrollable, + shrinkWrap: !widget.isScrollable, + padding: EdgeInsets.only(bottom: widget.isScrollable ? 21 : 42, top: 10), + itemBuilder: (context, index) { + return InkWell( + onTap: () { + setState(() { + selectedIndex = tempListData[index].value; + }); + }, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 22, + height: 22, + child: Radio( + value: tempListData[index].value, + groupValue: selectedIndex, + onChanged: (value) { + setState(() { + selectedIndex = value; + }); + }, + ), ), - ), - SizedBox(width: 8), - Expanded( - child: Text( - tempListData[index].title, - // maxLines: 2, - style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.56), + SizedBox(width: 8), + Expanded( + child: Text( + tempListData[index].title, + // maxLines: 2, + style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.56), + ), ), - ), - ], - ), - ); - }, - separatorBuilder: (context, index) => SizedBox(height: 10), - itemCount: widget.listData.length), - ), - SizedBox(height: widget.isScrollable ? 12 : 0), - Row( - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: DefaultButton( - TranslationBase.of(context).save, - () { - Navigator.pop(context); - widget.onValueSelected(selectedIndex); + ], + ), + ); }, - color: Color(0xff349745), + separatorBuilder: (context, index) => SizedBox(height: 10), + itemCount: tempListData.length), + ), + SizedBox(height: widget.isScrollable ? 12 : 0), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: DefaultButton( + TranslationBase.of(context).save, + () { + Navigator.pop(context); + widget.onValueSelected(selectedIndex); + }, + color: Color(0xff349745), + ), ), - ), - ], - ), - ], + ], + ), + ], + ), ), ), );