diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart index 5ad9edaa..110fa19f 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart @@ -9,7 +9,9 @@ import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:diplomaticquarterapp/widgets/dragable_sheet.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:diplomaticquarterapp/widgets/photo_view_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -31,7 +33,8 @@ class NewCMCStepOnePage extends StatefulWidget { } class _NewCMCStepOnePageState extends State { - int selectedItem=0; + int selectedItem = 0; + @override void initState() { super.initState(); @@ -62,7 +65,7 @@ class _NewCMCStepOnePageState extends State { value: widget.model.cmcAllServicesList[index].serviceID, activeColor: Colors.red[800], onChanged: (newValue) async { - selectedItem=index; + selectedItem = index; PatientERCMCInsertServicesList patientERCMCInsertServicesList = new PatientERCMCInsertServicesList( price: widget.model.cmcAllServicesList[index].price, serviceID: widget.model.cmcAllServicesList[index].serviceID.toString(), @@ -74,8 +77,8 @@ class _NewCMCStepOnePageState extends State { setState(() { widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList]; }); - // CMCGetItemsRequestModel cMCGetItemsRequestModel = new CMCGetItemsRequestModel(checkupType: newValue); - // await widget.model.getCheckupItems(cMCGetItemsRequestModel: cMCGetItemsRequestModel); + // CMCGetItemsRequestModel cMCGetItemsRequestModel = new CMCGetItemsRequestModel(checkupType: newValue); + // await widget.model.getCheckupItems(cMCGetItemsRequestModel: cMCGetItemsRequestModel); }, groupValue: widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList.length > 0 ? int.parse(widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList[0].serviceID) @@ -105,9 +108,33 @@ class _NewCMCStepOnePageState extends State { return mDivider(Colors.grey); }, itemCount: widget.model.cmcAllServicesList.length), - Image.asset( - projectViewModel.isArabic ? "assets/images/cc_ar.png" : "assets/images/cc_en.png", - width: double.infinity, + Stack( + children: [ + Image.asset( + projectViewModel.isArabic ? "assets/images/cc_ar.png" : "assets/images/cc_en.png", + width: double.infinity, + ), + Align( + alignment: Alignment.topRight, + child: Container( + decoration: containerColorRadiusBorder( + Colors.black.withOpacity(0.2), + 1000, + Colors.white, + ), + margin: EdgeInsets.all(12), + child: IconButton( + icon: Icon( + Icons.view_carousel_rounded, + color: Colors.white, + ), + onPressed: () { + showDraggableDialog(context, PhotoViewPage(projectViewModel.isArabic ? "assets/images/cc_ar.png" : "assets/images/cc_en.png")); + }, + ), + ), + ), + ], ), // Card( // shape: cardRadius(12), diff --git a/lib/widgets/photo_view_page.dart b/lib/widgets/photo_view_page.dart new file mode 100644 index 00000000..9d57865e --- /dev/null +++ b/lib/widgets/photo_view_page.dart @@ -0,0 +1,51 @@ +import 'package:diplomaticquarterapp/uitl/utils_new.dart'; +import 'package:flutter/material.dart'; +import 'package:photo_view/photo_view.dart'; + +class PhotoViewPage extends StatelessWidget { + String image; + + PhotoViewPage(this.image); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Container( + width: double.infinity, + height: double.infinity, + child: Stack( + children: [ + Align( + alignment: Alignment.center, + child: PhotoView( + imageProvider: AssetImage(image), + ), + ), + Align( + alignment: Alignment.topRight, + child: SafeArea( + child: Container( + decoration: containerColorRadiusBorder( + Colors.black.withOpacity(0.2), + 1000, + Colors.white, + ), + margin: EdgeInsets.all(12), + child: IconButton( + icon: Icon( + Icons.close, + color: Colors.white, + ), + onPressed: () { + Navigator.pop(context); + }, + ), + ), + ), + ), + ], + ), + ), + ); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index ef6a1ecb..c6f7f778 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -71,6 +71,7 @@ dependencies: #GIF image flutter_gifimage: ^1.0.1 + photo_view: any # flutter_webrtc: any # UI Reqs