updates & fixes

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-----

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-----

lib/pages/BookAppointment/components/SearchByClinic.dart

@@ -162,8 +162,7 @@ class _SearchByClinicState extends State<SearchByClinic> {
       context,
       MaterialPageRoute(
         builder: (context) =>
-//            BranchView(doctorsList: docList, result: result, num: numAll),
+            BranchView(doctorsList: docList, result: result, num: numAll),
-        SearchResults(doctorsList: docList),
       ),
     );
     //builder: (context) => SearchResults(doctorsList: docList)));

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<BranchView> {
       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<BranchView> {
 }
 
 class ExpandableListView extends StatefulWidget {
-
   final List<String> result2;
   final List<DoctorList> doctorsList2;
   final val;
 
-  const ExpandableListView(
+  const ExpandableListView({Key key, this.result2, this.val, this.doctorsList2})
-      {Key key, this.result2, this.val, this.doctorsList2})
       : super(key: key);
 
   @override
@@ -61,11 +56,9 @@ class _ExpandableListViewState extends State<ExpandableListView> {
   @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<ExpandableListView> {
           child: new Column(
             children: <Widget>[
               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: <Widget>[
                     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<ExpandableListView> {
                   itemCount: widget.doctorsList2.length,
                   itemBuilder: (context, index) {
                     return widget.result2[widget.val].toString() ==
-                        widget.doctorsList2[index].projectName.toString()? DoctorView(
+                            widget.doctorsList2[index].projectName.toString()
-                      //AJ note
+                        ? DoctorView(
-                      doctor:
+                            //AJ note
-                           widget.doctorsList2[index]
+                            doctor: widget.doctorsList2[index]
-
+
-                      //  widget.doctorsList2[index]
+                            //  widget.doctorsList2[index]
-                    ):Container();
+                            )
+                        : 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(

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,