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

@ -53,20 +53,20 @@ class _NearestErState extends State<NearestEr> {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: CardPosition(
text: TranslationBase.of(context).ambulancerequest, text: "Olaya Hospital",
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
type: 0, type: 3,
), ),
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( 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: "Takhassusi Hospital",
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
type: 1), type: 5),
flex: 0, flex: 0,
) )
@ -79,18 +79,18 @@ class _NearestErState extends State<NearestEr> {
Expanded( Expanded(
child: CardPosition( 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: "Arryan Hospital",
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
type: 0, type: 4,
), ),
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( 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: "Suwaidi Hospital",
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
type: 1), type: 6),
flex: 0, flex: 0,
) )
], ],
@ -102,18 +102,18 @@ class _NearestErState extends State<NearestEr> {
Expanded( Expanded(
child: CardPosition( 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: "Al Qassim Hospital",
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
type: 0, type: 7,
), ),
flex: 0, flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( 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: "Khobar Hospital",
subText: TranslationBase.of(context).locationa, subText: TranslationBase.of(context).locationa,
type: 1), type: 8),
flex: 0, flex: 0,
) )
@ -126,9 +126,9 @@ class _NearestErState extends State<NearestEr> {
Expanded( Expanded(
child: CardPosition( 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: "Dubai Hospital",
subText: TranslationBase.of(context).requestA, subText: TranslationBase.of(context).requestA,
type: 0, type: 1,
), ),
flex: 0, flex: 0,

@ -1,5 +1,6 @@
//import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../NearestEr.dart'; import '../NearestEr.dart';
@ -64,12 +65,15 @@ class CardCommonEr extends StatelessWidget {
else{ else{
print("=========Nearest ER==========="); print("=========Nearest ER===========");
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(
builder: (context) => NearestEr(isAppbar: true,))); FadePage(
page: NearestEr(isAppbar: true,)));
} }
// Navigator.push( // Navigator.push(
// context, // context,
// MaterialPageRoute( // MaterialPageRoute(

@ -1,5 +1,7 @@
//import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../NearestEr.dart'; import '../NearestEr.dart';
@ -24,7 +26,7 @@ class CardPosition extends StatelessWidget {
print("=============this.type============="+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(7.0, 7.0, 7.0, 7.0),
decoration: BoxDecoration(boxShadow: [ decoration: BoxDecoration(boxShadow: [
BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)
], borderRadius: BorderRadius.circular(10), color: Colors.white), ], borderRadius: BorderRadius.circular(10), color: Colors.white),
@ -36,9 +38,9 @@ class CardPosition extends StatelessWidget {
child: Text(this.text, child: Text(this.text,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
style: TextStyle( style: TextStyle(
color: new Color(0xFFc5272d), color: Colors.black,
letterSpacing: 1.0, letterSpacing: 1.0,
fontSize: 20.0)), fontSize: 2 * SizeConfig.textMultiplier)),
), ),
Container( Container(
alignment: Alignment.center, alignment: Alignment.center,
@ -50,7 +52,7 @@ class CardPosition extends StatelessWidget {
child: Text(this.subText, child: Text(this.subText,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
style: TextStyle( style: TextStyle(
color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)), color: Color(0xFFc5272d), letterSpacing: 1.0, fontSize: 15.0)),
), ),
], ],
@ -68,10 +70,12 @@ class CardPosition extends StatelessWidget {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(
builder: (context) => NearestEr(isAppbar: true,))); FadePage(
page: NearestEr(isAppbar: true,)));
} }
//NearestEr(isAppbar: true,)
// Navigator.push( // Navigator.push(
// context, // context,
// MaterialPageRoute( // MaterialPageRoute(

Loading…
Cancel
Save