merge-update-with-lab-changes
Mohammad Aljammal 6 years ago
parent e909c16b80
commit e254261ef9

@ -1,6 +1,6 @@
import 'package:diplomaticquarterapp/uitl/location_util.dart'; 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:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../uitl/translations_delegate_base.dart'; import '../../uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart';
@ -37,12 +37,12 @@ class _ErOptionsState extends State<ErOptions> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text(TranslationBase.of(context).searchBy, // Text(TranslationBase.of(context).searchBy,
style: TextStyle( // style: TextStyle(
fontSize: 24.0, // fontSize: 24.0,
letterSpacing: 1.0, // letterSpacing: 1.0,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
color: new Color(0xFF60686b))), // color: new Color(0xFF60686b))),
Container( Container(
margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0), margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
child: Row( child: Row(
@ -63,6 +63,7 @@ class _ErOptionsState extends State<ErOptions> {
text: TranslationBase.of(context).nearester, text: TranslationBase.of(context).nearester,
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
type: 1), type: 1),
) )
], ],
), ),

@ -4,6 +4,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../uitl/translations_delegate_base.dart'; import '../../uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart'; import 'package:diplomaticquarterapp/pages/ErService/widgets/card_common.dart';
import 'widgets/card_position.dart';
class NearestEr extends StatefulWidget { class NearestEr extends StatefulWidget {
final bool isAppbar; final bool isAppbar;
@ -50,16 +52,17 @@ class _NearestErState extends State<NearestEr> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardCommonEr( child: CardPosition(
image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).ambulancerequest, text: TranslationBase.of(context).ambulancerequest,
image: 'assets/images/new-design/find_us_icon.png',
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
type: 0, type: 0,
), ),
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardCommonEr( child: CardPosition(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).nearester, text: TranslationBase.of(context).nearester,
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
@ -74,7 +77,7 @@ class _NearestErState extends State<NearestEr> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardCommonEr( child: CardPosition(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).ambulancerequest, text: TranslationBase.of(context).ambulancerequest,
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
@ -83,7 +86,7 @@ class _NearestErState extends State<NearestEr> {
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardCommonEr( child: CardPosition(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).nearester, text: TranslationBase.of(context).nearester,
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
@ -97,7 +100,7 @@ class _NearestErState extends State<NearestEr> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardCommonEr( child: CardPosition(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).ambulancerequest, text: TranslationBase.of(context).ambulancerequest,
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
@ -106,7 +109,7 @@ class _NearestErState extends State<NearestEr> {
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardCommonEr( child: CardPosition(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).nearester, text: TranslationBase.of(context).nearester,
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
@ -121,7 +124,7 @@ class _NearestErState extends State<NearestEr> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardCommonEr( child: CardPosition(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).ambulancerequest, text: TranslationBase.of(context).ambulancerequest,
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,

@ -1,6 +1,9 @@
//import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../NearestEr.dart';
class CardCommonEr extends StatelessWidget { class CardCommonEr extends StatelessWidget {
final image; final image;
final text; final text;
@ -17,6 +20,7 @@ class CardCommonEr extends StatelessWidget {
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
navigateToSearch(context, this.type); navigateToSearch(context, this.type);
print("=============this.type============="+this.type);
}, },
child: Container( child: Container(
margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0),
@ -54,6 +58,18 @@ class CardCommonEr extends StatelessWidget {
} }
Future navigateToSearch(context, type) async { 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( // Navigator.push(
// context, // context,
// MaterialPageRoute( // MaterialPageRoute(

@ -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: <Widget>[
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,
// )));
}
}
Loading…
Cancel
Save