diff --git a/lib/pages/ErService/ErOptions.dart b/lib/pages/ErService/ErOptions.dart index 6b6166bb..886d47d2 100644 --- a/lib/pages/ErService/ErOptions.dart +++ b/lib/pages/ErService/ErOptions.dart @@ -37,12 +37,7 @@ class _ErOptionsState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ -// Text(TranslationBase.of(context).searchBy, -// style: TextStyle( -// fontSize: 24.0, -// letterSpacing: 1.0, -// fontWeight: FontWeight.bold, -// color: new Color(0xFF60686b))), + Container( margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), child: Row( diff --git a/lib/pages/ErService/widgets/card_common.dart b/lib/pages/ErService/widgets/card_common.dart index c65789c5..b5fd205a 100644 --- a/lib/pages/ErService/widgets/card_common.dart +++ b/lib/pages/ErService/widgets/card_common.dart @@ -21,7 +21,7 @@ class CardCommonEr extends StatelessWidget { return GestureDetector( onTap: () { navigateToSearch(context, this.type); - print("=============this.type============="+this.type); + }, child: Container( margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), @@ -63,14 +63,7 @@ class CardCommonEr extends StatelessWidget { if(type==0) {print("========Ambalunce=========");} else{ - print("=========Nearest ER==========="); -// Navigator.push( -// context, -// -// FadePage( -// // page: NearestEr(isAppbar: true,))); -// page: NearestEr())); Navigator.push( context, FadePage( @@ -79,11 +72,5 @@ class CardCommonEr extends StatelessWidget { } -// Navigator.push( -// context, -// MaterialPageRoute( -// builder: (context) => Search( -// type: type, -// ))); } } diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart index 457f646d..b957ec42 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -40,7 +40,7 @@ class CardPosition extends StatelessWidget { }, child: Container( - width:170, + width:165, margin: EdgeInsets.fromLTRB(7.0, 7.0, 7.0, 7.0), decoration: BoxDecoration(boxShadow: [ BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) @@ -79,10 +79,8 @@ class CardPosition extends StatelessWidget { Future navigateToSearch(context, type,telephone,networkImage,latitude,longitude,projectname) async { -//===Switch case=== - print("================"+type); - print("================"+telephone); - print("================"+networkImage); + + showDialog( context: context,builder: (_) => AssetGiffyDialog( @@ -98,22 +96,6 @@ class CardPosition extends StatelessWidget { onOkButtonPressed: () { MapsLauncher.launchCoordinates(double.parse(latitude),double.parse(longitude),projectname);}, onCancelButtonPressed :() {launch("tel://" +telephone);} -// double.parse( -// _medicineProvider.pharmaciesList[index]["Latitude"]), -// double.parse( -// _medicineProvider.pharmaciesList[index]["Longitude"]), -// _medicineProvider.pharmaciesList[index] -// ["LocationDescription"]); - //launch("tel://" +telephone); -//================ -// MapsLauncher.launchCoordinates( -// double.parse( -// _medicineProvider.pharmaciesList[index]["Latitude"]), -// double.parse( -// _medicineProvider.pharmaciesList[index]["Longitude"]), -// _medicineProvider.pharmaciesList[index] -// ["LocationDescription"]); -//=================