diff --git a/lib/pages/ErService/NearestEr.dart b/lib/pages/ErService/NearestEr.dart index ddd3d74d..16eb0f4c 100644 --- a/lib/pages/ErService/NearestEr.dart +++ b/lib/pages/ErService/NearestEr.dart @@ -53,20 +53,20 @@ class _NearestErState extends State { children: [ Expanded( child: CardPosition( - text: TranslationBase.of(context).ambulancerequest, + text: "Olaya Hospital", image: 'assets/images/new-design/find_us_icon.png', subText: TranslationBase.of(context).requestA, - type: 0, + type: 3, ), flex: 0, ), Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).nearester, + text: "Takhassusi Hospital", subText: TranslationBase.of(context).locationa, - type: 1), + type: 5), flex: 0, ) @@ -79,18 +79,18 @@ class _NearestErState extends State { Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).ambulancerequest, + text: "Arryan Hospital", subText: TranslationBase.of(context).requestA, - type: 0, + type: 4, ), flex: 0, ), Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).nearester, + text: "Suwaidi Hospital", subText: TranslationBase.of(context).locationa, - type: 1), + type: 6), flex: 0, ) ], @@ -102,18 +102,18 @@ class _NearestErState extends State { Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).ambulancerequest, + text: "Al Qassim Hospital", subText: TranslationBase.of(context).requestA, - type: 0, + type: 7, ), flex: 0, ), Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).nearester, + text: "Khobar Hospital", subText: TranslationBase.of(context).locationa, - type: 1), + type: 8), flex: 0, ) @@ -126,9 +126,9 @@ class _NearestErState extends State { Expanded( child: CardPosition( image: 'assets/images/new-design/find_us_icon.png', - text: TranslationBase.of(context).ambulancerequest, + text: "Dubai Hospital", subText: TranslationBase.of(context).requestA, - type: 0, + type: 1, ), flex: 0, diff --git a/lib/pages/ErService/widgets/card_common.dart b/lib/pages/ErService/widgets/card_common.dart index 4d652542..f59df83c 100644 --- a/lib/pages/ErService/widgets/card_common.dart +++ b/lib/pages/ErService/widgets/card_common.dart @@ -1,5 +1,6 @@ //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 '../NearestEr.dart'; @@ -64,12 +65,15 @@ class CardCommonEr extends StatelessWidget { else{ print("=========Nearest ER==========="); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => NearestEr(isAppbar: true,))); + Navigator.push( + context, + + FadePage( + page: 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 index 37766467..e5241772 100644 --- a/lib/pages/ErService/widgets/card_position.dart +++ b/lib/pages/ErService/widgets/card_position.dart @@ -1,5 +1,7 @@ //import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import '../NearestEr.dart'; @@ -24,7 +26,7 @@ class CardPosition extends StatelessWidget { print("=============this.type============="+this.type); }, 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: [ BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) ], borderRadius: BorderRadius.circular(10), color: Colors.white), @@ -36,9 +38,9 @@ class CardPosition extends StatelessWidget { child: Text(this.text, overflow: TextOverflow.clip, style: TextStyle( - color: new Color(0xFFc5272d), + color: Colors.black, letterSpacing: 1.0, - fontSize: 20.0)), + fontSize: 2 * SizeConfig.textMultiplier)), ), Container( alignment: Alignment.center, @@ -50,7 +52,7 @@ class CardPosition extends StatelessWidget { child: Text(this.subText, overflow: TextOverflow.clip, 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( context, - MaterialPageRoute( - builder: (context) => NearestEr(isAppbar: true,))); + + FadePage( + page: NearestEr(isAppbar: true,))); } + //NearestEr(isAppbar: true,) // Navigator.push( // context, // MaterialPageRoute(