Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts: # lib/pages/BookAppointment/BookConfirm.dart # lib/pages/medical/smart_watch_health_data/syncHealthData.dart # lib/pages/vaccine/my_vaccines_screen.dart # lib/widgets/in_app_browser/InAppBrowser.dart # pubspec.yamlmerge-requests/570/merge
commit
9ba7b3b44b
@ -0,0 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="48.615" height="48.48" viewBox="0 0 48.615 48.48">
|
||||
<g id="phone-call_1_" data-name="phone-call (1)" transform="translate(0 -0.584)">
|
||||
<g id="Group_8539" data-name="Group 8539" transform="translate(0 0.584)">
|
||||
<path id="Path_4999" data-name="Path 4999" d="M47.642,37.832l-6.627-6.6a3.364,3.364,0,0,0-4.715,0l-4.206,4.31a1.128,1.128,0,0,1-1.483,0A113.953,113.953,0,0,1,21.667,27.6a105.911,105.911,0,0,1-8.006-8.9,1.078,1.078,0,0,1,0-1.483l4.4-4.3a3.435,3.435,0,0,0,0-4.773L11.437,1.522a3.5,3.5,0,0,0-4.773,0L1.218,6.991s-.243.232-.324.324C-2.176,11,2.724,22.689,14.611,34.507c8.654,8.7,18.433,14.528,24.272,14.528a4.276,4.276,0,0,0,2.8-.568c.162-.116.614-.521.614-.521l5.341-5.364A3.385,3.385,0,0,0,47.642,37.832Z" transform="translate(0 -0.584)" fill="#5ab145"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 842 B |
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
@ -0,0 +1,3 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="35.547" height="48.48" viewBox="0 0 35.547 48.48">
|
||||
<path id="map" d="M22.773,1A17.773,17.773,0,0,0,5,18.773c0,9.388,15.834,29.245,16.513,30.1a1.616,1.616,0,0,0,2.521,0c.679-.856,16.513-20.714,16.513-30.1A17.773,17.773,0,0,0,22.773,1Zm0,22.621a6.463,6.463,0,1,1,6.463-6.463A6.463,6.463,0,0,1,22.773,23.621Z" transform="translate(-5 -1)" fill="#5ab145"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 409 B |
@ -0,0 +1,3 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="48.248" height="48.48" viewBox="0 0 48.248 48.48">
|
||||
<path id="whatsapp" d="M41.468,7.045A24.029,24.029,0,0,0,3.658,36.031L.25,48.48l12.735-3.341a24,24,0,0,0,11.48,2.924h.01A24.033,24.033,0,0,0,41.468,7.045ZM24.475,44.006h-.008A19.942,19.942,0,0,1,14.3,41.223l-.729-.433L6.018,42.772,8.035,35.4l-.475-.755a19.967,19.967,0,1,1,16.915,9.357ZM35.427,29.052c-.6-.3-3.551-1.752-4.1-1.953s-.95-.3-1.35.3-1.55,1.953-1.9,2.353-.7.451-1.3.15a16.4,16.4,0,0,1-4.827-2.979,18.106,18.106,0,0,1-3.339-4.158c-.35-.6,0-.895.263-1.225a16.98,16.98,0,0,0,1.5-2.053,1.1,1.1,0,0,0-.05-1.052c-.15-.3-1.35-3.255-1.85-4.457-.488-1.17-.982-1.012-1.351-1.03-.35-.017-.75-.021-1.15-.021a2.2,2.2,0,0,0-1.6.751,6.732,6.732,0,0,0-2.1,5.007c0,2.955,2.151,5.809,2.451,6.209s4.233,6.464,10.254,9.063A34.358,34.358,0,0,0,28.4,35.224a8.229,8.229,0,0,0,3.781.238c1.153-.173,3.551-1.452,4.052-2.854a5.015,5.015,0,0,0,.35-2.855C36.428,29.5,36.027,29.352,35.427,29.052Zm0,0" transform="translate(-0.25)" fill="#5ab145" fill-rule="evenodd"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,258 @@
|
||||
import 'dart:io' show Platform;
|
||||
|
||||
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:maps_launcher/maps_launcher.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import 'package:map_launcher/map_launcher.dart';
|
||||
import 'dart:io' show Platform;
|
||||
|
||||
class pharmacyContactsPage extends StatefulWidget {
|
||||
@override
|
||||
_pharmacyContactsPageState createState() => _pharmacyContactsPageState();
|
||||
}
|
||||
|
||||
class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final latitude = "24.704016";
|
||||
final longitude = "46.676691";
|
||||
final phone = "+966112833400";
|
||||
final whatsApp = "+966558434444";
|
||||
final whatappURL_android = "whatsapp://send?phone=" + whatsApp;
|
||||
final whatappURL_ios = "https://wa.me/$whatsApp";
|
||||
final locationDescription = "Main Pharmacy OLAYA";
|
||||
|
||||
return AppScaffold(
|
||||
appBarTitle: TranslationBase.of(context).contactUs,
|
||||
isShowAppBar: true,
|
||||
isShowDecPage: false,
|
||||
isPharmacy: true,
|
||||
showPharmacyCart: false,
|
||||
showHomeAppBarIcon: false,
|
||||
isMainPharmacyPages: true,
|
||||
isBottomBar: true,
|
||||
body: Column(
|
||||
children: [
|
||||
Card(
|
||||
elevation: 2,
|
||||
shape: RoundedRectangleBorder(
|
||||
side: BorderSide(color: Colors.grey[300], width: 2),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
margin: EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 8,
|
||||
),
|
||||
child: Container(
|
||||
margin: EdgeInsets.all(10),
|
||||
padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(
|
||||
Radius.circular(15),
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Container(
|
||||
child: Text(TranslationBase.of(context).contactUsTime,
|
||||
style: TextStyle(
|
||||
color: Colors.grey[700],
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.68)),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 35,
|
||||
),
|
||||
Row(
|
||||
children: <Widget>[
|
||||
InkWell(
|
||||
onTap: () {
|
||||
launch("tel://" + phone);
|
||||
},
|
||||
child: SvgPicture.asset(
|
||||
'assets/images/pharmacy/call.svg',
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 20,
|
||||
),
|
||||
Text(TranslationBase.of(context).phone,
|
||||
style: TextStyle(
|
||||
color: Colors.grey[700],
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.68)),
|
||||
SizedBox(
|
||||
width: 30,
|
||||
),
|
||||
Text("+966 " + " -11- 2833400",
|
||||
style: TextStyle(
|
||||
color: Colors.grey[700],
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.68)),
|
||||
],
|
||||
),
|
||||
SizedBox(
|
||||
height: 30,
|
||||
),
|
||||
Row(
|
||||
children: <Widget>[
|
||||
InkWell(
|
||||
onTap: () {
|
||||
// launch('whatsapp://send?phone='+whatsApp);
|
||||
openWhatsApp();
|
||||
},
|
||||
child: SvgPicture.asset(
|
||||
'assets/images/pharmacy/whatsapp.svg',
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 20,
|
||||
),
|
||||
Text(TranslationBase.of(context).whatsApp,
|
||||
style: TextStyle(
|
||||
color: Colors.grey[700],
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.68)),
|
||||
SizedBox(
|
||||
width: 30,
|
||||
),
|
||||
Text("+966 " + " 558434444",
|
||||
style: TextStyle(
|
||||
color: Colors.grey[700],
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.68)),
|
||||
],
|
||||
),
|
||||
SizedBox(
|
||||
height: 30,
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(5.0),
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
InkWell(
|
||||
onTap: () {
|
||||
if (Platform.isIOS) { MapLauncher.showMarker(
|
||||
mapType: MapType.apple,
|
||||
coords: Coords(double.parse(latitude),
|
||||
double.parse(longitude)),
|
||||
title: locationDescription,);
|
||||
} else { MapLauncher.showMarker(
|
||||
mapType: MapType.google,
|
||||
coords: Coords(double.parse(latitude),
|
||||
double.parse(longitude)),
|
||||
title: locationDescription,
|
||||
// description: location.locationName,
|
||||
); }
|
||||
// MapsLauncher.launchCoordinates(double.parse(previousModel.productLocationService[index].latitude), double.parse(previousModel.productLocationService[index].longitude), previousModel.productLocationService[index].locationDescription);
|
||||
},
|
||||
// MapsLauncher.launchCoordinates(
|
||||
// double.parse(latitude),
|
||||
// double.parse(longitude));
|
||||
// },
|
||||
child: SvgPicture.asset(
|
||||
'assets/images/pharmacy/location.svg',
|
||||
width: 20,
|
||||
height: 20,
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 20,
|
||||
),
|
||||
Expanded(
|
||||
child: Text(
|
||||
TranslationBase.of(context).contactUsLocation,
|
||||
style: TextStyle(
|
||||
color: Colors.grey[700],
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.68)),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 50,
|
||||
),
|
||||
Center(
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||
children: <Widget>[
|
||||
IconButton(
|
||||
icon: new Image.asset(
|
||||
'assets/images/new-design/facebook.png'),
|
||||
tooltip: 'facebook',
|
||||
iconSize: 48,
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
launch("https://facebook.com/HMG.pharmacy");
|
||||
// launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
|
||||
});
|
||||
},
|
||||
),
|
||||
IconButton(
|
||||
icon: new Image.asset(
|
||||
'assets/images/new-design/twitter.png'),
|
||||
tooltip: 'Twitter',
|
||||
iconSize: 48,
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
launch("https://twitter.com/HMG_pharmacy");
|
||||
});
|
||||
},
|
||||
),
|
||||
IconButton(
|
||||
icon: new Image.asset(
|
||||
'assets/images/pharmacy/instagram.png'),
|
||||
tooltip: 'Instagram',
|
||||
iconSize: 48,
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
launch("https://instagram.com/HMG_pharmacy");
|
||||
});
|
||||
},
|
||||
),
|
||||
]),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
openWhatsApp() async {
|
||||
// bool Platform.isIOS = Theme.of(context).platform == TargetPlatform.iOS;
|
||||
var whatsapp = "+966558434444";
|
||||
var whatsappURL_android = "whatsapp://send?phone=" + whatsapp;
|
||||
var whatappURL_ios = "https://wa.me/$whatsapp";
|
||||
if (Platform.isIOS) {
|
||||
// for iOS phone only
|
||||
// if (await canLaunch(whatappURL_ios)) {
|
||||
await launch(whatappURL_ios, forceSafariVC: false);
|
||||
// } else {}
|
||||
} else {
|
||||
// android
|
||||
// if (await canLaunch(whatsappURL_android)) {
|
||||
await launch(whatsappURL_android);
|
||||
// } else {}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue