From 84e92cb0401eaee4490d955ffb2b7cfbc6c15ac7 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 31 Aug 2020 17:41:57 +0300 Subject: [PATCH] updates & fixes --- Certs/APNSDevPushCert.p12 | Bin 0 -> 3249 bytes Certs/APNSProdCert.certSigningRequest | 16 ++++++++ Certs/APNSProdCert.p12 | Bin 0 -> 3417 bytes ...pplePushServicesSandbox.certSigningRequest | 16 ++++++++ Certs/aps.cer | Bin 1649 -> 1649 bytes Certs/aps_development.cer | Bin 0 -> 1445 bytes .../components/SearchByClinic.dart | 3 +- .../BookAppointment/widgets/BranchView.dart | 35 ++++++++---------- .../BookAppointment/widgets/DoctorView.dart | 2 +- 9 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 Certs/APNSDevPushCert.p12 create mode 100644 Certs/APNSProdCert.certSigningRequest create mode 100644 Certs/APNSProdCert.p12 create mode 100644 Certs/ApplePushServicesSandbox.certSigningRequest create mode 100644 Certs/aps_development.cer diff --git a/Certs/APNSDevPushCert.p12 b/Certs/APNSDevPushCert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..dba27aecd2549bf8a8aef99be837f25796d10be9 GIT binary patch literal 3249 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 a2FfE-=cWZ11u^#OOP7v5iIk@U0{;WD2?4_Z literal 0 HcmV?d00001 diff --git a/Certs/APNSProdCert.certSigningRequest b/Certs/APNSProdCert.certSigningRequest new file mode 100644 index 00000000..3f13a387 --- /dev/null +++ b/Certs/APNSProdCert.certSigningRequest @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICkDCCAXgCAQAwSzEjMCEGCSqGSIb3DQEJARYUaGFyb29uNjEzOEBnbWFpbC5j +b20xFzAVBgNVBAMMDk1vaGFtZWQgTWVrYXd5MQswCQYDVQQGEwJBRTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBALcPrk09MmhQhRNe8LYdaeN4mYtoKJg3 +SndMLgpxnaRqP7a6f4sp118wCFZsTXnwhPVP4DzmXWc2AzZtsusmhdw1tzNFtme0 +PtEjDXIPI2lHU3Zhi2zukZdAVxF+uNi3pcp0axina60ZQciIfb/7Fx6hNbqpk90E +O8a2Ob17Wq/ZTYIP4H7ZGydUe2ra9QyDtjmGj9vpEv+xXYWX685sgEylTG14DSOP +ozGsQmaf+QCMbCT3osq7idWc1IQ+3Oed0kUTx1jmRtZwPzQkJJ1Bx3vYSXN/EOlb +u+ei1Nqtc14aVCYvmcuvGDtMyRtw6w+syCw2CpJCPGNkxNz+EH9h+EUCAwEAAaAA +MA0GCSqGSIb3DQEBCwUAA4IBAQBYdu2AaZY6kReuT1Xp8ktlyPfjBRKhPPChuaeR +tFnYMsJtG0aIA/xOu4/RYDgmL92seimULXd9DIPvkJ2DuaB+bdfGTw0qXUlihkm8 +ui5O0L2F9OZbQxJogvTmrMsKnkoR27O5vyfCn9VMOLk3x1nyEzAXIj/5GHWw9T6t +r65jPUOfm6ikiZtICBzSaTPBtyfZB8mrbwG2dpOvVNSa1dj3xip4L8CL6TxH+qM3 ++N90QFYjvjphJkpn2Kt0ow9IyIyeqJbIYJmsWoV9pXddOHCjKdTWUjq7D2Jn3eUA +DAKjKgVqF4/dU10k7EtSfrw01aHLXjj5FxsD5YhVrgTA5xSq +-----END CERTIFICATE REQUEST----- diff --git a/Certs/APNSProdCert.p12 b/Certs/APNSProdCert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..b0ada4531c7cf19e65b097056fd0e7d80c71d563 GIT binary patch literal 3417 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 literal 0 HcmV?d00001 diff --git a/Certs/ApplePushServicesSandbox.certSigningRequest b/Certs/ApplePushServicesSandbox.certSigningRequest new file mode 100644 index 00000000..7d509a0a --- /dev/null +++ b/Certs/ApplePushServicesSandbox.certSigningRequest @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICkDCCAXgCAQAwSzEjMCEGCSqGSIb3DQEJARYUaGFyb29uNjEzOEBnbWFpbC5j +b20xFzAVBgNVBAMMDk1vaGFtZWQgTWVrYXd5MQswCQYDVQQGEwJBRTCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnHqsyE7WfiVcE1Lpa4t4OVO6qlll2q +1djs0XG06R/dlDtIqv4940/XLj+hU93mzAcVvFW4DSIEdD3InM3+T6oMTjPu6meU +69h9ryaVkluQRrT/tdGI1EKO4MWGMe4MDIt7DqMhMfAcxTwekwdxdKaCEhaw3qnA +l/64AelY6URW1pHHJMA0VV7j+pE3jVNai+muMXPrhQ1VrOrV8FftpY3bEeRJR2Cl +T0tv0LhEMu4SfLnVWCzGQQC82hilDw3rH3ZDs8DFxF9agNVdwKlYamarh1dQXwRq +Yx2+sjY1/51r9L4VS+GAh9ECxz0e+43NpzfZ/N+mTeDYKDepaBwPQ6kCAwEAAaAA +MA0GCSqGSIb3DQEBCwUAA4IBAQB89OyLfywKT7ftmpEqCmgsmaJexb580q9w8wOk +1JhJkNV5ec+p1dnge2NZeJ4LGII/5wmPj1vANNW0GZdmJDgnC+2gg9toq1QLCAsF +rW7/LMpgAoEH+P5bhrHV9RRv6BQi0ZmN0apBHjp/pqZfm2Cl5jQPEWjUEf2tIF4l +LSKdok6IPO9n4Fgyk0XdUNSEhgVhsLtZkGiXnkI1YovKDnupTFYPXMLp103bc9zP +xDxwscvOysNDijlzZAkJPg2z8NrJIRDrKvLRHzxQwZ/1LHVB/51bp/1iyks3vOjh +qw5XVsrtGAjCjU9md7q3XkPSyKzhK9UqPdOxdvl1OY0KKIIY +-----END CERTIFICATE REQUEST----- diff --git a/Certs/aps.cer b/Certs/aps.cer index fb46df86ede33f276e4356445e82b29065fe162c..d95bac402ce2fd89a3be82eddb4e63848532dabc 100644 GIT binary patch delta 605 zcmV-j0;2u#4Dk#XFoFhcFoFeDpaTK{0s;se>+1ncusUav7qAvHFfchXGcz$-7Y#Bo zFgY?gFgY?aGm+iof42{=O+7MbP=ym-@U|Uk<9L~iXegLBN_R{y3UQsJYCpERe~T&C zUoZ$(Y)yIag!ND0Jmy_zHUll|MYdyLhnPc3DZVP-}VNgS}!Zj*xq?tdBfY=s|Z{fd}c zC)L)0$w|U&%7zEbl+8fh8_k~%n_nwxaYKWgQ0!ZQ{;eRCb$@9re}y_AjtOFk?@0(6Y<$p7ym10PZ{if&1!U7zB{f--Q delta 605 zcmV-j0;2u#4Dk#XFoFhcFoFeDpaTK{0s;sNY?vm;s{TFW zPuDI#p;O)F%m)>`Rk#fz1av*foX!4Estisu?&@ch>)3s-CY6#~kVdrswb6*wLXP0Y zhB59842ydXqaiWy9K}2ylLv8hrh*a{u->V_m;Sf`=~(GRe^%C!$0WcsRbJ!zkvEM~ zT8rtfF>~vM4OOh_)$mvCrH$JW)nk7^M#l>mPPQ zv%tl~Us{0GUBIbWYG$j4S5RLBYGWO~vNkpUoon>I6-(iOhtUGZJs$gw&8Iin{NJWc z;MgcPsc0Mz0z;{@!2+%U6!XdYfIHgEkV>$M<1Zj!=wI4F`ICbL?thl)|6;xS)=J4j znAkO0s(-jV<<$)c7~h-c?{&?`%wN=;G)N;4u!478+SDCvvm~gB_|h0KK@MMz?|H{d(e2^-j1Xtd67O8%72v0(;b!8RpEdi`nv7sgSt65Dib(X>FsFPIKN~!&SZlvi z3x2SIpC@wtxD0yd^{m^EK)J-=(*ckm>o;qAp$(OH%MN&$|;Anh4bj&Z$KunQ58HV9g4Sr6n2pMVTd)26E!OMg|5J z#s&tKMuvu_Q9!OC64#({fuWv(4jUKeB(=`TpL9|f8F}QA^KX79|!G82T7^K^*1`aTwI`xv6<23ZDMK3IV0X84AIvMP-@Esl`?b1Wbd5 z6gLl-v7@o6rK^Qmlp9i520I!wF)ASkHzO+pa}y&!15licsfm%1Vdn8wXIkE-KMFl) zsyA)N_U5V9tCmiSU3K-wn~Q~8UdrE{V(qc&pY3D+>w5MJgYP~&!!EifbO)~zONs4? zIcNX*uj27De)lSU%Ih1o>(!=Cik{%M<^R@;9ao(C9vp2me8T;+gCXx!sp6U}>rqq<+NGc11H${V`o)zuH- zZGT#R`G|X3K$nZO_ zWMXDyU|ih9_!Jl-55b90R+xp!fWbf>7)`RuED{D{4I&-t;+!kDNhEZ?dA;kKd*soe zkj2}9>iI!R6j+)V*?=4-gU0{RWSyMC%4pE|(V+1#8;3R0cE%GG;Rha(9FcV z$HF*!N4pah~P4X7s-g!2@D zNht@IUXy^iqZlZgl30|Y08C-IKn-~*z*Li$k_pZT3i)XYrNyZ_C>9mu1NDL|1FD4E z56m_S1x1O;z~l-xvm_OiCX4k9G~u3L6qC&;DJihh*Do(G*8@2rRS%dz^}(#Os6UUE^6 zfh@>4J{B<+kcgQWRcSeTjE8w>>4xWMI1ata$W zBMTF-s6j1xfLVc&!CXjf{w|$m(u)HR-cs|jk*L|T?bd9eF3FzlCoX#zKYV;|$8Q(8 zkn{7LtIqz5`zx`Xsj4O}iWjL@T;`}My83fy&@{#K$qWCS)j2+A z?yID4{c%l8ZBTt1Bv;JfVZ|(F`fvZKT}_(|dLQrF zaWFGrfy>wLr;~T|Tu|kVTb?m7FC_l_24m|IBfW<#Npp-7k?WvtlMsdL^*x zrG7%KK-s~wTP)cRS6?#c$-L(M(lVo|?(e@(M_z?#vhG$+ROac crFP{c3V7V}$h`SRdzzP)WYF4ei@tjS08HK-ApigX literal 0 HcmV?d00001 diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 33828171..bfadd3b0 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -162,8 +162,7 @@ class _SearchByClinicState extends State { context, MaterialPageRoute( builder: (context) => -// BranchView(doctorsList: docList, result: result, num: numAll), - SearchResults(doctorsList: docList), + BranchView(doctorsList: docList, result: result, num: numAll), ), ); //builder: (context) => SearchResults(doctorsList: docList))); diff --git a/lib/pages/BookAppointment/widgets/BranchView.dart b/lib/pages/BookAppointment/widgets/BranchView.dart index 82c38cb2..ecf2bfd6 100644 --- a/lib/pages/BookAppointment/widgets/BranchView.dart +++ b/lib/pages/BookAppointment/widgets/BranchView.dart @@ -1,8 +1,6 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'package:flutter/material.dart'; - import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -30,7 +28,6 @@ class _BranchViewState extends State { body: new ListView.builder( itemBuilder: (BuildContext context, int index) { return new ExpandableListView( - result2: widget.result, val: index, doctorsList2: widget.doctorsList); @@ -42,13 +39,11 @@ class _BranchViewState extends State { } class ExpandableListView extends StatefulWidget { - final List result2; final List doctorsList2; final val; - const ExpandableListView( - {Key key, this.result2, this.val, this.doctorsList2}) + const ExpandableListView({Key key, this.result2, this.val, this.doctorsList2}) : super(key: key); @override @@ -61,11 +56,9 @@ class _ExpandableListViewState extends State { @override Widget build(BuildContext context) { return new Container( - // margin: new EdgeInsets.symmetric(vertical: 1.0), width: MediaQuery.of(context).size.width * 0.6, - margin: EdgeInsets.fromLTRB(20.0, 10.0, 10.0, 0.0), + margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 0.0), child: Card( - // margin: EdgeInsets.fromLTRB(20.0, 16.0, 20.0, 8.0), color: Colors.white, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), @@ -77,19 +70,19 @@ class _ExpandableListViewState extends State { child: new Column( children: [ new Container( + margin: EdgeInsets.only(left: 5.0, right: 5.0), color: Colors.white, - // padding: new EdgeInsets.symmetric(horizontal: 5.0), child: new Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ new Text( - widget.result2[widget.val].toString()+" "+ "22 كم", + widget.result2[widget.val].toString() + " " + " - 22 KM", style: new TextStyle( fontWeight: FontWeight.bold, color: Colors.black), ), new IconButton( icon: new Container( - height: 30.0, + height: 28.0, width: 30.0, decoration: new BoxDecoration( color: Colors.red, @@ -124,13 +117,14 @@ class _ExpandableListViewState extends State { itemCount: widget.doctorsList2.length, itemBuilder: (context, index) { return widget.result2[widget.val].toString() == - widget.doctorsList2[index].projectName.toString()? DoctorView( - //AJ note - doctor: - widget.doctorsList2[index] - - // widget.doctorsList2[index] - ):Container(); + widget.doctorsList2[index].projectName.toString() + ? DoctorView( + //AJ note + doctor: widget.doctorsList2[index] + + // widget.doctorsList2[index] + ) + : Container(); }, ), ) @@ -162,7 +156,8 @@ class ExpandableContainer extends StatelessWidget { duration: new Duration(milliseconds: 500), curve: Curves.easeInOut, width: screenWidth, - height: expanded ? expandedHeight : collapsedHeight, + height: + expanded ? expandedHeight : collapsedHeight, child: new Container( child: child, decoration: new BoxDecoration( diff --git a/lib/pages/BookAppointment/widgets/DoctorView.dart b/lib/pages/BookAppointment/widgets/DoctorView.dart index 3d69a93d..39e4ab36 100644 --- a/lib/pages/BookAppointment/widgets/DoctorView.dart +++ b/lib/pages/BookAppointment/widgets/DoctorView.dart @@ -39,7 +39,7 @@ class DoctorView extends StatelessWidget { fit: BoxFit.fill, height: 60.0, width: 60.0), ), Container( - width: MediaQuery.of(context).size.width * 0.6, + width: MediaQuery.of(context).size.width * 0.52, margin: EdgeInsets.fromLTRB(20.0, 10.0, 10.0, 0.0), child: Column( crossAxisAlignment: CrossAxisAlignment.start,