six issues

merge-update-with-lab-changes
Fatimah Alshammari 4 years ago
parent f9d1bbe2ee
commit b09b1e4732

@ -50,7 +50,8 @@ const Map localizedValues = {
'searchByDocText': {'en': 'Type the name of the doctor to help you find him', 'ar': 'اكتب اسم الطبيب لمساعدتك في العثور عليه'}, 'searchByDocText': {'en': 'Type the name of the doctor to help you find him', 'ar': 'اكتب اسم الطبيب لمساعدتك في العثور عليه'},
'enterDocName': {'en': 'Enter Doctor name', 'ar': 'أدخل إسم الطبيب'}, 'enterDocName': {'en': 'Enter Doctor name', 'ar': 'أدخل إسم الطبيب'},
'search': {'en': 'Search', 'ar': 'بحث'}, 'search': {'en': 'Search', 'ar': 'بحث'},
'noResultFound': {'en': 'No Result Found', 'ar': 'لم يتم العثور على نتائج الرجاء تغيير لغة البحث'}, 'noResultFound': {'en': 'No Result Found', 'ar': 'لم يتم العثور على نتائج '},
'noSearchResultFound': {'en': 'No Result Found', 'ar': 'لم يتم العثور على نتائج الرجاء تغيير لغة البحث'},
'pleaseEnterProductName': {'en': 'Please Enter Product Name', 'ar': 'ادخل اسم المنتج'}, 'pleaseEnterProductName': {'en': 'Please Enter Product Name', 'ar': 'ادخل اسم المنتج'},
'bookNow': {'en': 'BOOK NOW', 'ar': 'احجز الآن'}, 'bookNow': {'en': 'BOOK NOW', 'ar': 'احجز الآن'},
'docInfo': {'en': 'Doctor Information', 'ar': 'معلومات الطبيب'}, 'docInfo': {'en': 'Doctor Information', 'ar': 'معلومات الطبيب'},

@ -59,7 +59,7 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
}, },
onSubmit: (value) { onSubmit: (value) {
searchMedicine(model, context); searchMedicine(model, context);
msg = TranslationBase.of(context).noResultFound; msg = TranslationBase.of(context).noSearchResultFound;
}, },
controller: textController, controller: textController,
// validator: (value) { // validator: (value) {

@ -6,6 +6,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:maps_launcher/maps_launcher.dart'; import 'package:maps_launcher/maps_launcher.dart';
import 'package:url_launcher/url_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 { class pharmacyContactsPage extends StatefulWidget {
@override @override
@ -21,6 +23,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
final whatsApp = "+966558434444"; final whatsApp = "+966558434444";
final whatappURL_android = "whatsapp://send?phone=" + whatsApp; final whatappURL_android = "whatsapp://send?phone=" + whatsApp;
final whatappURL_ios = "https://wa.me/$whatsApp"; final whatappURL_ios = "https://wa.me/$whatsApp";
final locationDescription = "Main Pharmacy OLAYA";
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).contactUs, appBarTitle: TranslationBase.of(context).contactUs,
@ -30,6 +33,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
showPharmacyCart: false, showPharmacyCart: false,
showHomeAppBarIcon: false, showHomeAppBarIcon: false,
isMainPharmacyPages: true, isMainPharmacyPages: true,
isBottomBar: true,
body: Column( body: Column(
children: [ children: [
Card( Card(
@ -143,10 +147,24 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
MapsLauncher.launchCoordinates( if (Platform.isIOS) { MapLauncher.showMarker(
double.parse(latitude), mapType: MapType.apple,
double.parse(longitude)); 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( child: SvgPicture.asset(
'assets/images/pharmacy/location.svg', 'assets/images/pharmacy/location.svg',
width: 20, width: 20,
@ -182,7 +200,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
iconSize: 48, iconSize: 48,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch("https://facebook.com/HMG"); launch("https://facebook.com/HMG.pharmacy");
// launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn"); // launch("https://www.facebook.com/DrSulaimanAlHabib?ref=tn_tnmn");
}); });
}, },
@ -194,7 +212,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
iconSize: 48, iconSize: 48,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch("https://twitter.com/HMG"); launch("https://twitter.com/HMG_pharmacy");
}); });
}, },
), ),
@ -205,7 +223,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
iconSize: 48, iconSize: 48,
onPressed: () { onPressed: () {
setState(() { setState(() {
launch("https://instagram.com/HMG"); launch("https://instagram.com/HMG_pharmacy");
}); });
}, },
), ),

@ -474,8 +474,8 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
SizedBox( SizedBox(
width: 10, width: 10,
), ),
Text( Text( TranslationBase.of(context).termOfService,
TranslationBase.of(context).conditionsHMG, // TranslationBase.of(context).conditionsHMG,
style: TextStyle( style: TextStyle(
fontSize: 13.0, fontSize: 13.0,
), ),

@ -71,7 +71,7 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
onSubmit: (value) { onSubmit: (value) {
searchMedicine(model, context); searchMedicine(model, context);
// msg = 'No Result Found'; // msg = 'No Result Found';
msg = TranslationBase.of(context).noResultFound; msg = TranslationBase.of(context).noSearchResultFound;
}, },
controller: textController, controller: textController,
), ),

@ -71,6 +71,8 @@ class TranslationBase {
String get noResultFound => localizedValues['noResultFound'][locale.languageCode]; String get noResultFound => localizedValues['noResultFound'][locale.languageCode];
String get noSearchResultFound => localizedValues['noSearchResultFound'][locale.languageCode];
String get pleaseEnterProductName => localizedValues['pleaseEnterProductName'][locale.languageCode]; String get pleaseEnterProductName => localizedValues['pleaseEnterProductName'][locale.languageCode];
String get bookNow => localizedValues['bookNow'][locale.languageCode]; String get bookNow => localizedValues['bookNow'][locale.languageCode];

Loading…
Cancel
Save