find us redesigned.

merge-requests/390/head
Sikander Saleem 5 years ago
parent 363cf78884
commit bf920d4188

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/pages/ContactUs/widgets/card_common_contat.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/widgets/card_common_contat.dart';
import 'package:diplomaticquarterapp/uitl/location_util.dart'; import 'package:diplomaticquarterapp/uitl/location_util.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.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';
@ -31,48 +32,75 @@ class _ContactUsPageState extends State<ContactUsPage> {
showNewAppBar: true, showNewAppBar: true,
showNewAppBarTitle: true, showNewAppBarTitle: true,
backgroundColor: Color(0xffF8F8F8), backgroundColor: Color(0xffF8F8F8),
body: Container( body: GridView(
margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, crossAxisSpacing: 13, mainAxisSpacing: 9),
child: Column( physics: NeverScrollableScrollPhysics(),
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.only(top: 25),
children: <Widget>[ shrinkWrap: true,
Row( children: [
mainAxisSize: MainAxisSize.max, CardCommonContact(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: CardCommonContact(
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
text: TranslationBase.of(context).findUs, text: TranslationBase.of(context).findUs,
subText: "", subText: "",
type: 0, type: 0,
), ),
CardCommonContact(
image: 'assets/images/new-design/feedback_icon.png',
text: TranslationBase.of(context).feedback,
subText: "",
type: 1,
), ),
Expanded( CardCommonContact(
child: CardCommonContact(image: 'assets/images/new-design/feedback_icon.png', text: TranslationBase.of(context).feedback, subText: "", type: 1),
),
],
),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: CardCommonContact(
image: 'assets/images/new-design/live_chat_icon.png', image: 'assets/images/new-design/live_chat_icon.png',
text: TranslationBase.of(context).liveChat, text: TranslationBase.of(context).liveChat,
subText: TranslationBase.of(context).service, subText: "",
type: 2, type: 2,
), ),
),
Expanded(
child: Container(),
),
],
),
], ],
), ),
),
// Container(
// margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: <Widget>[
// Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.start,
// children: <Widget>[
// Expanded(
// child: CardCommonContact(
// image: 'assets/images/new-design/find_us_icon.png',
// text: TranslationBase.of(context).findUs,
// subText: "",
// type: 0,
// ),
// ),
// Expanded(
// child: CardCommonContact(image: 'assets/images/new-design/feedback_icon.png', text: TranslationBase.of(context).feedback, subText: "", type: 1),
// ),
// ],
// ),
// Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.start,
// children: <Widget>[
// Expanded(
// child: CardCommonContact(
// image: 'assets/images/new-design/live_chat_icon.png',
// text: TranslationBase.of(context).liveChat,
// subText: TranslationBase.of(context).service,
// type: 2,
// ),
// ),
// Expanded(
// child: Container(),
// ),
// ],
// ),
// ],
// ),
// ),
); );
} }
} }

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model
import 'package:diplomaticquarterapp/pages/ContactUs/findus/hospitrals_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/hospitrals_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/findus/pharmacies_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/pharmacies_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -15,8 +16,7 @@ class FindUsPage extends StatefulWidget {
_FindUsPageState createState() => _FindUsPageState(); _FindUsPageState createState() => _FindUsPageState();
} }
class _FindUsPageState extends State<FindUsPage> class _FindUsPageState extends State<FindUsPage> with SingleTickerProviderStateMixin {
with SingleTickerProviderStateMixin {
TabController _tabController; TabController _tabController;
@override @override
void initState() { void initState() {
@ -40,91 +40,44 @@ class _FindUsPageState extends State<FindUsPage>
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
appBarTitle: 'Locations', appBarTitle: 'Locations',
showNewAppBar: true,
showNewAppBarTitle: true,
backgroundColor: Color(0xffF8F8F8),
baseViewModel: model, baseViewModel: model,
body: Scaffold( body: Column(
extendBodyBehindAppBar: true,
appBar: PreferredSize(
preferredSize: Size.fromHeight(65.0),
child: Stack(
children: <Widget>[ children: <Widget>[
Positioned( TabBar(
bottom: 1,
left: 0,
right: 0,
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
child: Container(
color: Theme.of(context)
.scaffoldBackgroundColor
.withOpacity(0.8),
height: 70.0,
),
),
),
Center(
child: Container(
height: 60.0,
margin: EdgeInsets.only(top: 10.0),
width: MediaQuery.of(context).size.width * 0.92, // 0.9,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 0.9), //width: 0.7
),
color: Colors.white),
child: Center(
child: TabBar(
isScrollable: true,
controller: _tabController, controller: _tabController,
indicatorWeight: 5.0, indicatorWeight: 3.0,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
labelColor: Theme.of(context).primaryColor, labelColor: Color(0xff2B353E),
labelPadding: unselectedLabelColor: Color(0xff575757),
EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
unselectedLabelColor: Colors.grey[800], labelStyle: TextStyle(
tabs: [ fontSize: 16,
Container( fontWeight: FontWeight.w600,
width: MediaQuery.of(context).size.width * 0.30, letterSpacing: -0.48,
child: Center(
child: Texts(' Hospitals '),
), ),
unselectedLabelStyle: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
), ),
Container( tabs: [Text(TranslationBase.of(context).hospitals), Text(TranslationBase.of(context).pharmacies)],
width: MediaQuery.of(context).size.width * 0.30,
child: Center(
child: Texts(' Pharmacies '),
),
),
],
),
), ),
),
),
],
),
),
body: Column(
children: <Widget>[
Expanded( Expanded(
child: TabBarView( child: TabBarView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
controller: _tabController, controller: _tabController,
children: <Widget>[ children: <Widget>[
HospitalsPage( HospitalsPage(findusHospitalModelList: model.FindusHospitalModelList), //SendFeedbackPage(),
findusHospitalModelList: model.FindusHospitalModelList, PharmaciesPage(findusPharmaciesModelList: model.FindusPharmaciesModelList) //StatusFeedbackPage()
), //SendFeedbackPage(),
PharmaciesPage(
findusPharmaciesModelList:
model.FindusPharmaciesModelList,
) //StatusFeedbackPage()
], ],
), ),
) )
], ],
), ),
), ),
),
); );
} }
} }

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart'; import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -22,7 +23,180 @@ class HospitalsPage extends StatefulWidget {
class _HospitalsPageState extends State<HospitalsPage> { class _HospitalsPageState extends State<HospitalsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return SingleChildScrollView(
physics: BouncingScrollPhysics(),
padding: EdgeInsets.only(bottom: 21, top: 21, left: 21, right: 21),
child: Column(
children: [
ListView.separated(
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
padding: EdgeInsets.zero,
separatorBuilder: (context, index) => SizedBox(height: 14),
itemBuilder: (context, index) {
GetHMGLocationsModel _location = widget.findusHospitalModelList[index];
return Container(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
InkWell(
onTap: () {
showDialog(
context: context,
builder: (_) => AssetGiffyDialog(
title: Text(
_location.locationName,
style: TextStyle(fontSize: 22.0, fontWeight: FontWeight.w600),
),
image: Image.network(
_location.projectImageURL.toString(),
fit: BoxFit.cover,
),
buttonCancelText: Text(TranslationBase.of(context).cancel),
buttonCancelColor: Colors.grey,
onlyCancelButton: true,
),
);
},
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
child: Image.network(
_location.projectImageURL.toString(),
width: 48,
height: 48,
fit: BoxFit.cover,
),
),
),
Expanded(
child: Padding(
padding: EdgeInsets.only(left: 12, right: 12),
child: Text(
_location.locationName?.trim() ?? "",
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
),
), //model.cOCItemList[index].cOCTitl
IconButton(
icon: Icon(
Icons.location_on,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
setState(() {
MapsLauncher.launchCoordinates(double.parse(_location.latitude), double.parse(_location.longitude), _location.locationName);
});
},
),
IconButton(
icon: Icon(
Icons.phone,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
setState(() {
launch("tel://" + _location.phoneNumber);
});
},
),
],
),
);
},
itemCount: widget.findusHospitalModelList.length,
),
Container(
margin: EdgeInsets.only(top: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
IconButton(
icon: new Image.asset('assets/images/new-design/youtube.png'),
iconSize: 48,
tooltip: 'Youtube',
onPressed: () {
setState(() {
launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/linkedin.png'),
tooltip: 'LinkedIn',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/twitter.png'),
tooltip: 'Twitter',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://twitter.com/HMG");
});
},
),
IconButton(
icon: new Image.asset('assets/images/new-design/facebook.png'),
tooltip: 'facebook',
iconSize: 48,
onPressed: () {
setState(() {
launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
});
},
),
],
),
),
],
),
);
AppScaffold(
isShowDecPage: false, isShowDecPage: false,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
@ -46,65 +220,37 @@ class _HospitalsPageState extends State<HospitalsPage> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Row( Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
showDialog( showDialog(
context: context, context: context,
builder: (_) => builder: (_) => AssetGiffyDialog(
AssetGiffyDialog(
title: Text( title: Text(
widget widget.findusHospitalModelList[index].locationName,
.findusHospitalModelList[ style: TextStyle(fontSize: 22.0, fontWeight: FontWeight.w600),
index]
.locationName,
style: TextStyle(
fontSize: 22.0,
fontWeight:
FontWeight
.w600),
), ),
image: Image.network( image: Image.network(
widget widget.findusHospitalModelList[index].projectImageURL.toString(),
.findusHospitalModelList[
index]
.projectImageURL
.toString(),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
buttonCancelText: buttonCancelText: Text('cancel'),
Text('cancel'), buttonCancelColor: Colors.grey,
buttonCancelColor:
Colors.grey,
onlyCancelButton: true, onlyCancelButton: true,
)); ));
}, },
child: Container( child: Container(width: 70, height: 70, child: Image.network(widget.findusHospitalModelList[index].projectImageURL.toString())),
width: 70,
height: 70,
child: Image.network(widget
.findusHospitalModelList[
index]
.projectImageURL
.toString())),
), ),
Expanded( Expanded(
flex: 4, flex: 4,
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(left: 5, right: 5, top: 10, bottom: 1),
left: 5,
right: 5,
top: 10,
bottom: 1),
child: Texts( child: Texts(
'${widget.findusHospitalModelList[index].locationName}', '${widget.findusHospitalModelList[index].locationName}',
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -112,14 +258,12 @@ class _HospitalsPageState extends State<HospitalsPage> {
Expanded( Expanded(
flex: 2, flex: 2,
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.center,
CrossAxisAlignment.center,
children: [ children: [
IconButton( IconButton(
icon: Icon( icon: Icon(
Icons.location_on, Icons.location_on,
color: Theme.of(context) color: Theme.of(context).primaryColor,
.primaryColor,
size: 35, size: 35,
), ),
// icon: new Image.asset( // icon: new Image.asset(
@ -127,27 +271,15 @@ class _HospitalsPageState extends State<HospitalsPage> {
tooltip: '', tooltip: '',
onPressed: () { onPressed: () {
setState(() { setState(() {
MapsLauncher.launchCoordinates( MapsLauncher.launchCoordinates(double.parse(widget.findusHospitalModelList[index].latitude),
double.parse(widget double.parse(widget.findusHospitalModelList[index].longitude), widget.findusHospitalModelList[index].locationName);
.findusHospitalModelList[
index]
.latitude),
double.parse(widget
.findusHospitalModelList[
index]
.longitude),
widget
.findusHospitalModelList[
index]
.locationName);
}); });
}, },
), ),
IconButton( IconButton(
icon: Icon( icon: Icon(
Icons.phone, Icons.phone,
color: Theme.of(context) color: Theme.of(context).primaryColor,
.primaryColor,
size: 35, size: 35,
), ),
// icon: new Image.asset( // icon: new Image.asset(
@ -156,11 +288,7 @@ class _HospitalsPageState extends State<HospitalsPage> {
onPressed: () { onPressed: () {
setState(() { setState(() {
// _volume += 10; // _volume += 10;
launch("tel://" + launch("tel://" + widget.findusHospitalModelList[index].phoneNumber);
widget
.findusHospitalModelList[
index]
.phoneNumber);
}); });
}, },
), ),
@ -193,32 +321,27 @@ class _HospitalsPageState extends State<HospitalsPage> {
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/youtube.png'),
'assets/images/new-design/youtube.png'),
iconSize: 70, iconSize: 70,
tooltip: 'Youtube', tooltip: 'Youtube',
onPressed: () { onPressed: () {
setState(() { setState(() {
launch( launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
"https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
}); });
}, },
), ),
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/linkedin.png'),
'assets/images/new-design/linkedin.png'),
tooltip: 'LinkedIn', tooltip: 'LinkedIn',
iconSize: 70, iconSize: 70,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch( launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
"https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
}); });
}, },
), ),
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/twitter.png'),
'assets/images/new-design/twitter.png'),
tooltip: 'Twitter', tooltip: 'Twitter',
iconSize: 70, iconSize: 70,
onPressed: () { onPressed: () {
@ -228,14 +351,12 @@ class _HospitalsPageState extends State<HospitalsPage> {
}, },
), ),
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/facebook.png'),
'assets/images/new-design/facebook.png'),
tooltip: 'facebook', tooltip: 'facebook',
iconSize: 70, iconSize: 70,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch( launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
"https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
}); });
}, },
), ),

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart'; import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -22,215 +23,179 @@ class PharmaciesPage extends StatefulWidget {
class _PharmaciesPageState extends State<PharmaciesPage> { class _PharmaciesPageState extends State<PharmaciesPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return SingleChildScrollView(
isShowDecPage: false, physics: BouncingScrollPhysics(),
body: SingleChildScrollView( padding: EdgeInsets.only(bottom: 21, top: 21, left: 21, right: 21),
child: Container(
margin: EdgeInsets.only(left: 15, right: 15, top: 70),
child: Column( child: Column(
children: [ children: [
...List.generate( ListView.separated(
widget.findusPharmaciesModelList.length, physics: NeverScrollableScrollPhysics(),
(index) => Container( shrinkWrap: true,
padding: EdgeInsets.zero,
separatorBuilder: (context, index) => SizedBox(height: 14),
itemBuilder: (context, index) {
GetHMGLocationsModel _location = widget.findusPharmaciesModelList[index];
return Container(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, borderRadius: BorderRadius.all(
border: Border.all(color: Colors.white, width: 0.5), Radius.circular(10.0),
borderRadius: BorderRadius.all(Radius.circular(5)),
color: Colors.white,
), ),
child: Padding( boxShadow: [
padding: const EdgeInsets.all(8.0), BoxShadow(
child: Column( color: Color(0xff000000).withOpacity(.05),
crossAxisAlignment: CrossAxisAlignment.start, //spreadRadius: 5,
children: <Widget>[ blurRadius: 27,
Row( offset: Offset(0, -3),
mainAxisAlignment: ),
MainAxisAlignment.spaceBetween, ],
children: <Widget>[ color: Colors.white),
Expanded(
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
showDialog( showDialog(
context: context, context: context,
builder: (_) => builder: (_) => AssetGiffyDialog(
AssetGiffyDialog(
title: Text( title: Text(
widget _location.locationName,
.findusPharmaciesModelList[ style: TextStyle(fontSize: 22.0, fontWeight: FontWeight.w600),
index]
.locationName,
style: TextStyle(
fontSize: 22.0,
fontWeight:
FontWeight
.w600),
), ),
image: widget image: _location.projectImageURL != null
.findusPharmaciesModelList[
index]
.projectImageURL !=
null
? Image.network( ? Image.network(
widget _location.projectImageURL,
.findusPharmaciesModelList[
index]
.projectImageURL,
fit: BoxFit.cover, fit: BoxFit.cover,
) )
: Image.network( : Image.network(
'https://hmgwebservices.com/Images/Hospitals/15.jpg', 'https://hmgwebservices.com/Images/Hospitals/15.jpg',
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
buttonCancelText: buttonCancelText: Text(TranslationBase.of(context).cancel),
Text('cancel'),
// buttonCancelText:Text(model.user.projectID) , // buttonCancelText:Text(model.user.projectID) ,
buttonCancelColor: buttonCancelColor: Colors.grey,
Colors.grey,
onlyCancelButton: true, onlyCancelButton: true,
)); ),
);
}, },
child: Container( child: ClipRRect(
width: 70, borderRadius: BorderRadius.circular(12),
height: 70, child: Image.network(
child: Image.network(widget _location?.projectImageURL?.toString() ?? 'https://hmgwebservices.com/Images/Hospitals/15.jpg',
.findusPharmaciesModelList[ width: 48,
index] height: 48,
.projectImageURL != fit: BoxFit.cover,
null ),
? widget ),
.findusPharmaciesModelList[
index]
.projectImageURL
.toString()
: 'https://hmgwebservices.com/Images/Hospitals/15.jpg')),
), ),
Expanded( Expanded(
flex: 4, child: Padding(
child: Container( padding: EdgeInsets.only(left: 12, right: 12),
margin: EdgeInsets.only(
left: 5, right: 5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Texts( Text(
'${widget.findusPharmaciesModelList[index].locationName}', _location.locationName?.trim() ?? "",
textAlign: TextAlign.start, style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
), ),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
Texts( Text(
'${widget.findusPharmaciesModelList[index].cityName}', _location.cityName?.trim() ?? "",
textAlign: TextAlign.center, style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
), ),
], ],
), ),
), ),
), ),
//model.cOCItemList[index].cOCTitl
Expanded(
flex: 2,
child: Row(
children: [
IconButton( IconButton(
icon: Icon(Icons.location_on,color: Theme.of(context).primaryColor,size: 35,), icon: Icon(
Icons.location_on,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '', tooltip: '',
onPressed: () { onPressed: () {
setState(() { setState(() {
MapsLauncher.launchCoordinates( MapsLauncher.launchCoordinates(double.parse(_location.latitude), double.parse(_location.longitude), _location.locationName);
double.parse(widget
.findusPharmaciesModelList[
index]
.latitude),
double.parse(widget
.findusPharmaciesModelList[
index]
.longitude),
widget
.findusPharmaciesModelList[
index]
.locationName);
}); });
}, },
), ),
IconButton( IconButton(
icon: Icon(Icons.phone,color: Theme.of(context).primaryColor,size: 35,), icon: Icon(
tooltip: 'I', Icons.phone,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () { onPressed: () {
setState(() { setState(() {
launch("tel://" + _location.phoneNumber);
launch("tel://" +
widget
.findusPharmaciesModelList[
index]
.phoneNumber);
}); });
}, },
), ),
], ],
), ),
);
},
itemCount: widget.findusPharmaciesModelList.length,
), ),
], Container(
), margin: EdgeInsets.only(top: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
), ),
], boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
), ),
Divider(
height: 4.5,
color: Colors.grey[500],
)
], ],
), color: Colors.white),
),
)),
SizedBox(
height: 8,
),
Container(
width: double.infinity,
height: 100,
color: Colors.white,
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/youtube.png'),
'assets/images/new-design/youtube.png'), iconSize: 48,
iconSize: 70,
tooltip: 'Youtube', tooltip: 'Youtube',
onPressed: () { onPressed: () {
setState(() { setState(() {
// _volume += 10; launch("https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
launch(
"https://www.youtube.com/c/DrsulaimanAlhabibHospitals");
}); });
}, },
), ),
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/linkedin.png'),
'assets/images/new-design/linkedin.png'),
tooltip: 'LinkedIn', tooltip: 'LinkedIn',
iconSize: 70, iconSize: 48,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch( launch("https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
"https://www.linkedin.com/company/drsulaiman-alhabib-medical-group");
}); });
}, },
), ),
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/twitter.png'),
'assets/images/new-design/twitter.png'),
tooltip: 'Twitter', tooltip: 'Twitter',
iconSize: 70, iconSize: 48,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch("https://twitter.com/HMG"); launch("https://twitter.com/HMG");
@ -238,14 +203,12 @@ class _PharmaciesPageState extends State<PharmaciesPage> {
}, },
), ),
IconButton( IconButton(
icon: new Image.asset( icon: new Image.asset('assets/images/new-design/facebook.png'),
'assets/images/new-design/facebook.png'),
tooltip: 'facebook', tooltip: 'facebook',
iconSize: 70, iconSize: 48,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch( launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
"https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
}); });
}, },
), ),
@ -254,8 +217,6 @@ class _PharmaciesPageState extends State<PharmaciesPage> {
), ),
], ],
), ),
),
),
); );
} }
} }

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/LiveChat/livechat_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/LiveChat/livechat_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart';
import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -14,11 +15,7 @@ class CardCommonContact extends StatelessWidget {
final text; final text;
final subText; final subText;
final type; final type;
const CardCommonContact( const CardCommonContact({@required this.image, @required this.text, @required this.subText, @required this.type});
{@required this.image,
@required this.text,
@required this.subText,
@required this.type});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -27,11 +24,18 @@ class CardCommonContact extends StatelessWidget {
onTap: () { onTap: () {
navigateToSearch(context, this.type); navigateToSearch(context, this.type);
}, },
child: Container( child:
// MedicalProfileItem(
// imagePath: image,
// title: text,
// subTitle: subText,
// isPngImage: true,
// )
Container(
margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0), margin: EdgeInsets.fromLTRB(9.0, 9.0, 9.0, 9.0),
decoration: BoxDecoration(boxShadow: [ decoration: BoxDecoration(boxShadow: [BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)], borderRadius: BorderRadius.circular(10), color: Colors.white),
BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)
], borderRadius: BorderRadius.circular(10), color: Colors.white),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@ -39,17 +43,16 @@ class CardCommonContact extends StatelessWidget {
margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0), margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0),
child: Texts(this.text, child: Texts(this.text,
// overflow: TextOverflow.clip, // overflow: TextOverflow.clip,
color:secondaryColor, color: secondaryColor,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 20.0), fontSize: 20.0),
), ),
Container( Container(
margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0), margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0),
child: Texts(this.subText, child: Texts(this.subText, color: Colors.black, fontSize: 15.0),
color: Colors.black, fontSize: 15.0),
), ),
Align( Align(
alignment: projectViewModel.isArabic? Alignment.bottomLeft:Alignment.bottomRight, alignment: projectViewModel.isArabic ? Alignment.bottomLeft : Alignment.bottomRight,
child: Container( child: Container(
margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 8.0), margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 8.0),
child: Image.asset(this.image, width: 60.0, height: 60.0), child: Image.asset(this.image, width: 60.0, height: 60.0),
@ -62,7 +65,6 @@ class CardCommonContact extends StatelessWidget {
} }
Future navigateToSearch(context, type) async { Future navigateToSearch(context, type) async {
if (type == 0) { if (type == 0) {
Navigator.push(context, FadePage(page: FindUsPage())); Navigator.push(context, FadePage(page: FindUsPage()));
} else if (type == 1) { } else if (type == 1) {
@ -70,7 +72,6 @@ class CardCommonContact extends StatelessWidget {
} else if (type == 2) { } else if (type == 2) {
//LiveChatPage //LiveChatPage
Navigator.push(context, FadePage(page: LiveChatPage())); Navigator.push(context, FadePage(page: LiveChatPage()));
} }
} }
} }

