From e254261ef91ebec6c9ea58d43f9b94bc18894b4c Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 6 Sep 2020 09:48:55 +0300 Subject: [PATCH] ER --- lib/pages/ErService/AmbulanceReq.dart | 0 lib/pages/ErService/ErOptions.dart | 15 ++-- lib/pages/ErService/NearestEr.dart | 19 +++-- lib/pages/ErService/widgets/card_common.dart | 16 ++++ .../ErService/widgets/card_position.dart | 83 +++++++++++++++++++ 5 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 lib/pages/ErService/AmbulanceReq.dart create mode 100644 lib/pages/ErService/widgets/card_position.dart diff --git a/lib/pages/ErService/AmbulanceReq.dart b/lib/pages/ErService/AmbulanceReq.dart new file mode 100644 index 00000000..e69de29b diff --git a/lib/pages/ErService/ErOptions.dart b/lib/pages/ErService/ErOptions.dart index 33de54b9..2d22f262 100644 --- a/lib/pages/ErService/ErOptions.dart +++ b/lib/pages/ErService/ErOptions.dart @@ -1,6 +1,6 @@ import 'package:diplomaticquarterapp/uitl/location_util.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -//import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; + import 'package:flutter/material.dart'; import '../../uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; @@ -37,12 +37,12 @@ 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))), +// 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( @@ -63,6 +63,7 @@ class _ErOptionsState extends State { text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, type: 1), + ) ], ), diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index eba0dd4f..ddd3d74d 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -4,6 +4,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../../uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; +import 'widgets/card_position.dart'; + class NearestEr extends StatefulWidget { final bool isAppbar; @@ -50,16 +52,17 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( - image: 'assets/images/new-design/find_us_icon.png', + child: CardPosition( text: TranslationBase.of(context).ambulancerequest, + image: 'assets/images/new-design/find_us_icon.png', + subText: TranslationBase.of(context).requestA, type: 0, ), flex: 0, ), Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, @@ -74,7 +77,7 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).ambulancerequest, subText: TranslationBase.of(context).requestA, @@ -83,7 +86,7 @@ class _NearestErState extends State { flex: 0, ), Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, @@ -97,7 +100,7 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).ambulancerequest, subText: TranslationBase.of(context).requestA, @@ -106,7 +109,7 @@ class _NearestErState extends State { flex: 0, ), Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).nearester, subText: TranslationBase.of(context).locationa, @@ -121,7 +124,7 @@ class _NearestErState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Expanded( - child: CardCommonEr( + child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', text: TranslationBase.of(context).ambulancerequest, subText: TranslationBase.of(context).requestA, diff --git a/lib/pages/ErService/widgets/card_common.dart b/lib/pages/ErService/widgets/card_common.dart index 124c73c4..4d652542 100644 --- a/lib/pages/ErService/widgets/card_common.dart +++ b/lib/pages/ErService/widgets/card_common.dart @@ -1,6 +1,9 @@ //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:flutter/material.dart'; +import '../NearestEr.dart'; + class CardCommonEr extends StatelessWidget { final image; final text; @@ -17,6 +20,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), @@ -54,6 +58,18 @@ class CardCommonEr extends StatelessWidget { } Future navigateToSearch(context, type) async { +//===Switch case=== + if(type==0) + {print("========Ambalunce=========");} + else{ + print("=========Nearest ER==========="); + + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => NearestEr(isAppbar: true,))); + + } // Navigator.push( // context, // MaterialPageRoute( diff --git a/lib/pages/ErService/widgets/card_position.dart b/lib/pages/ErService/widgets/card_position.dart new file mode 100644 index 00000000..37766467 --- /dev/null +++ b/lib/pages/ErService/widgets/card_position.dart @@ -0,0 +1,83 @@ +//import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:flutter/material.dart'; + +import '../NearestEr.dart'; + +class CardPosition extends StatelessWidget { + final image; + final text; + final subText; + final type; + const CardPosition( + { + @required this.image, + @required this.text, + @required this.subText, + @required this.type}); + + @override + Widget build(BuildContext context) { + 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), + decoration: BoxDecoration(boxShadow: [ + BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) + ], borderRadius: BorderRadius.circular(10), color: Colors.white), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0), + child: Text(this.text, + overflow: TextOverflow.clip, + style: TextStyle( + color: new Color(0xFFc5272d), + letterSpacing: 1.0, + fontSize: 20.0)), + ), + Container( + alignment: Alignment.center, + margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0), + child: Image.asset(this.image, width: 60.0, height: 60.0), + ), + Container( + margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0), + child: Text(this.subText, + overflow: TextOverflow.clip, + style: TextStyle( + color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)), + ), + + ], + ), + ), + ); + } + + Future navigateToSearch(context, type) async { +//===Switch case=== + if(type==0) + {print("========Ambalunce=========");} + else{ + print("=========Nearest ER==========="); + + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => NearestEr(isAppbar: true,))); + + } +// Navigator.push( +// context, +// MaterialPageRoute( +// builder: (context) => Search( +// type: type, +// ))); + } +} +