Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Lakum & other fixes

Browse Source
merge-requests/477/head
haroon amjad 3 years ago
parent f029aaa1c6
commit e82b8d4439
6 changed files with 273 additions and 420 deletions
Show Stats Download Patch File Download Diff File

4
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -116,8 +116,8 @@ class BaseAppClient {
// body['IdentificationNo'] = 1009199553;
// body['MobileNo'] = "966545156035";
body['PatientID'] = 1018977;
body['TokenID'] = "@dm!n";
// body['PatientID'] = 1018977;
// body['TokenID'] = "@dm!n";
body.removeWhere((key, value) => key == null || value == null);

14
lib/pages/BookAppointment/LaserBooking.dart
View File

File diff suppressed because one or more lines are too long

77
lib/pages/pharmacies/screens/lacum-registration-page.dart
Unescape Escape View File

@ -48,18 +48,18 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
return BaseView<LacumRegistrationViewModel>(
builder: (_, model, wi) => AppScaffold(
appBarTitle:
"${TranslationBase.of(context).register} ${TranslationBase.of(context).lakum}",
appBarTitle: "${TranslationBase.of(context).register} ${TranslationBase.of(context).lakum}",
isShowAppBar: true,
isShowDecPage: false,
isPharmacy: true,
showPharmacyCart: false,
backgroundColor: Colors.white,
baseViewModel: model,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: SizedBox(
height:
mediaQuery.size.height - 60 - mediaQuery.padding.top,
height: mediaQuery.size.height - 60 - mediaQuery.padding.top,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -130,35 +130,26 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
height: 10,
),
Texts(
TranslationBase.of(context)
.prefferedLanguage,
TranslationBase.of(context).prefferedLanguage,
fontSize: 13,
fontWeight: FontWeight.normal,
color: Color(0xff8a8a8a),
),
InkWell(
onTap: () {
RadioGroupDialog dialog =
new RadioGroupDialog(
context: context,
title: TranslationBase.of(context)
.prefferedLanguage,
okText:
TranslationBase.of(context)
.confirm,
cancelText:
TranslationBase.of(context)
.cancel_nocaps,
list: languages,
okFunction: (selectedValue) {
setState(() {
selectedLanguage =
selectedValue;
});
print(
"selectedLanguage = ${selectedValue.name}");
},
cancelFunction: () => {});
RadioGroupDialog dialog = new RadioGroupDialog(
context: context,
title: TranslationBase.of(context).prefferedLanguage,
okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps,
list: languages,
okFunction: (selectedValue) {
setState(() {
selectedLanguage = selectedValue;
});
print("selectedLanguage = ${selectedValue.name}");
},
cancelFunction: () => {});
showDialog(
barrierDismissible: false,
context: context,
@ -170,11 +161,8 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
child: TextField(
enabled: false,
decoration: InputDecoration(
suffixIcon:
Icon(Icons.arrow_drop_down),
hintText: selectedLanguage == null
? "${TranslationBase.of(context).prefferedLanguage}"
: "${selectedLanguage.name}",
suffixIcon: Icon(Icons.arrow_drop_down),
hintText: selectedLanguage == null ? "${TranslationBase.of(context).prefferedLanguage}" : "${selectedLanguage.name}",
hintStyle: TextStyle(
fontSize: 16,
color: Colors.black,
@ -192,12 +180,10 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
),
Container(
color: Colors.green,
margin: EdgeInsets.all(8),
margin: EdgeInsets.all(40),
child: BorderedButton(
TranslationBase.of(context).register,
backgroundColor: canSubmit
? Color(0xff339933)
: Color(0xff99cc99),
backgroundColor: canSubmit ? Color(0xff339933) : Color(0xff99cc99),
textColor: Colors.white,
fontSize: 16,
hPadding: 8,
@ -208,18 +194,13 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
context,
FadePage(
page: LakumTermsConditions(
widget
.patientIdentificationNo,
_firstNameController.text,
_lastNameController.text,
_mobileNumberController
.text,
selectedLanguage.id)))
.then((status) => {
if (status == 200)
{Navigator.pop(context, "")}
// back to previous page
});
widget.patientIdentificationNo, _firstNameController.text, _lastNameController.text, _mobileNumberController.text, selectedLanguage.id)))
.then(
(status) => {
if (status == 200) {Navigator.pop(context, "")}
// back to previous page
},
);
}
: null,
),

466
lib/pages/pharmacies/screens/lakum-main-page.dart
Unescape Escape View File

@ -1,6 +1,8 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PointsAmountPerYear.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/lacum-viewmodel.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-registration-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-setting-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-transfer-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-points-year-page.dart';
@ -10,278 +12,230 @@ import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'lacum-activitaion-vida-page.dart';
class LakumMainPage extends StatelessWidget {
ProjectViewModel projectViewModel;
@override
Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context);
projectViewModel = Provider.of(context);
return BaseView<LacumViewModel>(
onModelReady: (model) => model.getLacumData(),
builder: (_, model, wi) => AppScaffold(
appBarTitle: TranslationBase.of(context).lakum,
isShowAppBar: true,
isPharmacy: true,
isShowDecPage: false,
backgroundColor: Colors.white,
baseViewModel: model,
appBarIcons: _buildAppBarICons(context, model),
// preferredSize: mediaQuery.size.height * 0.20,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: (model.lacumGroupInformation != null &&
model.lacumGroupInformation
.lakumInquiryInformationObjVersion !=
null)
? Column(
children: [
Stack(
children: [
Container(
height: mediaQuery.size.height * 0.15,
color: Colors.green,
),
Column(
children: [
SizedBox(
height: mediaQuery.size.height * 0.05,
),
Container(
width: mediaQuery.size.width * 1,
child: LakumBannerWidget(
model, mediaQuery, true)),
],
)
],
),
onModelReady: (model) async {
await model.getLacumData();
if (model.lacumInformation.yahalaAccountNo == 0 || model.lacumInformation.yahalaAccountNo == null) {
navigateToLakumRegister(context);
} else {
if (model.lacumInformation.status == "Hold") {
Navigator.pushReplacement(context, FadePage(page: LakumActivationVidaPage()));
}
}
},
builder: (_, model, wi) => AppScaffold(
appBarTitle: TranslationBase.of(context).lakum,
isShowAppBar: true,
isPharmacy: true,
showPharmacyCart: false,
isShowDecPage: false,
backgroundColor: Colors.white,
baseViewModel: model,
appBarIcons: _buildAppBarICons(context, model),
// preferredSize: mediaQuery.size.height * 0.20,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: (model.lacumGroupInformation != null && model.lacumGroupInformation.lakumInquiryInformationObjVersion != null)
? Column(
children: [
Stack(
children: [
Container(
height: mediaQuery.size.height * 0.15,
color: Colors.green,
),
Column(
children: [
Container(width: mediaQuery.size.width * 1, child: LakumBannerWidget(model, mediaQuery, true)),
],
)
],
),
SizedBox(
height: 20,
),
LakumHomeButtons(mediaQuery, model),
SizedBox(
height: 20,
),
Container(
height: 100,
margin: EdgeInsets.symmetric(horizontal: 16),
child: ListView(
scrollDirection: Axis.horizontal,
children: <Widget>[
LacumPointsWidget(mediaQuery, 1, TranslationBase.of(context).balance, model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalance, null),
SizedBox(
height: 20,
width: 8,
),
LakumHomeButtons(mediaQuery, model),
LacumPointsWidget(mediaQuery, 2, TranslationBase.of(context).gained, model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.gainedPoints, model.lacumGroupInformation.lakumInquiryInformationObjVersion.gainedPointsAmountPerYear),
SizedBox(
height: 20,
),
Container(
height: 100,
margin: EdgeInsets.symmetric(horizontal: 16),
child: ListView(
scrollDirection: Axis.horizontal,
children: <Widget>[
LacumPointsWidget(
mediaQuery,
1,
TranslationBase.of(context).balance,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.pointsBalanceAmount,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.pointsBalance,
null),
SizedBox(
width: 8,
),
LacumPointsWidget(
mediaQuery,
2,
TranslationBase.of(context).gained,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.pointsBalanceAmount,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.gainedPoints,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.gainedPointsAmountPerYear),
SizedBox(
width: 8,
),
LacumPointsWidget(
mediaQuery,
3,
TranslationBase.of(context).consumed,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPointsAmount !=
null
? int.parse(model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPointsAmount)
: 0,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPoints,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPointsAmountPerYear),
SizedBox(
width: 8,
),
LacumPointsWidget(
mediaQuery,
4,
TranslationBase.of(context).transferred,
0,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.transferPoints,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.transferPointsAmountPerYear),
],
),
width: 8,
),
LacumPointsWidget(
mediaQuery,
3,
TranslationBase.of(context).consumed,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmount != null
? int.parse(model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmount)
: 0,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPoints,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmountPerYear),
SizedBox(
height: 20,
width: 8,
),
SizedBox(
height: 8,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(
vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Expired",
fontSize: 14,
),
)
],
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.expiredPoints} Points",
fontWeight: FontWeight.bold,
LacumPointsWidget(mediaQuery, 4, TranslationBase.of(context).transferred, 0, model.lacumGroupInformation.lakumInquiryInformationObjVersion.transferPoints,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.transferPointsAmountPerYear),
],
),
),
SizedBox(
height: 20,
),
SizedBox(
height: 8,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Expired",
fontSize: 14,
),
],
),
)
],
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.expiredPoints} Points",
fontWeight: FontWeight.bold,
fontSize: 14,
),
Container(
margin: EdgeInsets.symmetric(
vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/waiting_gained_icon.png",
fit: BoxFit.fill,
width: 20,
height: 25,
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Waiting gained",
fontSize: 14,
),
)
],
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.waitingPoints} Points",
fontWeight: FontWeight.bold,
],
),
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/waiting_gained_icon.png",
fit: BoxFit.fill,
width: 20,
height: 25,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Waiting gained",
fontSize: 14,
),
],
),
)
],
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.waitingPoints} Points",
fontWeight: FontWeight.bold,
fontSize: 14,
),
Container(
margin: EdgeInsets.symmetric(
vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/will_be_expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Will Be Expired",
fontSize: 14,
),
)
],
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsWillBeExpired} Points",
fontWeight: FontWeight.bold,
],
),
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/will_be_expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Will Be Expired",
fontSize: 14,
),
],
),
)
],
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsWillBeExpired} Points",
fontWeight: FontWeight.bold,
fontSize: 14,
),
],
)
: Container(),
),
),
));
),
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
],
)
: Container(),
),
),
),
);
}
navigateToLakumRegister(BuildContext context) {
Navigator.pushReplacement(context, FadePage(page: LakumRegistrationPage(projectViewModel.user.patientIdentificationNo)));
}
}
@ -291,12 +245,7 @@ List<Widget> _buildAppBarICons(BuildContext context, LacumViewModel model) {
icon: Icon(Icons.settings),
color: Colors.white,
onPressed: () {
Navigator.push(
context,
FadePage(
page: LakumSettingPage(
model.lacumInformation, model.lacumGroupInformation)))
.then((result) => {model.getLacumGroupData()});
Navigator.push(context, FadePage(page: LakumSettingPage(model.lacumInformation, model.lacumGroupInformation))).then((result) => {model.getLacumGroupData()});
},
),
];
@ -318,9 +267,7 @@ class LakumHomeButtons extends StatelessWidget {
child: InkWell(
onTap: () {
print("Account activate click");
Navigator.push(
context, FadePage(page: LakumActivationVidaPage()))
.then((result) => {model.getLacumGroupData()});
Navigator.push(context, FadePage(page: LakumActivationVidaPage())).then((result) => {model.getLacumGroupData()});
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 8),
@ -363,12 +310,7 @@ class LakumHomeButtons extends StatelessWidget {
child: InkWell(
onTap: () {
print("Lacum transfer click");
Navigator.push(
context,
FadePage(
page: LacumTransferPage(model.lacumInformation,
model.lacumGroupInformation)))
.then((result) => {model.getLacumGroupData()});
Navigator.push(context, FadePage(page: LacumTransferPage(model.lacumInformation, model.lacumGroupInformation))).then((result) => {model.getLacumGroupData()});
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 8),
@ -419,8 +361,7 @@ class LacumPointsWidget extends StatelessWidget {
Color titleColor;
final List<PointsAmountPerYear> pointsAmountPerYear;
LacumPointsWidget(this.mediaQuery, this.pointType, this.title, this.riyal,
this.point, this.pointsAmountPerYear) {
LacumPointsWidget(this.mediaQuery, this.pointType, this.title, this.riyal, this.point, this.pointsAmountPerYear) {
if (pointType == 1) {
titleColor = Color(0xffefefef);
} else if (pointType == 2) {
@ -438,8 +379,7 @@ class LacumPointsWidget extends StatelessWidget {
onTap: () {
if (pointType != 1) {
if (pointsAmountPerYear != null && pointsAmountPerYear.length > 0) {
Navigator.push(context,
FadePage(page: LakumPointsYearPage(pointsAmountPerYear)));
Navigator.push(context, FadePage(page: LakumPointsYearPage(pointsAmountPerYear)));
} else {
// show snackBar No Details Points are there
}

122
lib/pages/pharmacy/profile/profile.dart
Unescape Escape View File

@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/pages/login/welcome.dart';
import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/compare.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/my_reviews.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-activitaion-vida-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-main-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-terms-conditions-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart';
@ -98,7 +99,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
isPharmacy: true,
body: user != null
? Container(
color: Colors.white,
color: Colors.white,
child: SingleChildScrollView(
child: Column(
children: <Widget>[
@ -123,12 +124,8 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Column(children: <Widget>[
Row(children: <Widget>[
Text(
TranslationBase.of(context)
.welcome,
style: TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.bold,
color: Colors.grey),
TranslationBase.of(context).welcome,
style: TextStyle(fontSize: 14.0, fontWeight: FontWeight.bold, color: Colors.grey),
),
]),
SizedBox(
@ -136,16 +133,8 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
Row(children: <Widget>[
Text(
languageID == "ar"
? user.firstNameN.toString() +
" " +
user.lastNameN.toString()
: user.firstName.toString() +
" " +
user.lastName.toString(),
style: TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.bold),
languageID == "ar" ? user.firstNameN.toString() + " " + user.lastNameN.toString() : user.firstName.toString() + " " + user.lastName.toString(),
style: TextStyle(fontSize: 14.0, fontWeight: FontWeight.bold),
),
]),
]),
@ -172,15 +161,10 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
child: InkWell(
onTap: () {
if (customerId == null) {
AppToast.showErrorToast(
message: "Customer not found");
AppToast.showErrorToast(message: "Customer not found");
return;
}
Navigator.push(
context,
FadePage(
page: OrderPage(
customerID: customerId)));
Navigator.push(context, FadePage(page: OrderPage(customerID: customerId)));
},
child: Column(
children: <Widget>[
@ -207,8 +191,10 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: LakumMainPage()));
if (customerId == null || customerId == '')
Navigator.push(context, FadePage(page: LakumActivationVidaPage()));
else
Navigator.push(context, FadePage(page: LakumMainPage()));
},
child: Column(
children: <Widget>[
@ -222,9 +208,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
Text(
TranslationBase.of(context).lakum,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 13.0, fontWeight: FontWeight.bold),
),
],
),
@ -233,9 +217,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(
context,
FadePage(page: WishlistPage()));
Navigator.push(context, FadePage(page: WishlistPage()));
},
child: Column(
children: <Widget>[
@ -261,8 +243,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: MyReviewsPage()));
Navigator.push(context, FadePage(page: MyReviewsPage()));
},
child: Column(
children: <Widget>[
@ -307,9 +288,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
children: <Widget>[
Text(
TranslationBase.of(context).myAccount,
style: TextStyle(
fontSize: 16.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 10,
@ -320,10 +299,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: HomePrescriptionsPage()));
Navigator.push(context, FadePage(page: HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
@ -336,8 +312,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 15,
),
Text(
TranslationBase.of(context)
.myPrescription,
TranslationBase.of(context).myPrescription,
style: TextStyle(
fontSize: 13.0,
),
@ -354,15 +329,11 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: ComparePage()));
Navigator.push(context, FadePage(page: ComparePage()));
},
child: Row(
children: <Widget>[
Image.asset(
'assets/images/pharmacy/compare.png',
width: 35,
height: 35),
Image.asset('assets/images/pharmacy/compare.png', width: 35, height: 35),
SizedBox(
width: 15,
),
@ -384,10 +355,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: HomePrescriptionsPage()));
Navigator.push(context, FadePage(page: HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
@ -400,8 +368,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.medicationsRefill,
TranslationBase.of(context).medicationsRefill,
style: TextStyle(
fontSize: 13.0,
),
@ -418,8 +385,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: MyFamily()));
Navigator.push(context, FadePage(page: MyFamily()));
},
child: Row(
children: <Widget>[
@ -449,10 +415,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PharmacyAddressesPage()));
Navigator.push(context, FadePage(page: PharmacyAddressesPage()));
},
child: Row(
children: <Widget>[
@ -465,8 +428,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.shippingAddresses,
TranslationBase.of(context).shippingAddresses,
style: TextStyle(
fontSize: 13.0,
),
@ -483,10 +445,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PharmacyTermsConditions()));
Navigator.push(context, FadePage(page: PharmacyTermsConditions()));
},
child: Row(
children: <Widget>[
@ -499,8 +458,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 10,
),
Text(
TranslationBase.of(context)
.conditionsHMG,
TranslationBase.of(context).conditionsHMG,
style: TextStyle(
fontSize: 13.0,
),
@ -517,15 +475,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: LakumTermsConditions(
this.identificationNo,
this.firstName,
this.lastName,
this.mobileNo,
this.languageId)));
Navigator.push(context, FadePage(page: LakumTermsConditions(this.identificationNo, this.firstName, this.lastName, this.mobileNo, this.languageId)));
},
child: Row(
children: <Widget>[
@ -540,8 +490,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 10,
),
Text(
TranslationBase.of(context)
.conditions,
TranslationBase.of(context).conditions,
style: TextStyle(
fontSize: 13.0,
),
@ -572,9 +521,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
children: <Widget>[
Text(
TranslationBase.of(context).reachUs,
style: TextStyle(
fontSize: 16.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 5,
@ -585,8 +532,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: LiveChatPage()));
Navigator.push(context, FadePage(page: LiveChatPage()));
},
child: Row(
children: <Widget>[
@ -614,8 +560,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: FindUsPage()));
Navigator.push(context, FadePage(page: FindUsPage()));
},
child: Row(
children: <Widget>[
@ -628,8 +573,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.ourLocations,
TranslationBase.of(context).ourLocations,
style: TextStyle(fontSize: 13.0),
),
],

10
pubspec.yaml
Unescape Escape View File

@ -16,7 +16,7 @@ dependencies:
sdk: flutter
intl: ^0.16.0
# web view
webview_flutter: ^0.3.24
webview_flutter: ^1.0.7
# http client
http: ^0.12.1
connectivity: ^0.4.9+3
@ -40,7 +40,7 @@ dependencies:
device_info: ^0.4.2+4
# Flutter Html View
flutter_html: 1.0.2
flutter_html: ^1.2.0
# Native
flutter_device_type: ^0.2.0
@ -59,7 +59,7 @@ dependencies:
# Icons
font_awesome_flutter: any
cupertino_icons: ^0.1.3
cupertino_icons: ^1.0.0
# Image Attachments
image_picker: ^0.6.7+1
@ -97,7 +97,7 @@ dependencies:
syncfusion_flutter_calendar: ^18.4.49
# SVG Images
flutter_svg: ^0.18.0
flutter_svg: ^0.19.0
#Calendar Events
manage_calendar_events: ^1.0.2
@ -147,7 +147,7 @@ dependencies:
#Dependencies for video call implementation
native_device_orientation: ^0.3.0
enum_to_string: ^1.0.9
wakelock: ^0.1.4
wakelock: ^0.2.1+1
after_layout: ^1.0.7
twilio_programmable_video: ^0.6.2
cached_network_image: ^2.4.1

Write Preview
Loading…
Cancel
Save