@ -41,13 +41,14 @@ class _WelcomeLogin extends State<WelcomeLogin> {
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
children: [ children: [
SizedBox(height: 12), SizedBox(height: 12),
Align( Row(
alignment: Alignment.centerLeft, children: [
child: SvgPicture.asset( SvgPicture.asset(
"assets/images/new/hmg_icon.svg", "assets/images/new/hmg_icon.svg",
height: 62, height: 62,
width: 62, width: 62,
), ),
],
), ),
SizedBox(height: 24), SizedBox(height: 24),
Text( Text(

@ -16,10 +16,11 @@ class MedicalProfileItem extends StatelessWidget {
final String title; final String title;
final String subTitle; final String subTitle;
final bool hasBadge = false; final bool hasBadge = false;
final bool isPngImage;
bool isEnable; bool isEnable;
Color imgColor; Color imgColor;
MedicalProfileItem({@required this.imagePath, @required this.title, @required this.subTitle, hasBadge, this.isEnable = true, this.imgColor}); MedicalProfileItem({@required this.imagePath, @required this.title, @required this.subTitle, hasBadge, this.isEnable = true, this.imgColor, this.isPngImage = false});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -46,7 +47,14 @@ class MedicalProfileItem extends StatelessWidget {
// ), // ),
// ), // ),
mFlex(1), mFlex(1),
SvgPicture.asset( isPngImage
? Image.asset(
imagePath,
height: SizeConfig.widthMultiplier * 7,
width: SizeConfig.widthMultiplier * 7,
color: imgColor,
)
: SvgPicture.asset(
"assets/images/new/services/$imagePath", "assets/images/new/services/$imagePath",
height: SizeConfig.widthMultiplier * 7, height: SizeConfig.widthMultiplier * 7,
width: SizeConfig.widthMultiplier * 7, width: SizeConfig.widthMultiplier * 7,

Loading…
Cancel
Save