From 5f981c9248bed76375323e7fb0a624dfbf91e79a Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 27 Sep 2020 13:17:56 +0300 Subject: [PATCH 1/5] Contact us --- lib/pages/ContactUs/findus/findus_page.dart | 10 ++++++---- lib/pages/ContactUs/findus/hospitrals_page.dart | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/pages/ContactUs/findus/findus_page.dart b/lib/pages/ContactUs/findus/findus_page.dart index e8f52cb9..f9e154f9 100644 --- a/lib/pages/ContactUs/findus/findus_page.dart +++ b/lib/pages/ContactUs/findus/findus_page.dart @@ -60,12 +60,12 @@ class _FindUsPageState extends State with SingleTickerProviderStateM child: Container( height: 60.0, margin: EdgeInsets.only(top: 10.0), - width: MediaQuery.of(context).size.width * 0.9, + width: MediaQuery.of(context).size.width *0.92,// 0.9, decoration: BoxDecoration( border: Border( bottom: BorderSide( color: Theme.of(context).dividerColor, - width: 0.7), + width: 0.9),//width: 0.7 ), color: Colors.white), child: Center( @@ -73,11 +73,13 @@ class _FindUsPageState extends State with SingleTickerProviderStateM isScrollable: true, controller: _tabController, indicatorWeight: 5.0, - indicatorSize: TabBarIndicatorSize.label, + //indicatorSize: TabBarIndicatorSize.label, + indicatorSize: TabBarIndicatorSize.tab, + indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: - EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), + EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart index 315fe553..292a9106 100644 --- a/lib/pages/ContactUs/findus/hospitrals_page.dart +++ b/lib/pages/ContactUs/findus/hospitrals_page.dart @@ -23,6 +23,7 @@ class _HospitalsPageState extends State { baseViewModel: model, body: SingleChildScrollView( child: Container( + // margin: EdgeInsets.only(left: 15,right: 15,top: 70), margin: EdgeInsets.only(left: 15,right: 15,top: 70), child: Column( children: [ @@ -143,7 +144,7 @@ class _HospitalsPageState extends State { onPressed: () { setState(() { - launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); + launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group"); }); }, ), From 97d0c439c7aeeff3aff27f2984c2e181b2621154 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 27 Sep 2020 14:46:01 +0300 Subject: [PATCH 2/5] Contact us --- assets/images/new-design/call.png | Bin 0 -> 2160 bytes assets/images/new-design/navigate.png | Bin 0 -> 2623 bytes lib/pages/ContactUs/findus/hospitrals_page.dart | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 assets/images/new-design/call.png create mode 100644 assets/images/new-design/navigate.png diff --git a/assets/images/new-design/call.png b/assets/images/new-design/call.png new file mode 100644 index 0000000000000000000000000000000000000000..cf6713cb881cf8a9cb0155594b81dc8ac5caa0db GIT binary patch literal 2160 zcmV-$2#@!PP)Px-DoI2^RCodHoDFOfWf;fb_r2>FG9XhiDqGiXYfBhg3u+(^lo%JkH71IRiUCb9 zXcQA;2qA_TLllBBF{1H<1W3e0iTHtvh=9Zo6vMh@#CDx+VSoq`(E(#^@AY}Q9qD@g z?t9k{dP#G4@7?{M=l%8R`|;de38^d<0u=%!On_$V`vJ=o3nhFRrKFv6UPmbTm2kSV zdVs8(a?ypfCJN8uct0IH)S-k<2vNGH$6|A((=C_dX(O=H z;#d#u-NI}td@)60N`T!BwmTHYzQ_iidhW#nF)6^l#>R;QT=v2b^9mJ8w(E-lV$wEn zK#^AF0}o+e3~ge<2<$SOYZX>~gi<;-+o(%)emO^C!U*Ja%o0)X$~_Vj0wjzsP83P` zl$GnxSp#r*3`gtpftBpqa)hV>7$$6PG5{jV%MGFiAfdcP1gKOR2r*3A-g20+XaN%9 zNL6`($7;fazAaF%AW{hc(ptkjp>$@C#d4)#_H;0$0SL(hO{z)jsQO>|!K9}2Se@c{IvFIcP zX!H5b!;E3QP)9jgeb8!c5UN>Vv7`XeugD-@1;gL7qI|@A%|pcWt|+}?&`AjpQ%x}S zdRe5S&@pv%S!@eMY8Fx}ZKJ-Q5R=L3@PU(NQI29%L*{#0Ib>r}Mj!&amXHv%h0ltD zhdS`Q;U%2%Ezm1#=Hepl7@?IGAUe?&@NR|q$+sdMg7$E_+hP~mJc#r!Q>}~uq8K|L zStN2;gPPEOyx_Lj9>VQXT`~sPdbIB_BlHQO6@@T_)Y+!42K((obqy5D7$Ex8=J$LA znTCxb{R4&)WLdX#H#A)@Qr9T0tN=!xI(K>rw1ZY^`)ippYYk<*w zAy?*&BuPcOI9@R+I}g@1+C+-#t(7%EbjTU-{R~5qCq+94gX~E|vT09ueRGp&ZN2nz z0*KBy{oePWSAI>jWAMdX6_MC}cZ1_5(b^c@U1ocuNZqtEkyOTDAk4ZfjxS+6a!ac7 zaykaLKcRle^RnS${uj)Kwn{YgVyoYOJRkkM0HWcZ zNt0?q<7)RoZ#p#}N0MI4`Q`~^XpuD#7)*Ljk^=|Kj&{cQ2AKLJY!U$CF``5|T!(x) zKcAB~K=i%)>Zbb080j}`!;;h`uVRSwUa05;uAuKgra~}4pUDaP4yTQ&u7PIgB=|ks z>Gyb2otNyG5P&G&ZFRIo2>%|OnV8I2KIH&045RLKV+P2Ibnhi2JVF^xJ!>+tnGZx^ z0MXGdbJI0kl6S*qMvmh(*)Pz35%Rpt@7+HB#e8o5Fg3J{%fTbgG<-?9tZoodxN zJ=V~E?V_Q`0_PE5zpC$UXr4isv$VG28IeZbBS()%_`j2Yl-F+DSurK zon0H2sx6#Bo0n%3k}X7C03t9<5Gag(3I=q~`N6E{91KxH0B?ebFAE`(h%z^m-dQ(* zSP{3m`93a5n~i`d0^BGKPEK(pGAA8GT>+v)_|kTSu}{E|X_SMdu#*8q-2p}+T5TN> z4nJo>ug@CFJ`F@e07fA~z7JAX+hIGW9@0=~@y1d>%sH75ZzJ74J{JRR$_Hq_1c20`RFgZ-~bT< zJ|klam}bEvBroZ3vq~^$KI#E{!+YU$wZWl+A}brAmoCabFpGawx#$2QV9593e-%DA z@?V8TGw_CA$2+cocX4bG6eU2_LHs*_5UpAR4fi8zS;5wvY;OyA?gU`rSRaZSpz5f* z-ady&WHlsdAz5311>ng6`R*3dGZb&VBmk;T4}+x3VGMMuTBiFt1w6D}QUFz0J?7@A zVJ1Bd`wO53u9!{E34#S)tW?+r`jq>fU5JqU+x$`Sfk8`J8+LeMcUQ!eAdIm zD7vAF53ZOR45oc|x}*Wdg2Lx%6q()&KdQT+8=npBWtL-HejcK3t0^2=(bC`Ni`7oG zT{Zw?D~V4_gvZvxyPx;`AI}URCodHTziaER~bL&&Ygv&tSh$ZM!IEZ*xgxRpBNI2AxdNaz$P}PN|jnQ z)zm6cN=+JLHI~?>u^1~chS;VpijT&`D78SWg|;>|CV+N#VHak0U}n3!$O0mEVcB`z z&)->?WID{_p6@kQPA0a;7udEbYH2sVZ~yR$;} z3qb=y$UfwK5a$+>qDc^)kwQ)*?F;*-&i8OWpy%n!7D#`yS@-O z+!pyH8DgjE)AEkJKhv~f(N}xN$M$;Z%TodmFI~FGY-oB4{oDgy7NVkU62Ew#NIeuz zCg&>3F*7|Q@JL(d%A8@m2nU@^Y_6%HS&v$C*18X!j-PeS=v70W5P0O)t~EK6_G9YN z>^5MwJ)&b~c6M#|zqx4<fsy&LVTqo;w__)r z_;g$YCt6z@@pkdF6A;(v5?Kf;oI&~#1P>0X!d@feFhTXx6cEoiG=m`z?$jtCrH zwrq)IESz#W>Vmwz4OZ&@RpaCTwo{O?j*bPFv&JS8@_QijMmsv?WoWoR5knY_cQ_(& zC=_`V^Q)~q*YjEzrDZ*UP}J`@Hjdxa)s$)y&qMdK9R0kGLAl#{lkwN{_c~{GABbiJ zUHL5?XGO9{Et0)l@|3L==b|%xiRj&E*4v6~Yu#Eh@J%g+0%3Ly913@Q3iHuF7ud3W zi9z9l$cmnU$=H-_r7D6$p{^Zh&flmaRx%rvArriK{sY}-&t5DkP$7|D1If6zg58Q) z7yvf9NuF|+Nk$*UgBhymxJ)K$Q82rB$>+;tS4?IRsG2VZjyoz^E|Uq}-}Wb?e<_pA zPF@2J14J7^A}_2@;u9R_ECPqyI4Fpe*86z}VMg-TcF#-#N!t+sr32%^19pKqkt0caIQnEs?Q$^*6d_%J z=-fxT#YkFLk0T!>dXuAvrPfyEcJfP`iWHElgfMy+AI_Uu&I-w3j?t1fm9>(*mZ1iMmfL zU+&8~u|?K8ZF~x%6qCAoECS(aMAs4CUgS(RhzO1!hrxPJM{H8NTr2|7)gI!|APupB zqo<>D?3NWbqPw_FM<*|9jxRWxzqWg35s1xcECNxmJJrqwyWlu-h*oTcUW2YKhV2+< zqR%3*KM{>$qM$uuT`82Y9bi3~(hM$N9sw>^P*n=-bY&bY0+k>zX@yKo@?Ytnp1xE;q-++OK(+7< z$E-`714^>c!T?OMS%*LYyy={EQs%{ zV7qD-Mv@@v;&a$rb7(l!@$sq(R|OKG&_b+9KVg~HTS)4$t5;Hv#HA*g`D4jE8;Ooa zL)CGc;mFzf+GN97H4!zHz#Ge6A*`2!mY6Vd=Jchho+vu@yXjlh9q{ACO!uekxrYa1BxzKhz& z+e1?X&NTv+U75>nR#macM_t{b?;9LQ#(wV>C|3#WpEz+8Pj{DF;JmP72y2U*c3mY< z0c)TXLRI>kd)zEkIa_%3+|!qg|E*j;C*5@d)$S{-@IT1`Ch;5;J`pedNM?gNIj4ICbd(3|*>W|vnEJR?v6 z?tVKyiq88{ufSKc3*VQ6B6DvwIVbs^5~zS7SovdwuK(o(BwLrn_g5tn<7|B!ik=gQ zrkpda+!ukx*QSjA_fY?M?58$3a3tb6feM{!%6P@w>IkWxaypQ;HmZJDPfcIi7XlTm zzGQ40`XttuM7qUN{ci6>{DiI^N8UFARa3_DZks=uYf5`go6 z`yiSVM)oew=15JhN{ZKvK!v7Rq_&{;jFv=ZGZB61g99f|#%zkaE>@F4q_7l6ZtZBd z%z)ZjvA8hZ)-}-!n6lhsOV%Tyn$|#7CN<$TEKB=yd)4nPGUuZ`9#Lb@Y|ROrCsFl> zmSuZ)1KxAb$&9tWGalFeu-YCi_N8jxgbSf!pP<@m@tMN3Yp*F~WaZi`yCJU4^*g05 zYGA(5X2L{&R{2|BJn_x-LY~51S2a)pQvXIY*ChT4U?u*0m7Ya(`F5yjXe=P=CHza#rvccv_uK;CWiRWh3FlF&_+fx@wkCV2klP;~$R002ovPDHLkV1oEm?xz3% literal 0 HcmV?d00001 diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart index 292a9106..3af46f36 100644 --- a/lib/pages/ContactUs/findus/hospitrals_page.dart +++ b/lib/pages/ContactUs/findus/hospitrals_page.dart @@ -79,7 +79,8 @@ class _HospitalsPageState extends State { child: Row( children: [ IconButton( - icon: Icon(Icons.person_pin_circle_outlined,color: Colors.red,), + // icon: Icon(Icons.person_pin_circle_outlined,color: Colors.red,), + icon:new Image.asset('assets/images/new-design/navigate.png'), tooltip: 'Increase volume by 10', onPressed: () { setState(() { @@ -89,7 +90,8 @@ class _HospitalsPageState extends State { }, ), IconButton( - icon: Icon(Icons.phone,color: Colors.red,), + // icon: Icon(Icons.phone,color: Colors.red,), + icon:new Image.asset('assets/images/new-design/call.png'), tooltip: 'Increase volume by 10', onPressed: () { setState(() { From 50d862b076e696466630a0536f9b4755a84390b6 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 27 Sep 2020 15:56:17 +0300 Subject: [PATCH 3/5] Contact us --- lib/pages/ContactUs/findus/findus_page.dart | 150 +++---- .../ContactUs/findus/hospitrals_page.dart | 210 +++++----- .../ContactUs/findus/pharmacies_page.dart | 386 +++++++++--------- 3 files changed, 378 insertions(+), 368 deletions(-) diff --git a/lib/pages/ContactUs/findus/findus_page.dart b/lib/pages/ContactUs/findus/findus_page.dart index f9e154f9..3b58ea3b 100644 --- a/lib/pages/ContactUs/findus/findus_page.dart +++ b/lib/pages/ContactUs/findus/findus_page.dart @@ -1,7 +1,9 @@ import 'dart:ui'; +import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/hospitrals_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/pharmacies_page.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/feedback/send_feedback_page.dart'; import 'package:diplomaticquarterapp/pages/feedback/status_feedback_page.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -33,89 +35,93 @@ class _FindUsPageState extends State with SingleTickerProviderStateM @override @override Widget build(BuildContext context) { - return AppScaffold( - isShowAppBar: true, - appBarTitle: 'Locations', - body: Scaffold( - extendBodyBehindAppBar: true, - appBar: PreferredSize( - preferredSize: Size.fromHeight(65.0), - child: Stack( - children: [ - Positioned( - bottom: 1, - left: 0, - right: 0, - child: BackdropFilter( - filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10), - child: Container( - color: Theme.of(context) - .scaffoldBackgroundColor - .withOpacity(0.8), - height: 70.0, + return BaseView( + onModelReady: (model) => model.getFindUsRequestOrders(), //model.getCOC(), + builder: (_,model,w)=> AppScaffold( + isShowAppBar: true, + appBarTitle: 'Locations', + baseViewModel: model, + body: Scaffold( + extendBodyBehindAppBar: true, + appBar: PreferredSize( + preferredSize: Size.fromHeight(65.0), + child: Stack( + children: [ + Positioned( + bottom: 1, + left: 0, + right: 0, + child: BackdropFilter( + filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10), + child: Container( + color: Theme.of(context) + .scaffoldBackgroundColor + .withOpacity(0.8), + height: 70.0, + ), ), ), - ), - Center( - child: Container( - height: 60.0, - margin: EdgeInsets.only(top: 10.0), - width: MediaQuery.of(context).size.width *0.92,// 0.9, - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Theme.of(context).dividerColor, - width: 0.9),//width: 0.7 - ), - color: Colors.white), - child: Center( - child: TabBar( - isScrollable: true, - controller: _tabController, - indicatorWeight: 5.0, - //indicatorSize: TabBarIndicatorSize.label, - indicatorSize: TabBarIndicatorSize.tab, + Center( + child: Container( + height: 60.0, + margin: EdgeInsets.only(top: 10.0), + width: MediaQuery.of(context).size.width *0.92,// 0.9, + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + color: Theme.of(context).dividerColor, + width: 0.9),//width: 0.7 + ), + color: Colors.white), + child: Center( + child: TabBar( + isScrollable: true, + controller: _tabController, + indicatorWeight: 5.0, + //indicatorSize: TabBarIndicatorSize.label, + indicatorSize: TabBarIndicatorSize.tab, - indicatorColor: Colors.red[800], - labelColor: Theme.of(context).primaryColor, - labelPadding: - EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), - unselectedLabelColor: Colors.grey[800], - tabs: [ - Container( - width: MediaQuery.of(context).size.width * 0.30, - child: Center( - child: Texts(' Hospitals '), + indicatorColor: Colors.red[800], + labelColor: Theme.of(context).primaryColor, + labelPadding: + EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), + unselectedLabelColor: Colors.grey[800], + tabs: [ + Container( + width: MediaQuery.of(context).size.width * 0.30, + child: Center( + child: Texts(' Hospitals '), + ), ), - ), - Container( - width: MediaQuery.of(context).size.width * 0.30, - child: Center( - child: Texts(' Pharmacies '), + Container( + width: MediaQuery.of(context).size.width * 0.30, + child: Center( + child: Texts(' Pharmacies '), + ), ), - ), - ], + ], + ), ), ), ), - ), + ], + ), + ), + body: Column( + children: [ + Expanded( + child: TabBarView( + physics: BouncingScrollPhysics(), + controller: _tabController, + children: [ + HospitalsPage(findusHospitalModelList: model.FindusHospitalModelList,),//SendFeedbackPage(), + PharmaciesPage(findusPharmaciesModelList: model.FindusPharmaciesModelList,)//StatusFeedbackPage() + ], + ), + ) ], ), ), - body: Column( - children: [ - Expanded( - child: TabBarView( - physics: BouncingScrollPhysics(), - controller: _tabController, - children: [ - HospitalsPage(),//SendFeedbackPage(), - PharmaciesPage()//StatusFeedbackPage() - ], - ), - ) - ], - ), ), ); } diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart index 3af46f36..6e490872 100644 --- a/lib/pages/ContactUs/findus/hospitrals_page.dart +++ b/lib/pages/ContactUs/findus/hospitrals_page.dart @@ -1,4 +1,5 @@ +import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart'; import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; @@ -10,6 +11,11 @@ import 'package:giffy_dialog/giffy_dialog.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:maps_launcher/maps_launcher.dart'; class HospitalsPage extends StatefulWidget { + + final List findusHospitalModelList; + + HospitalsPage({Key key, this.findusHospitalModelList}); + @override _HospitalsPageState createState() => _HospitalsPageState(); } @@ -17,110 +23,113 @@ class HospitalsPage extends StatefulWidget { class _HospitalsPageState extends State { @override Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) => model.getFindUsRequestOrders(),//model.getCOC(), - builder: (_, model, widget) => AppScaffold( - baseViewModel: model, - body: SingleChildScrollView( - child: Container( - // margin: EdgeInsets.only(left: 15,right: 15,top: 70), - margin: EdgeInsets.only(left: 15,right: 15,top: 70), - child: Column( - children: [ - ...List.generate(model.FindusHospitalModelList.length, (index) => Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: Colors.white, - ), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.center, - children: [ - InkWell( - onTap:(){ - showDialog( - context: context,builder: (_) => AssetGiffyDialog( - title: Text(model.FindusHospitalModelList[index].locationName, - style: TextStyle( - fontSize: 22.0, fontWeight: FontWeight.w600), - ),image:Image.network(model.FindusHospitalModelList[index].projectImageURL.toString(), fit: BoxFit.cover,), - buttonCancelText:Text('cancel') , - buttonCancelColor: Colors.grey, - onlyCancelButton: true, - - ) ); - }, + return AppScaffold( + body: SingleChildScrollView( + child: Container( + // margin: EdgeInsets.only(left: 15,right: 15,top: 70), + margin: EdgeInsets.only(left: 15,right: 15,top: 70), + child: Column( + children: [ + ...List.generate(widget.findusHospitalModelList.length, (index) => Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: Colors.white, + ), + + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + InkWell( + onTap:(){ + showDialog( + context: context,builder: (_) => AssetGiffyDialog( + title: Text(widget.findusHospitalModelList[index].locationName, + style: TextStyle( + fontSize: 22.0, fontWeight: FontWeight.w600), + ),image:Image.network(widget.findusHospitalModelList[index].projectImageURL.toString(), fit: BoxFit.cover,), + buttonCancelText:Text('cancel') , + buttonCancelColor: Colors.grey, + onlyCancelButton: true, + + ) ); + }, + child: Container( + width: 70, + height: 70, + child: Image.network(widget.findusHospitalModelList[index].projectImageURL.toString())), + ), + Expanded( + flex: 4, child: Container( - width: 70, - height: 70, - child: Image.network(model.FindusHospitalModelList[index].projectImageURL.toString())), - ), - Expanded( - flex: 4, - child: Container( - margin: EdgeInsets.only(left: 5,right: 5), - child: Texts('${model.FindusHospitalModelList[index].locationName}',textAlign: TextAlign.center,))),//model.cOCItemList[index].cOCTitl - Expanded( - flex: 2, - child: Row( - children: [ - IconButton( + margin: EdgeInsets.only(left: 5,right: 5,top: 10,bottom: 1), + child: Texts('${widget.findusHospitalModelList[index].locationName}',textAlign: TextAlign.center,))),//model.cOCItemList[index].cOCTitl + Expanded( + flex: 2, + child: Row( + crossAxisAlignment: + CrossAxisAlignment.center, + + children: [ + IconButton( // icon: Icon(Icons.person_pin_circle_outlined,color: Colors.red,), - icon:new Image.asset('assets/images/new-design/navigate.png'), - tooltip: 'Increase volume by 10', - onPressed: () { - setState(() { - MapsLauncher.launchCoordinates(double.parse(model.FindusHospitalModelList[index].latitude),double.parse(model.FindusHospitalModelList[index].longitude),model.FindusHospitalModelList[index].locationName); - // _volume += 10; - }); - }, - ), - IconButton( - // icon: Icon(Icons.phone,color: Colors.red,), - icon:new Image.asset('assets/images/new-design/call.png'), - tooltip: 'Increase volume by 10', - onPressed: () { - setState(() { - // _volume += 10; - launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); - }); - }, - ), - ], - ), + icon:new Image.asset('assets/images/new-design/navigate.png'), + tooltip: '', + onPressed: () { + setState(() { + MapsLauncher.launchCoordinates(double.parse(widget.findusHospitalModelList[index].latitude),double.parse(widget.findusHospitalModelList[index].longitude),widget.findusHospitalModelList[index].locationName); + + }); + }, + ), + IconButton( + // icon: Icon(Icons.phone,color: Colors.red,), + icon:new Image.asset('assets/images/new-design/call.png'), + tooltip: '', + onPressed: () { + setState(() { + // _volume += 10; + launch("tel://" +widget.findusHospitalModelList[index].phoneNumber); + }); + }, + ), + ], ), + ), - ], - ), + ], ), + ), - ], - ), - // Texts('${model.FindusHospitalModelList[index].locationName}'), - Divider(height: 4.5,color: Colors.grey[500],) - ], - ), + ], + ), + // Texts('${model.FindusHospitalModelList[index].locationName}'), + Divider(height: 4.5,color: Colors.grey[500],) + ], ), - )), - SizedBox(height: 8,), - Container(width: double.infinity, - height: 100,color: Colors.white, + ), + )), + SizedBox(height: 8,), + Container(width: double.infinity, + height: 100,color: Colors.white, child: Row( mainAxisSize:MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceAround, @@ -128,7 +137,7 @@ class _HospitalsPageState extends State { children: [ IconButton( - icon: new Image.asset('assets/images/new-design/youtube.png'), + icon: new Image.asset('assets/images/new-design/youtube.png'), iconSize: 70, tooltip: 'Youtube', onPressed: () { @@ -157,7 +166,7 @@ class _HospitalsPageState extends State { onPressed: () { setState(() { - launch("https://twitter.com/HMG"); + launch("https://twitter.com/HMG"); }); }, ), @@ -168,19 +177,18 @@ class _HospitalsPageState extends State { onPressed: () { setState(() { - launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); + launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); }); }, ), ], ), - ), - ], - ), + ), + ], ), ), - ), + ); } diff --git a/lib/pages/ContactUs/findus/pharmacies_page.dart b/lib/pages/ContactUs/findus/pharmacies_page.dart index f127f842..40799f17 100644 --- a/lib/pages/ContactUs/findus/pharmacies_page.dart +++ b/lib/pages/ContactUs/findus/pharmacies_page.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart'; import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; @@ -11,6 +12,9 @@ import 'package:maps_launcher/maps_launcher.dart'; import 'package:url_launcher/url_launcher.dart'; class PharmaciesPage extends StatefulWidget { + final List findusPharmaciesModelList; + + PharmaciesPage({Key key, this.findusPharmaciesModelList}); @override _PharmaciesPageState createState() => _PharmaciesPageState(); } @@ -18,216 +22,208 @@ class PharmaciesPage extends StatefulWidget { class _PharmaciesPageState extends State { @override Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) => model.getFindUsRequestOrders(), //model.getCOC(), - builder: (_, model, widget) => AppScaffold( - baseViewModel: model, - body: SingleChildScrollView( - child: Container( - margin: EdgeInsets.only(left: 15, right: 15, top: 70), - child: Column( - children: [ - ...List.generate( - model.FindusPharmaciesModelList.length, - (index) => Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: Colors.white, - ), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( + return AppScaffold( + body: SingleChildScrollView( + child: Container( + margin: EdgeInsets.only(left: 15, right: 15, top: 70), + child: Column( + children: [ + ...List.generate( + widget.findusPharmaciesModelList.length, + (index) => Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: Colors.white, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.center, children: [ + InkWell( + onTap:(){ + showDialog( + context: context,builder: (_) => AssetGiffyDialog( + title: Text(widget.findusPharmaciesModelList[index].locationName, + style: TextStyle( + fontSize: 22.0, fontWeight: FontWeight.w600), + ), + image:widget.findusPharmaciesModelList[index].projectImageURL!= null? Image.network(widget.findusPharmaciesModelList[index].projectImageURL, fit: BoxFit.cover,): Image.network('https://hmgwebservices.com/Images/Hospitals/15.jpg', fit: BoxFit.cover,) , + buttonCancelText:Text('cancel') , + // buttonCancelText:Text(model.user.projectID) , + buttonCancelColor: Colors.grey, + onlyCancelButton: true, + + ) ); + }, + child: Container( + width: 70, + height: 70, + child: + Image.network(widget.findusPharmaciesModelList[index].projectImageURL!= null? widget.findusPharmaciesModelList[index].projectImageURL.toString(): 'https://hmgwebservices.com/Images/Hospitals/15.jpg') ), + ), Expanded( + flex: 4, + child: Container( + margin: EdgeInsets.only( + left: 5, right: 5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + '${widget.findusPharmaciesModelList[index].locationName}', + textAlign: TextAlign.start, + ), + SizedBox(height: 4,), + Texts( + '${widget.findusPharmaciesModelList[index].cityName}', + textAlign: TextAlign.center, + ), + ], + ), + ), + ), + //model.cOCItemList[index].cOCTitl + Expanded( + flex: 2, child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.center, - children: [ - InkWell( - onTap:(){ - showDialog( - context: context,builder: (_) => AssetGiffyDialog( - title: Text(model.FindusPharmaciesModelList[index].locationName, - style: TextStyle( - fontSize: 22.0, fontWeight: FontWeight.w600), - ),image:Image.network(model.FindusPharmaciesModelList[index].projectImageURL.toString(), fit: BoxFit.cover,), - buttonCancelText:Text('cancel') , - // buttonCancelText:Text(model.user.projectID) , - buttonCancelColor: Colors.grey, - onlyCancelButton: true, - - ) ); + children: [ + IconButton( + // icon: Icon( + // Icons + // .person_pin_circle_outlined, + // color: Colors.red, + // ), + icon:new Image.asset('assets/images/new-design/navigate.png'), + tooltip: + '', + onPressed: () { + setState(() { + MapsLauncher.launchCoordinates( + double.parse(widget.findusPharmaciesModelList[ + index] + .latitude), + double.parse(widget.findusPharmaciesModelList[ + index] + .longitude), + widget.findusPharmaciesModelList[ + index] + .locationName); + // _volume += 10; + }); }, - child: Container( - width: 70, - height: 70, - child: Image.network(model - .FindusPharmaciesModelList[ - index] - .projectImageURL - .toString())), ), - Expanded( - flex: 4, - child: Container( - margin: EdgeInsets.only( - left: 5, right: 5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Texts( - '${model.FindusPharmaciesModelList[index].locationName}', - textAlign: TextAlign.start, - ), - SizedBox(height: 4,), - Texts( - '${model.FindusPharmaciesModelList[index].cityName}', - textAlign: TextAlign.center, - ), - ], - ), - ), - ), - //model.cOCItemList[index].cOCTitl - Expanded( - flex: 2, - child: Row( - children: [ - IconButton( - icon: Icon( - Icons - .person_pin_circle_outlined, - color: Colors.red, - ), - tooltip: - 'Increase volume by 10', - onPressed: () { - setState(() { - MapsLauncher.launchCoordinates( - double.parse(model - .FindusPharmaciesModelList[ - index] - .latitude), - double.parse(model - .FindusPharmaciesModelList[ - index] - .longitude), - model - .FindusPharmaciesModelList[ - index] - .locationName); - // _volume += 10; - }); - }, - ), - IconButton( - icon: Icon( - Icons.phone, - color: Colors.red, - ), - tooltip: - 'Increase volume by 10', - onPressed: () { - setState(() { - // _volume += 10; - launch("tel://" + - model - .FindusPharmaciesModelList[ - index] - .phoneNumber); - }); - }, - ), - ], - ), + IconButton( + // icon: Icon( + // Icons.phone, + // color: Colors.red, + // ), + icon:new Image.asset('assets/images/new-design/call.png'), + tooltip: + 'I', + onPressed: () { + setState(() { + // _volume += 10; + launch("tel://" + + widget.findusPharmaciesModelList[ + index] + .phoneNumber); + }); + }, ), ], ), ), ], ), - - Divider( - height: 4.5, - color: Colors.grey[500], - ) - ], - ), + ), + ], ), - )), - SizedBox( - height: 8, - ), - Container( - width: double.infinity, - height: 100, - color: Colors.white, - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - IconButton( - icon: new Image.asset( - 'assets/images/new-design/youtube.png'), - iconSize: 70, - tooltip: 'Youtube', - onPressed: () { - setState(() { - // _volume += 10; - launch( - "https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); - }); - }, - ), - IconButton( - icon: new Image.asset( - 'assets/images/new-design/linkedin.png'), - tooltip: 'LinkedIn', - iconSize: 70, - onPressed: () { - setState(() { - launch( - "https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); - }); - }, - ), - IconButton( - icon: new Image.asset( - 'assets/images/new-design/twitter.png'), - tooltip: 'Twitter', - iconSize: 70, - onPressed: () { - setState(() { - launch("https://twitter.com/HMG"); - }); - }, - ), - IconButton( - icon: new Image.asset( - 'assets/images/new-design/facebook.png'), - tooltip: 'facebook', - iconSize: 70, - onPressed: () { - setState(() { - launch( - "https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); - }); - }, + + Divider( + height: 4.5, + color: Colors.grey[500], + ) + ], ), - ], - ), + ), + )), + SizedBox( + height: 8, + ), + Container( + width: double.infinity, + height: 100, + color: Colors.white, + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + IconButton( + icon: new Image.asset( + 'assets/images/new-design/youtube.png'), + iconSize: 70, + tooltip: 'Youtube', + onPressed: () { + setState(() { + // _volume += 10; + launch( + "https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); + }); + }, + ), + IconButton( + icon: new Image.asset( + 'assets/images/new-design/linkedin.png'), + tooltip: 'LinkedIn', + iconSize: 70, + onPressed: () { + setState(() { + launch( + "https://www.linkedin.com/company/drsulaiman-alhabib-medical-group"); + }); + }, + ), + IconButton( + icon: new Image.asset( + 'assets/images/new-design/twitter.png'), + tooltip: 'Twitter', + iconSize: 70, + onPressed: () { + setState(() { + launch("https://twitter.com/HMG"); + }); + }, + ), + IconButton( + icon: new Image.asset( + 'assets/images/new-design/facebook.png'), + tooltip: 'facebook', + iconSize: 70, + onPressed: () { + setState(() { + launch( + "https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); + }); + }, + ), + ], ), - ], - ), + ), + ], ), ), ), From 5ce252d296866a4f2f67afff34340d32269fdba5 Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 27 Sep 2020 17:03:05 +0300 Subject: [PATCH 4/5] Contact us --- .../LiveChat/hospitalsLivechat_page.dart | 180 ++++++++++-------- .../ContactUs/LiveChat/livechat_page.dart | 10 +- 2 files changed, 105 insertions(+), 85 deletions(-) diff --git a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart index 66ad31ee..0c17e637 100644 --- a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart @@ -36,110 +36,124 @@ class _HospitalsLiveChatPageState extends State { child: Container( margin: EdgeInsets.only(left: 15, right: 15), child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox( - height: 20, - ), - Container( - width: double.infinity, - height: 200, - decoration: BoxDecoration( - image: DecorationImage( - image: ExactAssetImage( - 'assets/images/dashboard_top_bg.png'), - fit: BoxFit.cover), - ), - child: Texts( - 'You can now talk directly to the appointments department by chat or request a call back\n \nChoose Hospital :', - color: Colors.white, - textAlign: TextAlign.center, - ), - ), - /////////// - ...List.generate( - model.LiveChatModelList.length, - (index) => Container( - margin: - EdgeInsets.only(left: 20, right: 20, bottom: 20), + Stack( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + + children: [ + SizedBox( + height: 20, + ), + Container( + width: double.infinity, + height: 200, decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: tappedIndex == index - ? Colors.red - : Colors.white, + image: DecorationImage( + image: ExactAssetImage( + 'assets/images/dashboard_top_bg.png'), + fit: BoxFit.cover), ), child: Padding( padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - InkWell( - onTap: () { - setState(() { - tappedIndex = index; - chat = - "http://chat.dshmg.com:7788/hmgchatapp/hmgchattest/Index.aspx?Name=${model.user.firstName}&PatientID=${model.user.patientID}&MobileNo=${model.user.mobileNumber}&Language=en&WorkGroup=${model.LiveChatModelList[index].value}"; - }); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, + child: Texts( + 'You can now talk directly to the appointments department by chat or request a call back\n \nChoose Hospital :', + color: Colors.white, + textAlign: TextAlign.start, + ), + ), + ), + SizedBox(height: MediaQuery.of(context).size.height*0.85,), + + SizedBox( + height: 100, + ), + ], + ), + Positioned( + left: 13, + right: 13, + top:200, + child: Container(width: double.maxFinite, + child: Column( + children: [ + ...List.generate( + model.LiveChatModelList.length, + (index) => Container( + margin: + EdgeInsets.only(left: 0, right: 0, bottom: 20), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: tappedIndex == index + ? Colors.red + : Colors.white, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded( - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceAround, - crossAxisAlignment: - CrossAxisAlignment.center, + InkWell( + onTap: () { + setState(() { + tappedIndex = index; + chat = + "http://chat.dshmg.com:7788/hmgchatapp/hmgchattest/Index.aspx?Name=${model.user.firstName}&PatientID=${model.user.patientID}&MobileNo=${model.user.mobileNumber}&Language=en&WorkGroup=${model.LiveChatModelList[index].value}"; + }); + }, + child:Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, children: [ + SizedBox(width: 20,), Expanded( - flex: 4, + child: Container( margin: EdgeInsets.only( left: 5, right: 5), child: Texts( '${model.LiveChatModelList[index].projectName}', color: - tappedIndex == index - ? Colors.white - : Colors.black, + tappedIndex == index + ? Colors.white + : Colors.black, textAlign: - TextAlign.center, + TextAlign.center, ))), //model.cOCItemList[index].cOCTitl - Expanded( - flex: 1, - child: Row( - children: [ - IconButton( - icon: Icon( - Icons - .arrow_forward_rounded, - color: - tappedIndex == index - ? Colors.white - : Colors.black, - ), - tooltip: '', - onPressed: () { - setState(() {}); - }, - ), - ], + IconButton( + icon: Icon( + Icons + .arrow_forward_rounded, + color: + tappedIndex == index + ? Colors.white + : Colors.black, ), + tooltip: '', + onPressed: () { + setState(() {}); + }, ), ], ), - ), + ) ], ), - ) - ], - ), - ), - )), - SizedBox( - height: 100, + ), + )), + ], + ),), + ), + ], ), + Container( + height: MediaQuery.of(context).size.height * 0.20, + width: double.maxFinite, + ) ], ), ), @@ -167,3 +181,7 @@ class _HospitalsLiveChatPageState extends State { ); } } + + + + diff --git a/lib/pages/ContactUs/LiveChat/livechat_page.dart b/lib/pages/ContactUs/LiveChat/livechat_page.dart index 154a03cd..20cd1181 100644 --- a/lib/pages/ContactUs/LiveChat/livechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/livechat_page.dart @@ -56,12 +56,12 @@ class _LiveChatPageState extends State with SingleTickerProviderSt child: Container( height: 60.0, margin: EdgeInsets.only(top: 10.0), - width: MediaQuery.of(context).size.width * 0.9, + width: MediaQuery.of(context).size.width *0.92,// 0.9, decoration: BoxDecoration( border: Border( bottom: BorderSide( color: Theme.of(context).dividerColor, - width: 0.7), + width: 0.9),//width: 0.7 ), color: Colors.white), child: Center( @@ -69,11 +69,13 @@ class _LiveChatPageState extends State with SingleTickerProviderSt isScrollable: true, controller: _tabController, indicatorWeight: 5.0, - indicatorSize: TabBarIndicatorSize.label, + //indicatorSize: TabBarIndicatorSize.label, + indicatorSize: TabBarIndicatorSize.tab, + indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: - EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), + EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( From 7c48a6f16afcfa5ca73d8e2c0b433c0afd1fcbfd Mon Sep 17 00:00:00 2001 From: Amjad amireh Date: Sun, 27 Sep 2020 17:47:45 +0300 Subject: [PATCH 5/5] Contact us --- .../LiveChat/hospitalsLivechat_page.dart | 159 +++++----- .../ContactUs/LiveChat/livechat_page.dart | 12 +- .../LiveChat/pharmaciesLivechat_page.dart | 39 ++- lib/pages/ContactUs/findus/findus_page.dart | 27 +- .../ContactUs/findus/hospitrals_page.dart | 285 +++++++++-------- .../ContactUs/findus/pharmacies_page.dart | 290 ++++++++++-------- 6 files changed, 455 insertions(+), 357 deletions(-) diff --git a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart index 0c17e637..206a95c4 100644 --- a/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart @@ -1,4 +1,3 @@ -import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/viewModels/contactus/livechat_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; @@ -42,7 +41,6 @@ class _HospitalsLiveChatPageState extends State { children: [ Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ SizedBox( height: 20, @@ -65,8 +63,9 @@ class _HospitalsLiveChatPageState extends State { ), ), ), - SizedBox(height: MediaQuery.of(context).size.height*0.85,), - + SizedBox( + height: MediaQuery.of(context).size.height * 0.85, + ), SizedBox( height: 100, ), @@ -75,78 +74,92 @@ class _HospitalsLiveChatPageState extends State { Positioned( left: 13, right: 13, - top:200, - child: Container(width: double.maxFinite, - child: Column( - children: [ - ...List.generate( - model.LiveChatModelList.length, - (index) => Container( - margin: - EdgeInsets.only(left: 0, right: 0, bottom: 20), - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: tappedIndex == index - ? Colors.red - : Colors.white, - ), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - InkWell( - onTap: () { - setState(() { - tappedIndex = index; - chat = - "http://chat.dshmg.com:7788/hmgchatapp/hmgchattest/Index.aspx?Name=${model.user.firstName}&PatientID=${model.user.patientID}&MobileNo=${model.user.mobileNumber}&Language=en&WorkGroup=${model.LiveChatModelList[index].value}"; - }); - }, - child:Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, + top: 200, + child: Container( + width: double.maxFinite, + child: Column( + children: [ + ...List.generate( + model.LiveChatModelList.length, + (index) => Container( + margin: EdgeInsets.only( + left: 0, right: 0, bottom: 20), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all( + color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all( + Radius.circular(5)), + color: tappedIndex == index + ? Colors.red + : Colors.white, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, children: [ - SizedBox(width: 20,), - Expanded( - - child: Container( - margin: EdgeInsets.only( - left: 5, right: 5), - child: Texts( - '${model.LiveChatModelList[index].projectName}', + InkWell( + onTap: () { + setState(() { + tappedIndex = index; + chat = + "http://chat.dshmg.com:7788/hmgchatapp/hmgchattest/Index.aspx?Name=${model.user.firstName}&PatientID=${model.user.patientID}&MobileNo=${model.user.mobileNumber}&Language=en&WorkGroup=${model.LiveChatModelList[index].value}"; + }); + }, + child: Row( + mainAxisAlignment: + MainAxisAlignment + .spaceAround, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + SizedBox( + width: 20, + ), + Expanded( + child: Container( + margin: + EdgeInsets.only( + left: 5, + right: 5), + child: Texts( + '${model.LiveChatModelList[index].projectName}', + color: + tappedIndex == + index + ? Colors + .white + : Colors + .black, + textAlign: TextAlign + .center, + ))), //model.cOCItemList[index].cOCTitl + IconButton( + icon: Icon( + Icons + .arrow_forward_rounded, color: - tappedIndex == index - ? Colors.white - : Colors.black, - textAlign: - TextAlign.center, - ))), //model.cOCItemList[index].cOCTitl - IconButton( - icon: Icon( - Icons - .arrow_forward_rounded, - color: - tappedIndex == index - ? Colors.white - : Colors.black, + tappedIndex == index + ? Colors.white + : Colors.black, + ), + tooltip: '', + onPressed: () { + setState(() {}); + }, + ), + ], ), - tooltip: '', - onPressed: () { - setState(() {}); - }, - ), + ) ], ), - ) - ], - ), - ), - )), - ], - ),), + ), + )), + ], + ), + ), ), ], ), @@ -181,7 +194,3 @@ class _HospitalsLiveChatPageState extends State { ); } } - - - - diff --git a/lib/pages/ContactUs/LiveChat/livechat_page.dart b/lib/pages/ContactUs/LiveChat/livechat_page.dart index 20cd1181..b870234a 100644 --- a/lib/pages/ContactUs/LiveChat/livechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/livechat_page.dart @@ -13,7 +13,8 @@ class LiveChatPage extends StatefulWidget { _LiveChatPageState createState() => _LiveChatPageState(); } -class _LiveChatPageState extends State with SingleTickerProviderStateMixin{ +class _LiveChatPageState extends State + with SingleTickerProviderStateMixin { TabController _tabController; @override void initState() { @@ -26,6 +27,7 @@ class _LiveChatPageState extends State with SingleTickerProviderSt super.dispose(); _tabController.dispose(); } + @override @override Widget build(BuildContext context) { @@ -56,12 +58,12 @@ class _LiveChatPageState extends State with SingleTickerProviderSt child: Container( height: 60.0, margin: EdgeInsets.only(top: 10.0), - width: MediaQuery.of(context).size.width *0.92,// 0.9, + width: MediaQuery.of(context).size.width * 0.92, // 0.9, decoration: BoxDecoration( border: Border( bottom: BorderSide( color: Theme.of(context).dividerColor, - width: 0.9),//width: 0.7 + width: 0.9), //width: 0.7 ), color: Colors.white), child: Center( @@ -75,7 +77,7 @@ class _LiveChatPageState extends State with SingleTickerProviderSt indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: - EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), + EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( @@ -105,7 +107,7 @@ class _LiveChatPageState extends State with SingleTickerProviderSt physics: BouncingScrollPhysics(), controller: _tabController, children: [ - HospitalsLiveChatPage(),//SendFeedbackPage(), + HospitalsLiveChatPage(), //SendFeedbackPage(), PhamaciesLiveChatPage() //StatusFeedbackPage() ], diff --git a/lib/pages/ContactUs/LiveChat/pharmaciesLivechat_page.dart b/lib/pages/ContactUs/LiveChat/pharmaciesLivechat_page.dart index c56123c9..cbda0828 100644 --- a/lib/pages/ContactUs/LiveChat/pharmaciesLivechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/pharmaciesLivechat_page.dart @@ -20,15 +20,13 @@ class _PhamaciesLiveChatPageState extends State { String chat; @override - void initState() - { + void initState() { super.initState(); - tappedIndex=-1; - chat=""; + tappedIndex = -1; + chat = ""; } @override - Widget build(BuildContext context) { return BaseView( onModelReady: (model) => model.getLiveChatRequestOrders(), @@ -36,29 +34,31 @@ class _PhamaciesLiveChatPageState extends State { baseViewModel: model, body: SingleChildScrollView( child: Container( - margin: EdgeInsets.only(left: 15,right: 15), + margin: EdgeInsets.only(left: 15, right: 15), child: Column( children: [ - SizedBox(height: 20,), + SizedBox( + height: 20, + ), Container( width: double.infinity, height: 200, decoration: BoxDecoration( image: DecorationImage( - image: ExactAssetImage( - ''), - fit: BoxFit.cover), + image: ExactAssetImage(''), fit: BoxFit.cover), + ), + child: Texts( + 'You can now talk directly to the pharmacist by chat or request a call back', + color: Colors.black, + textAlign: TextAlign.center, ), - child: Texts('You can now talk directly to the pharmacist by chat or request a call back',color: Colors.black,textAlign: TextAlign.center,), - ), /////////// - SizedBox(height: 100,), - - + SizedBox( + height: 100, + ), ], - ), ), ), @@ -74,17 +74,16 @@ class _PhamaciesLiveChatPageState extends State { label: 'ٍStart', loading: model.state == ViewState.BusyLocal, onTap: () { - print("chat="+chat); - chat="http://chat.dshmg.com:7788/EPharmacyChat/EIndex.aspx?CustomerID=undefined&Name=${model.user.firstName}&MobileNo=${model.user.mobileNumber}&Language=1"; + print("chat=" + chat); + chat = + "http://chat.dshmg.com:7788/EPharmacyChat/EIndex.aspx?CustomerID=undefined&Name=${model.user.firstName}&MobileNo=${model.user.mobileNumber}&Language=1"; launch(chat); }, ), ), ), ), - ), ); - } } diff --git a/lib/pages/ContactUs/findus/findus_page.dart b/lib/pages/ContactUs/findus/findus_page.dart index 3b58ea3b..9b39de3a 100644 --- a/lib/pages/ContactUs/findus/findus_page.dart +++ b/lib/pages/ContactUs/findus/findus_page.dart @@ -4,22 +4,19 @@ import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model import 'package:diplomaticquarterapp/pages/ContactUs/findus/hospitrals_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/pharmacies_page.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/pages/feedback/send_feedback_page.dart'; -import 'package:diplomaticquarterapp/pages/feedback/status_feedback_page.dart'; + import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - - - class FindUsPage extends StatefulWidget { @override _FindUsPageState createState() => _FindUsPageState(); } -class _FindUsPageState extends State with SingleTickerProviderStateMixin{ +class _FindUsPageState extends State + with SingleTickerProviderStateMixin { TabController _tabController; @override void initState() { @@ -32,12 +29,13 @@ class _FindUsPageState extends State with SingleTickerProviderStateM super.dispose(); _tabController.dispose(); } + @override @override Widget build(BuildContext context) { return BaseView( onModelReady: (model) => model.getFindUsRequestOrders(), //model.getCOC(), - builder: (_,model,w)=> AppScaffold( + builder: (_, model, w) => AppScaffold( isShowAppBar: true, appBarTitle: 'Locations', baseViewModel: model, @@ -65,12 +63,12 @@ class _FindUsPageState extends State with SingleTickerProviderStateM child: Container( height: 60.0, margin: EdgeInsets.only(top: 10.0), - width: MediaQuery.of(context).size.width *0.92,// 0.9, + width: MediaQuery.of(context).size.width * 0.92, // 0.9, decoration: BoxDecoration( border: Border( bottom: BorderSide( color: Theme.of(context).dividerColor, - width: 0.9),//width: 0.7 + width: 0.9), //width: 0.7 ), color: Colors.white), child: Center( @@ -84,7 +82,7 @@ class _FindUsPageState extends State with SingleTickerProviderStateM indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, labelPadding: - EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), + EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( @@ -114,8 +112,13 @@ class _FindUsPageState extends State with SingleTickerProviderStateM physics: BouncingScrollPhysics(), controller: _tabController, children: [ - HospitalsPage(findusHospitalModelList: model.FindusHospitalModelList,),//SendFeedbackPage(), - PharmaciesPage(findusPharmaciesModelList: model.FindusPharmaciesModelList,)//StatusFeedbackPage() + HospitalsPage( + findusHospitalModelList: model.FindusHospitalModelList, + ), //SendFeedbackPage(), + PharmaciesPage( + findusPharmaciesModelList: + model.FindusPharmaciesModelList, + ) //StatusFeedbackPage() ], ), ) diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart index 6e490872..b883ae41 100644 --- a/lib/pages/ContactUs/findus/hospitrals_page.dart +++ b/lib/pages/ContactUs/findus/hospitrals_page.dart @@ -1,4 +1,3 @@ - import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart'; import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; @@ -10,11 +9,11 @@ import 'package:flutter/material.dart'; import 'package:giffy_dialog/giffy_dialog.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:maps_launcher/maps_launcher.dart'; -class HospitalsPage extends StatefulWidget { - final List findusHospitalModelList; +class HospitalsPage extends StatefulWidget { + final List findusHospitalModelList; - HospitalsPage({Key key, this.findusHospitalModelList}); + HospitalsPage({Key key, this.findusHospitalModelList}); @override _HospitalsPageState createState() => _HospitalsPageState(); @@ -23,161 +22,209 @@ class HospitalsPage extends StatefulWidget { class _HospitalsPageState extends State { @override Widget build(BuildContext context) { - return AppScaffold( body: SingleChildScrollView( child: Container( // margin: EdgeInsets.only(left: 15,right: 15,top: 70), - margin: EdgeInsets.only(left: 15,right: 15,top: 70), + margin: EdgeInsets.only(left: 15, right: 15, top: 70), child: Column( children: [ - ...List.generate(widget.findusHospitalModelList.length, (index) => Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: Colors.white, - ), - - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.center, - children: [ - InkWell( - onTap:(){ - showDialog( - context: context,builder: (_) => AssetGiffyDialog( - title: Text(widget.findusHospitalModelList[index].locationName, - style: TextStyle( - fontSize: 22.0, fontWeight: FontWeight.w600), - ),image:Image.network(widget.findusHospitalModelList[index].projectImageURL.toString(), fit: BoxFit.cover,), - buttonCancelText:Text('cancel') , - buttonCancelColor: Colors.grey, - onlyCancelButton: true, - - ) ); - }, - child: Container( - width: 70, - height: 70, - child: Image.network(widget.findusHospitalModelList[index].projectImageURL.toString())), - ), - Expanded( - flex: 4, - child: Container( - margin: EdgeInsets.only(left: 5,right: 5,top: 10,bottom: 1), - child: Texts('${widget.findusHospitalModelList[index].locationName}',textAlign: TextAlign.center,))),//model.cOCItemList[index].cOCTitl - Expanded( - flex: 2, - child: Row( - crossAxisAlignment: - CrossAxisAlignment.center, - - children: [ - IconButton( - // icon: Icon(Icons.person_pin_circle_outlined,color: Colors.red,), - icon:new Image.asset('assets/images/new-design/navigate.png'), - tooltip: '', - onPressed: () { - setState(() { - MapsLauncher.launchCoordinates(double.parse(widget.findusHospitalModelList[index].latitude),double.parse(widget.findusHospitalModelList[index].longitude),widget.findusHospitalModelList[index].locationName); - - }); - }, - ), - IconButton( - // icon: Icon(Icons.phone,color: Colors.red,), - icon:new Image.asset('assets/images/new-design/call.png'), - tooltip: '', - onPressed: () { - setState(() { - // _volume += 10; - launch("tel://" +widget.findusHospitalModelList[index].phoneNumber); - }); - }, - ), - ], + ...List.generate( + widget.findusHospitalModelList.length, + (index) => Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: Colors.white, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + InkWell( + onTap: () { + showDialog( + context: context, + builder: (_) => + AssetGiffyDialog( + title: Text( + widget + .findusHospitalModelList[ + index] + .locationName, + style: TextStyle( + fontSize: 22.0, + fontWeight: + FontWeight + .w600), + ), + image: Image.network( + widget + .findusHospitalModelList[ + index] + .projectImageURL + .toString(), + fit: BoxFit.cover, + ), + buttonCancelText: + Text('cancel'), + buttonCancelColor: + Colors.grey, + onlyCancelButton: true, + )); + }, + child: Container( + width: 70, + height: 70, + child: Image.network(widget + .findusHospitalModelList[ + index] + .projectImageURL + .toString())), + ), + Expanded( + flex: 4, + child: Container( + margin: EdgeInsets.only( + left: 5, + right: 5, + top: 10, + bottom: 1), + child: Texts( + '${widget.findusHospitalModelList[index].locationName}', + textAlign: TextAlign.center, + ))), //model.cOCItemList[index].cOCTitl + Expanded( + flex: 2, + child: Row( + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + IconButton( + // icon: Icon(Icons.person_pin_circle_outlined,color: Colors.red,), + icon: new Image.asset( + 'assets/images/new-design/navigate.png'), + tooltip: '', + onPressed: () { + setState(() { + MapsLauncher.launchCoordinates( + double.parse(widget + .findusHospitalModelList[ + index] + .latitude), + double.parse(widget + .findusHospitalModelList[ + index] + .longitude), + widget + .findusHospitalModelList[ + index] + .locationName); + }); + }, + ), + IconButton( + // icon: Icon(Icons.phone,color: Colors.red,), + icon: new Image.asset( + 'assets/images/new-design/call.png'), + tooltip: '', + onPressed: () { + setState(() { + // _volume += 10; + launch("tel://" + + widget + .findusHospitalModelList[ + index] + .phoneNumber); + }); + }, + ), + ], + ), + ), + ], + ), ), - ), - - - - ], - ), + ], + ), + // Texts('${model.FindusHospitalModelList[index].locationName}'), + Divider( + height: 4.5, + color: Colors.grey[500], + ) + ], ), - - ], - ), - // Texts('${model.FindusHospitalModelList[index].locationName}'), - Divider(height: 4.5,color: Colors.grey[500],) - ], - ), - ), - )), - SizedBox(height: 8,), - Container(width: double.infinity, - height: 100,color: Colors.white, + ), + )), + SizedBox( + height: 8, + ), + Container( + width: double.infinity, + height: 100, + color: Colors.white, child: Row( - mainAxisSize:MainAxisSize.max, + mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - IconButton( - icon: new Image.asset('assets/images/new-design/youtube.png'), + icon: new Image.asset( + 'assets/images/new-design/youtube.png'), iconSize: 70, tooltip: 'Youtube', onPressed: () { setState(() { - - launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); - + launch( + "https://www.youtube.com/c/DrsulaimanAlhabibHospitals"); }); }, ), IconButton( - icon: new Image.asset('assets/images/new-design/linkedin.png'), + icon: new Image.asset( + 'assets/images/new-design/linkedin.png'), tooltip: 'LinkedIn', iconSize: 70, onPressed: () { setState(() { - - launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group"); + launch( + "https://www.linkedin.com/company/drsulaiman-alhabib-medical-group"); }); }, ), IconButton( - icon: new Image.asset('assets/images/new-design/twitter.png'), + icon: new Image.asset( + 'assets/images/new-design/twitter.png'), tooltip: 'Twitter', iconSize: 70, onPressed: () { setState(() { - launch("https://twitter.com/HMG"); }); }, ), IconButton( - icon: new Image.asset('assets/images/new-design/facebook.png'), + icon: new Image.asset( + 'assets/images/new-design/facebook.png'), tooltip: 'facebook', iconSize: 70, onPressed: () { setState(() { - - launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); + launch( + "https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); }); }, ), @@ -188,8 +235,6 @@ class _HospitalsPageState extends State { ), ), ), - ); - } } diff --git a/lib/pages/ContactUs/findus/pharmacies_page.dart b/lib/pages/ContactUs/findus/pharmacies_page.dart index 40799f17..5dc44019 100644 --- a/lib/pages/ContactUs/findus/pharmacies_page.dart +++ b/lib/pages/ContactUs/findus/pharmacies_page.dart @@ -12,9 +12,9 @@ import 'package:maps_launcher/maps_launcher.dart'; import 'package:url_launcher/url_launcher.dart'; class PharmaciesPage extends StatefulWidget { - final List findusPharmaciesModelList; + final List findusPharmaciesModelList; - PharmaciesPage({Key key, this.findusPharmaciesModelList}); + PharmaciesPage({Key key, this.findusPharmaciesModelList}); @override _PharmaciesPageState createState() => _PharmaciesPageState(); } @@ -30,137 +30,177 @@ class _PharmaciesPageState extends State { children: [ ...List.generate( widget.findusPharmaciesModelList.length, - (index) => Container( - decoration: BoxDecoration( - shape: BoxShape.rectangle, - border: Border.all(color: Colors.white, width: 0.5), - borderRadius: BorderRadius.all(Radius.circular(5)), - color: Colors.white, - ), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, + (index) => Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + border: Border.all(color: Colors.white, width: 0.5), + borderRadius: BorderRadius.all(Radius.circular(5)), + color: Colors.white, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded( - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.center, - children: [ - InkWell( - onTap:(){ - showDialog( - context: context,builder: (_) => AssetGiffyDialog( - title: Text(widget.findusPharmaciesModelList[index].locationName, - style: TextStyle( - fontSize: 22.0, fontWeight: FontWeight.w600), - ), - image:widget.findusPharmaciesModelList[index].projectImageURL!= null? Image.network(widget.findusPharmaciesModelList[index].projectImageURL, fit: BoxFit.cover,): Image.network('https://hmgwebservices.com/Images/Hospitals/15.jpg', fit: BoxFit.cover,) , - buttonCancelText:Text('cancel') , - // buttonCancelText:Text(model.user.projectID) , - buttonCancelColor: Colors.grey, - onlyCancelButton: true, - - ) ); - }, - child: Container( - width: 70, - height: 70, - child: - Image.network(widget.findusPharmaciesModelList[index].projectImageURL!= null? widget.findusPharmaciesModelList[index].projectImageURL.toString(): 'https://hmgwebservices.com/Images/Hospitals/15.jpg') ), - ), - Expanded( - flex: 4, - child: Container( - margin: EdgeInsets.only( - left: 5, right: 5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Texts( - '${widget.findusPharmaciesModelList[index].locationName}', - textAlign: TextAlign.start, - ), - SizedBox(height: 4,), - Texts( - '${widget.findusPharmaciesModelList[index].cityName}', - textAlign: TextAlign.center, - ), - ], + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + InkWell( + onTap: () { + showDialog( + context: context, + builder: (_) => + AssetGiffyDialog( + title: Text( + widget + .findusPharmaciesModelList[ + index] + .locationName, + style: TextStyle( + fontSize: 22.0, + fontWeight: + FontWeight + .w600), + ), + image: widget + .findusPharmaciesModelList[ + index] + .projectImageURL != + null + ? Image.network( + widget + .findusPharmaciesModelList[ + index] + .projectImageURL, + fit: BoxFit.cover, + ) + : Image.network( + 'https://hmgwebservices.com/Images/Hospitals/15.jpg', + fit: BoxFit.cover, + ), + buttonCancelText: + Text('cancel'), + // buttonCancelText:Text(model.user.projectID) , + buttonCancelColor: + Colors.grey, + onlyCancelButton: true, + )); + }, + child: Container( + width: 70, + height: 70, + child: Image.network(widget + .findusPharmaciesModelList[ + index] + .projectImageURL != + null + ? widget + .findusPharmaciesModelList[ + index] + .projectImageURL + .toString() + : 'https://hmgwebservices.com/Images/Hospitals/15.jpg')), ), - ), - ), - //model.cOCItemList[index].cOCTitl - Expanded( - flex: 2, - child: Row( - children: [ - IconButton( - // icon: Icon( - // Icons - // .person_pin_circle_outlined, - // color: Colors.red, - // ), - icon:new Image.asset('assets/images/new-design/navigate.png'), - tooltip: - '', - onPressed: () { - setState(() { - MapsLauncher.launchCoordinates( - double.parse(widget.findusPharmaciesModelList[ - index] - .latitude), - double.parse(widget.findusPharmaciesModelList[ - index] - .longitude), - widget.findusPharmaciesModelList[ - index] - .locationName); - // _volume += 10; - }); - }, + Expanded( + flex: 4, + child: Container( + margin: EdgeInsets.only( + left: 5, right: 5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Texts( + '${widget.findusPharmaciesModelList[index].locationName}', + textAlign: TextAlign.start, + ), + SizedBox( + height: 4, + ), + Texts( + '${widget.findusPharmaciesModelList[index].cityName}', + textAlign: TextAlign.center, + ), + ], + ), ), - IconButton( - // icon: Icon( - // Icons.phone, - // color: Colors.red, - // ), - icon:new Image.asset('assets/images/new-design/call.png'), - tooltip: - 'I', - onPressed: () { - setState(() { - // _volume += 10; - launch("tel://" + - widget.findusPharmaciesModelList[ - index] - .phoneNumber); - }); - }, + ), + //model.cOCItemList[index].cOCTitl + Expanded( + flex: 2, + child: Row( + children: [ + IconButton( + // icon: Icon( + // Icons + // .person_pin_circle_outlined, + // color: Colors.red, + // ), + icon: new Image.asset( + 'assets/images/new-design/navigate.png'), + tooltip: '', + onPressed: () { + setState(() { + MapsLauncher.launchCoordinates( + double.parse(widget + .findusPharmaciesModelList[ + index] + .latitude), + double.parse(widget + .findusPharmaciesModelList[ + index] + .longitude), + widget + .findusPharmaciesModelList[ + index] + .locationName); + // _volume += 10; + }); + }, + ), + IconButton( + // icon: Icon( + // Icons.phone, + // color: Colors.red, + // ), + icon: new Image.asset( + 'assets/images/new-design/call.png'), + tooltip: 'I', + onPressed: () { + setState(() { + // _volume += 10; + launch("tel://" + + widget + .findusPharmaciesModelList[ + index] + .phoneNumber); + }); + }, + ), + ], ), - ], - ), + ), + ], ), - ], - ), + ), + ], ), + Divider( + height: 4.5, + color: Colors.grey[500], + ) ], ), - - Divider( - height: 4.5, - color: Colors.grey[500], - ) - ], - ), - ), - )), + ), + )), SizedBox( height: 8, ),