diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9640ea61..720330da 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -65,6 +65,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.google.firebase:firebase-messaging:20.1.0"
implementation 'pub.devrel:easypermissions:0.4.0'
+ implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
}
diff --git a/assets/images/pharmacy/check_icon.svg b/assets/images/pharmacy/check_icon.svg
new file mode 100644
index 00000000..cfa4f441
--- /dev/null
+++ b/assets/images/pharmacy/check_icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/pharmacy/contact_us_icon.svg b/assets/images/pharmacy/contact_us_icon.svg
new file mode 100644
index 00000000..fa591d47
--- /dev/null
+++ b/assets/images/pharmacy/contact_us_icon.svg
@@ -0,0 +1,10 @@
+
diff --git a/assets/images/pharmacy/delete_red_icon.svg b/assets/images/pharmacy/delete_red_icon.svg
new file mode 100644
index 00000000..8897a683
--- /dev/null
+++ b/assets/images/pharmacy/delete_red_icon.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/pharmacy/edit_icon.svg b/assets/images/pharmacy/edit_icon.svg
new file mode 100644
index 00000000..df7cca2f
--- /dev/null
+++ b/assets/images/pharmacy/edit_icon.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/pharmacy/lakum_icon.svg b/assets/images/pharmacy/lakum_icon.svg
new file mode 100644
index 00000000..e2b223de
--- /dev/null
+++ b/assets/images/pharmacy/lakum_icon.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/pharmacy/medication_refill_icon.svg b/assets/images/pharmacy/medication_refill_icon.svg
new file mode 100644
index 00000000..d5951130
--- /dev/null
+++ b/assets/images/pharmacy/medication_refill_icon.svg
@@ -0,0 +1,32 @@
+
diff --git a/assets/images/pharmacy/mobile_number_icon.svg b/assets/images/pharmacy/mobile_number_icon.svg
new file mode 100644
index 00000000..d98aaf29
--- /dev/null
+++ b/assets/images/pharmacy/mobile_number_icon.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/pharmacy/my_family_icon.svg b/assets/images/pharmacy/my_family_icon.svg
new file mode 100644
index 00000000..838b357e
--- /dev/null
+++ b/assets/images/pharmacy/my_family_icon.svg
@@ -0,0 +1,19 @@
+
diff --git a/assets/images/pharmacy/my_prescription_icon.svg b/assets/images/pharmacy/my_prescription_icon.svg
new file mode 100644
index 00000000..bda0e22e
--- /dev/null
+++ b/assets/images/pharmacy/my_prescription_icon.svg
@@ -0,0 +1,54 @@
+
diff --git a/assets/images/pharmacy/orders_icon.svg b/assets/images/pharmacy/orders_icon.svg
new file mode 100644
index 00000000..f09ae19d
--- /dev/null
+++ b/assets/images/pharmacy/orders_icon.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/pharmacy/our_locations_icon.svg b/assets/images/pharmacy/our_locations_icon.svg
new file mode 100644
index 00000000..2be16631
--- /dev/null
+++ b/assets/images/pharmacy/our_locations_icon.svg
@@ -0,0 +1,10 @@
+
diff --git a/assets/images/pharmacy/pill_reminder_icon.svg b/assets/images/pharmacy/pill_reminder_icon.svg
new file mode 100644
index 00000000..f4fb4ddc
--- /dev/null
+++ b/assets/images/pharmacy/pill_reminder_icon.svg
@@ -0,0 +1,49 @@
+
diff --git a/assets/images/pharmacy/review_icon.svg b/assets/images/pharmacy/review_icon.svg
new file mode 100644
index 00000000..bb826f21
--- /dev/null
+++ b/assets/images/pharmacy/review_icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/pharmacy/shipping_addresses_icon.svg b/assets/images/pharmacy/shipping_addresses_icon.svg
new file mode 100644
index 00000000..ebb8692f
--- /dev/null
+++ b/assets/images/pharmacy/shipping_addresses_icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/pharmacy/success_check_icon.svg b/assets/images/pharmacy/success_check_icon.svg
new file mode 100644
index 00000000..ed1379b8
--- /dev/null
+++ b/assets/images/pharmacy/success_check_icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/pharmacy/user_icon.svg b/assets/images/pharmacy/user_icon.svg
new file mode 100644
index 00000000..8e978105
--- /dev/null
+++ b/assets/images/pharmacy/user_icon.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/pharmacy/wishklist_icon.svg b/assets/images/pharmacy/wishklist_icon.svg
new file mode 100644
index 00000000..cd0ce16d
--- /dev/null
+++ b/assets/images/pharmacy/wishklist_icon.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/pharmacy/wishlist_icon.svg b/assets/images/pharmacy/wishlist_icon.svg
new file mode 100644
index 00000000..910a3ab8
--- /dev/null
+++ b/assets/images/pharmacy/wishlist_icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 81f8a3d4..9affe647 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -547,47 +547,79 @@ const Map> localizedValues = {
"en": "Please enter the verification code send to",
"ar": "الرجاء إدخال رمز التحقق المرسل إلى"
},
- "EyeMeasurements":{"en":"Eye Measurements","ar":"قياسات النظر"},
- "Measurements":{"en":"Measurements","ar":"قياسات"},
- "Classes":{"en":"Classes","ar":"نظارات"},
- "ContactLens":{"en":"Contact Lens","ar":"العدسات اللاصقة"},
- "RightEye":{"en":"Right Eye","ar":"العين اليمين"},
- "Sphere":{"en":"Sphere","ar":"القوة"},
- "Cylinder":{"en":"Cylinder","ar":"الدائرية"},
- "Axis":{"en":"Axis","ar":"المحاور"},
- "Prism":{"en":"Prism","ar":"موشور"},
- "VA":{"en":"Prism","ar":"المحاور"},
- "LeftEye":{"en":"Left Eye","ar":"العين اليسرى"},
- "Brand":{"en":"Brand","ar":"النوع"},
- "Power":{"en":"Power","ar":"القوة"},
- "Diameter":{"en":"Diameter","ar":"القطر"},
- "Remarks":{"en":"Remarks","ar":"ملاحضات"},
- "ActiveMedications":{"en":"Active Medications","ar":"ادويتي النشطة"},
- "ExpDate":{"en":"Active Exp Date :","VA":"تاريخ الإنتهاء"},
- "Route":{"en":"Route :","ar":"الطريقة"},
- "Frequency":{"en":"Frequency :","ar":"المعدل"},
- "DailyQuantity":{"en":"Daily Quantity :","ar":"جرعات يومية"},
- "AddReminder":{"en":"Add Reminder","ar":"إضافة تذكير"},
- "reminderDes":{"en":"Please select treatment start day and time to be notified when it\'s time to take the medicine","ar":" يرجى تحديد يوم بدء العلاج والوقت ليتم ارسال تنبيه عندما يحين الوقت لتناول الدواء"},
- "StartDay":{"en":"Start Day","ar":"يوم البداية"},
- "EndDay":{"en":"End Day","ar":"يوم الانتهاء"},
- "Days":{"en":"Days ","ar":"أيام"},
- "ScheduleTime":{"en":"Schedule time","ar":"الجدول الزمني"},
- "AskDoctor":{"en":"Ask Doctor","ar":"اسأل طبيبك"},
- "DoctorResponses":{"en":"Doctor Responses","ar":"ردود الأطباء"},
- "New":{"en":"New","ar":"جديد"},
- "All":{"en":"All","ar":"الكل"},
- "QuestionHere":{"en":"Enter the question here...","ar":"اضف الاستفسار هنا"},
- "ViewDoctorResponses":{"en":"View Doctor Responses","ar":"الاطلاع على ردود الأطباء"},
- "ServiceInformationButton":{"en":"LOGIN / REGISTER","ar":"دخول / تسجيل"},
- "ServiceInformationTitle":{"en":"Service Information","ar":"معلومات الخدمة"},
+ "EyeMeasurements": {"en": "Eye Measurements", "ar": "قياسات النظر"},
+ "Measurements": {"en": "Measurements", "ar": "قياسات"},
+ "Classes": {"en": "Classes", "ar": "نظارات"},
+ "ContactLens": {"en": "Contact Lens", "ar": "العدسات اللاصقة"},
+ "RightEye": {"en": "Right Eye", "ar": "العين اليمين"},
+ "Sphere": {"en": "Sphere", "ar": "القوة"},
+ "Cylinder": {"en": "Cylinder", "ar": "الدائرية"},
+ "Axis": {"en": "Axis", "ar": "المحاور"},
+ "Prism": {"en": "Prism", "ar": "موشور"},
+ "VA": {"en": "Prism", "ar": "المحاور"},
+ "LeftEye": {"en": "Left Eye", "ar": "العين اليسرى"},
+ "Brand": {"en": "Brand", "ar": "النوع"},
+ "Power": {"en": "Power", "ar": "القوة"},
+ "Diameter": {"en": "Diameter", "ar": "القطر"},
+ "Remarks": {"en": "Remarks", "ar": "ملاحضات"},
+ "ActiveMedications": {"en": "Active Medications", "ar": "ادويتي النشطة"},
+ "ExpDate": {"en": "Active Exp Date :", "VA": "تاريخ الإنتهاء"},
+ "Route": {"en": "Route :", "ar": "الطريقة"},
+ "Frequency": {"en": "Frequency :", "ar": "المعدل"},
+ "DailyQuantity": {"en": "Daily Quantity :", "ar": "جرعات يومية"},
+ "AddReminder": {"en": "Add Reminder", "ar": "إضافة تذكير"},
+ "reminderDes": {
+ "en":
+ "Please select treatment start day and time to be notified when it\'s time to take the medicine",
+ "ar":
+ " يرجى تحديد يوم بدء العلاج والوقت ليتم ارسال تنبيه عندما يحين الوقت لتناول الدواء"
+ },
+ "StartDay": {"en": "Start Day", "ar": "يوم البداية"},
+ "EndDay": {"en": "End Day", "ar": "يوم الانتهاء"},
+ "Days": {"en": "Days ", "ar": "أيام"},
+ "ScheduleTime": {"en": "Schedule time", "ar": "الجدول الزمني"},
+ "AskDoctor": {"en": "Ask Doctor", "ar": "اسأل طبيبك"},
+ "DoctorResponses": {"en": "Doctor Responses", "ar": "ردود الأطباء"},
+ "New": {"en": "New", "ar": "جديد"},
+ "All": {"en": "All", "ar": "الكل"},
+ "QuestionHere": {
+ "en": "Enter the question here...",
+ "ar": "اضف الاستفسار هنا"
+ },
+ "ViewDoctorResponses": {
+ "en": "View Doctor Responses",
+ "ar": "الاطلاع على ردود الأطباء"
+ },
+ "ServiceInformationButton": {"en": "LOGIN / REGISTER", "ar": "دخول / تسجيل"},
+ "ServiceInformationTitle": {
+ "en": "Service Information",
+ "ar": "معلومات الخدمة"
+ },
"info-lab": {
- "en": "This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.",
- "ar": "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية."
+ "en":
+ "This service allows you to view the results of all laboratory tests performed in Al Habib Medical Group as well as sending the report via e-mail.",
+ "ar":
+ "خدمة نتائج المختبر: هذه الخدمة تمكنك من الاطلاع على نتائج جميع الفحوصات المخبرية التي تمت في مجموعة الحبيب الطبية."
},
"info-radiology": {
- "en": "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.",
- "ar": "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل."
- },
-
+ "en":
+ "This service allows you to view the reports and photos of radiology in Al Habib Medical Group as well as send the report by e-mail.",
+ "ar":
+ "خدمة الاشعة: هذه الخدمة تمكنك من الاطلاع على تقارير وصور الاشعة التي تمت في مجموعة الحبيب الطبية وكذلك ارسال التقرير عن طريق الايميل."
+ },
+ "orders": {"en": "Orders", "ar": "الطلبات"},
+ "lakum": {"en": "Lakum", "ar": "لكم"},
+ "wishlist": {"en": "Wishlist", "ar": "الرغبات"},
+ "reviews": {"en": "Reviews", "ar": "التقيمات"},
+ "myPrescriptions": {"en": "My Prescriptions", "ar": "وصفاتي"},
+ "medicationRefill": {"en": "Medication Refill", "ar": "تعبئة الأدوية"},
+ "pillReminder": {"en": "Pill Reminder", "ar": "تذكير الأدويه"},
+ "shippingAddresses": {"en": "Shipping Addresses", "ar": "عناوين الشحن"},
+ "reachUs": {"en": "Reach Us", "ar": "الوصول لنا"},
+ "ourLocations": {"en": "Our Locations", "ar": "مواقعنا"},
+ "changeAddress": {"en": "Change Address", "ar": "تغيير العنوان"},
+ "edit": {"en": "Edit", "ar": "تعديل"},
+ "delete": {"en": "Delete", "ar": " حذف"},
+ "addAddress": {"en": "ADD A NEW ADDRESS", "ar": " اضافة عنوان جديد"},
+ "addNewAddress": {"en": "Add New Address", "ar": " اضافة عنوان جديد"},
};
diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart
index 292006d0..d5493d99 100644
--- a/lib/pages/landing/home_page.dart
+++ b/lib/pages/landing/home_page.dart
@@ -9,6 +9,8 @@ import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/wishlist.dart';
+import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart';
+import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
@@ -96,7 +98,9 @@ class _HomePageState extends State {
children: [
Container(
margin: EdgeInsets.only(
- top: 15.0, left: 3.5, right: 3.5),
+ top: 15.0,
+ left: 3.5,
+ right: 3.5),
// child: SvgPicture.asset(
// 'assets/images/new-design/covid-19-car.svg',
// width: 45.0,
@@ -469,6 +473,8 @@ class _HomePageState extends State {
opacity: 0.5,
),
DashboardItem(
+ onTap: () => Navigator.push(
+ context, FadePage(page: PharmacyAddressesPage())),
child: Center(
child: Padding(
padding: const EdgeInsets.all(15.0),
@@ -495,8 +501,9 @@ class _HomePageState extends State {
),
height: MediaQuery.of(context).size.width * 0.4,
imageName: 'al-habib_onlne_pharmacy_bg.png',
- onTap: (){
- Navigator.push(context, FadePage(page: WishlistPage()));
+ onTap: () {
+ Navigator.push(
+ context, FadePage(page: WishlistPage()));
},
),
DashboardItem(
diff --git a/lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart b/lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
new file mode 100644
index 00000000..ac4bfb35
--- /dev/null
+++ b/lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
@@ -0,0 +1,57 @@
+import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_html/style.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+
+class AddAddressPage extends StatefulWidget {
+ @override
+ _AddAddressState createState() => _AddAddressState();
+}
+
+class _AddAddressState extends State {
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: AppBar(
+ centerTitle: true,
+ title: Text(TranslationBase.of(context).addNewAddress, style: TextStyle(color:Colors.white)),
+ backgroundColor: Colors.green,
+ ),
+ body: Container(
+ child: Column(
+ children: [
+ Container(
+
+ ),
+ Container(
+ height: 50.0,
+ width: 400.0,
+ color: Colors.transparent,
+ child: Container(
+ decoration: BoxDecoration(
+ border: Border.all(
+ color: Colors.green,
+ style: BorderStyle.solid,
+ width: 1.0
+ ),
+ color: Colors.green,
+ borderRadius: BorderRadius.circular(10.0)
+ ),
+ child: Center(
+ child: Text(
+ TranslationBase.of(context).save,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 20.0,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }}
\ No newline at end of file
diff --git a/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
new file mode 100644
index 00000000..122fd0da
--- /dev/null
+++ b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
@@ -0,0 +1,269 @@
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/AddAddress.dart';
+
+
+class PharmacyAddressesPage extends StatefulWidget{
+ @override
+ _PharmacyAddressesState createState() => _PharmacyAddressesState();
+ }
+
+class _PharmacyAddressesState extends State{
+
+ int selectedRadio;
+ bool _value = false;
+ @override
+ void initState(){
+ super.initState();
+ selectedRadio=0;
+ }
+ setSelectedRadio(int val){
+ setState(() {
+ selectedRadio = val;
+ });
+ }
+
+ Widget build (BuildContext context){
+ return Scaffold(
+ appBar: AppBar(
+ centerTitle: true,
+ title: Text(TranslationBase.of(context).changeAddress, style: TextStyle(color:Colors.white)),
+ backgroundColor: Colors.green,
+ ),
+ body: Container(
+ child:SingleChildScrollView(
+ child: Column(
+ children:[
+ ListView.builder(
+ scrollDirection: Axis.vertical,
+ shrinkWrap: true,
+ physics: ScrollPhysics(),
+ itemCount: 2 ,
+ itemBuilder: (context, index){
+ return Container(
+ child: Padding(
+ padding:EdgeInsets.only(top:20.0, left:5.0, right:5.0, bottom:5.0,),
+ child: Column(
+ children: [
+ Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ InkWell(
+ onTap: () {
+ setState(() {
+ _value = !_value;
+ });
+ },
+ child: Container(
+ margin: EdgeInsets.only(right: 20),
+
+ child: Padding(
+ padding: const EdgeInsets.all(5.0),
+ child: _value
+ ? Container(
+ child: SvgPicture.asset(
+ 'assets/images/pharmacy/check_icon.svg',
+ height: 25,
+ width: 25,),
+ )
+ : Container(
+ child: SvgPicture.asset(
+ 'assets/images/pharmacy/check_icon.svg',
+ height: 23,
+ width: 23,
+ color: Colors.transparent,
+ ),
+ decoration: BoxDecoration(
+ border: Border.all(
+ color: Colors.grey,
+ style: BorderStyle.solid,
+ width: 1.0
+ ),
+ color: Colors.transparent,
+ borderRadius: BorderRadius.circular(50.0)
+ ),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text('NAME',
+ style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold,
+ ),
+ ),
+ SizedBox(
+ height: 5,),
+ Text('Address',
+ style: TextStyle(fontSize: 15.0, color: Colors.grey,
+ ),
+ ),
+ SizedBox(
+ height: 5,),
+ Row(
+ children: [
+ Container(
+ margin: EdgeInsets.only(bottom: 8),
+ child: SvgPicture.asset(
+ 'assets/images/pharmacy/mobile_number_icon.svg',
+ height: 13,),
+ ),
+ Container(
+ margin: EdgeInsets.only(left: 10, bottom: 8),
+ child: Text('588888778',
+ style: TextStyle(fontSize: 15.0,
+ ),
+ ),
+ ),
+ ],
+ ),
+ SizedBox(
+ height: 15,),
+ Row(
+ children: [
+ Column(
+ children: [
+ InkWell(
+ onTap: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(builder: (context) {
+ return AddAddressPage();
+ }),
+ );
+ },
+ child: Row(
+ children: [
+ Container(
+ margin: EdgeInsets.only(right:10, bottom: 15),
+ child: SvgPicture.asset(
+ 'assets/images/pharmacy/edit_icon.svg',
+ height: 15,),
+ ),
+ Container(
+ margin: EdgeInsets.only(right:5, bottom: 15),
+ padding: EdgeInsets.only(right: 10.0),
+ child: Text(TranslationBase.of(context).edit,
+ style: TextStyle(fontSize: 15.0,
+ color: Colors.blue,
+ ),
+ ),
+ decoration: BoxDecoration(
+ border: Border(
+ right: BorderSide(
+ color: Colors.grey,
+ width: 1.0,
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ Column(
+ children: [
+ InkWell(
+ child: Row(
+ children: [
+ Container(
+ margin: EdgeInsets.only(left: 15, right: 10, bottom: 15),
+ child: SvgPicture.asset(
+ 'assets/images/pharmacy/delete_red_icon.svg',
+ height: 15,),
+ ),
+ Container(
+ margin: EdgeInsets.only(bottom: 15),
+ child: Text(TranslationBase.of(context).delete,
+ style: TextStyle(fontSize: 15.0,
+ color: Colors.redAccent,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ )
+ ],
+ ),
+ ],
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ ],
+ ),
+ Divider(
+ color: Colors.grey[350],
+ height: 20,
+ thickness: 6,
+ indent: 0,
+ endIndent: 0,
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ InkWell(
+ onTap: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(builder: (context) {
+ return AddAddressPage();
+ }),
+ );
+ },
+ child: Container(
+ height: 50.0,
+ color: Colors.transparent,
+ child: Container(
+ decoration: BoxDecoration(
+ border: Border.all(
+ color: Colors.green,
+ style: BorderStyle.solid,
+ width: 1.0
+ ),
+ color: Colors.transparent,
+ borderRadius: BorderRadius.circular(5.0)
+ ),
+ child: Center(
+ child: Text(
+ TranslationBase.of(context).addAddress,
+ style: TextStyle(
+ color: Colors.green,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+}
+
+
+
+
+
diff --git a/lib/pages/pharmacy/profile.dart b/lib/pages/pharmacy/profile.dart
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/pages/pharmacy/profile/profile.dart b/lib/pages/pharmacy/profile/profile.dart
new file mode 100644
index 00000000..272ef0d4
--- /dev/null
+++ b/lib/pages/pharmacy/profile/profile.dart
@@ -0,0 +1,384 @@
+import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+
+class PharmacyProfilePage extends StatefulWidget {
+ @override
+ _ProfilePageState createState() => _ProfilePageState();
+}
+
+class _ProfilePageState extends State {
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: AppBar(
+ centerTitle: true,
+ title: Text(TranslationBase.of(context).myAccount, style: TextStyle(color:Colors.white)),
+ backgroundColor: Colors.green,
+ ),
+ body: Container(
+ child:SingleChildScrollView(
+ child: Column(
+ children:[
+ Container(
+ child:Row(
+ children: [
+ Container(
+ padding:EdgeInsets.only(top:20.0, left:10.0, right:10.0, bottom:10.0,),
+ child: LargeAvatar(name: "profile", url:'' ,),
+ ),
+ Container(
+ child: Column(
+ children: [
+ Text(
+ TranslationBase.of(context).welcome,
+ style: TextStyle(fontSize: 14.0,
+ fontWeight: FontWeight.bold,
+ color:Colors.grey
+ ),
+ ),
+ Text(
+ 'NAME',
+ style: TextStyle(
+ fontSize: 16.0,
+ fontWeight: FontWeight.bold
+ ),
+ ),
+ ],
+ ),
+ )
+ ],
+ ),
+ ),
+ Divider(
+ color: Colors.grey[350],
+ height: 20,
+ thickness: 5,
+ indent: 0,
+ endIndent: 0,
+ ),
+ SizedBox(
+ height: 15,
+ ),
+ Container(
+ child:Row(
+ children: [
+ Expanded(
+ child: InkWell(
+ child: Column(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/orders_icon.svg',
+ width: 50,
+ height: 50,),
+ SizedBox(
+ height: 5,
+ ),
+ Text(
+ TranslationBase.of(context).orders,
+ style: TextStyle(fontSize: 13.0,
+ fontWeight: FontWeight.bold,),
+ ),
+ ],
+ ),
+ ),
+ ),
+ Expanded(
+ child: InkWell(
+ child: Column(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/lakum_icon.svg',
+ width: 50,
+ height: 50,),
+ SizedBox(
+ height: 5,
+ ),
+ Text(
+ TranslationBase.of(context).lakum,
+ style: TextStyle(fontSize: 13.0,
+ fontWeight: FontWeight.bold
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ Expanded(
+ child: InkWell(
+ child: Column(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/wishlist_icon.svg',
+ width: 50,
+ height: 50,),
+ SizedBox(
+ height: 5,
+ ),
+ Text(
+ TranslationBase.of(context).wishlist,
+ style: TextStyle(fontSize: 13.0,
+ fontWeight: FontWeight.bold,),
+ ),
+ ],
+ ),
+ ),
+ ),
+ Expanded(
+ child: InkWell(
+ child: Column(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/review_icon.svg',
+ width: 50,
+ height: 50,),
+ SizedBox(
+ height: 5,
+ ),
+ Text(
+ TranslationBase.of(context).reviews,
+ style: TextStyle(fontSize: 13.0,
+ fontWeight: FontWeight.bold,),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ],
+ )
+ ),
+ SizedBox(
+ height: 15,
+ ),
+ Divider(
+ color: Colors.grey[350],
+ height: 20,
+ thickness: 5,
+ indent: 0,
+ endIndent: 0,
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ Container(
+ padding: EdgeInsets.only(left: 10.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ TranslationBase.of(context).myAccount,
+ style: TextStyle(
+ fontSize: 16.0,
+ fontWeight: FontWeight.bold
+ ),
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ Divider(
+ color: Colors.grey,
+ height: 20,
+ ),
+ InkWell(
+ child: Row(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/my_prescription_icon.svg',
+ width: 28,
+ height: 28,),
+ SizedBox(
+ width: 15,
+ ),
+ Text(TranslationBase.of(context).myPrescriptions,
+ style: TextStyle(fontSize: 13.0,
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 5,
+ ),
+ Divider(
+ color: Colors.grey,
+ height: 20,
+ ),
+ InkWell(
+ child: Row(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/medication_refill_icon.svg',
+ width: 28,
+ height: 28,),
+ SizedBox(
+ width: 15,
+ ),
+ Text(TranslationBase.of(context).medicationRefill,
+ style: TextStyle(fontSize: 13.0,
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 5,
+ ),
+ Divider(
+ color: Colors.grey,
+ height: 20,
+ ),
+ InkWell(
+ child: Row(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/pill_reminder_icon.svg',
+ width: 30,
+ height: 30,),
+ SizedBox(
+ width: 20,
+ ),
+ Text(TranslationBase.of(context).pillReminder,
+ style: TextStyle(fontSize: 13.0,
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 5,
+ ),
+ Divider(
+ color: Colors.grey,
+ height: 20,
+ ),
+ InkWell(
+ child: Row(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/my_family_icon.svg',
+ width: 20,
+ height: 20,),
+ SizedBox(
+ width: 20,
+ ),
+ Text(TranslationBase.of(context).family,
+ style: TextStyle(fontSize: 13.0,
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 5,
+ ),
+ Divider(
+ color: Colors.grey,
+ height: 20,
+ ),
+ InkWell(
+ child: Row(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/shipping_addresses_icon.svg',
+ width: 30,
+ height: 30,),
+ SizedBox(
+ width: 20,
+ ),
+ Text(TranslationBase.of(context).shippingAddresses,
+ style: TextStyle(fontSize: 13.0,
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ Divider(
+ color: Colors.grey[350],
+ height: 20,
+ thickness: 5,
+ indent: 0,
+ endIndent: 0,
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ Container(
+ padding: EdgeInsets.only(left: 10.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ TranslationBase.of(context).reachUs,
+ style: TextStyle(
+ fontSize: 16.0,
+ fontWeight: FontWeight.bold
+ ),
+ ),
+ SizedBox(
+ height: 5,
+ ),
+ Divider(
+ color: Colors.grey,
+ height: 20,
+ ),
+ InkWell(
+ child: Row(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/contact_us_icon.svg',
+ width: 20,
+ height: 20,),
+ SizedBox(
+ width: 20,
+ ),
+ Text(
+ TranslationBase.of(context).contactUs,
+ style: TextStyle(fontSize: 13.0),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 5,
+ ),
+ Divider(
+ color: Colors.grey,
+ height: 20,
+ ),
+ InkWell(
+ child: Row(
+ children: [
+ SvgPicture.asset(
+ 'assets/images/pharmacy/our_locations_icon.svg',
+ width: 30,
+ height: 30,),
+ SizedBox(
+ width: 20,
+ ),
+ Text(
+ TranslationBase.of(context).ourLocations,
+ style: TextStyle(fontSize: 13.0),
+ ),
+ ],
+ ),
+ )
+ ],
+ ),
+ )
+ ],
+ ),
+ ),
+ ),
+ );
+ }}
+
+
+
+
diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart
index 63f56674..26f7d93e 100644
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@@ -95,9 +95,11 @@ class TranslationBase {
String get confirm => localizedValues['confirm'][locale.languageCode];
- String get confirmLiveCare => localizedValues['confirmLiveCare'][locale.languageCode];
+ String get confirmLiveCare =>
+ localizedValues['confirmLiveCare'][locale.languageCode];
- String get waitingForDoctor => localizedValues['waitingForDoctor'][locale.languageCode];
+ String get waitingForDoctor =>
+ localizedValues['waitingForDoctor'][locale.languageCode];
String get confirmLater =>
localizedValues['confirmLater'][locale.languageCode];
@@ -677,10 +679,36 @@ class TranslationBase {
String get questionHere =>
localizedValues['QuestionHere'][locale.languageCode];
String get viewDoctorResponses =>
- localizedValues['ViewDoctorResponses'][locale.languageCode];String get serviceInformationButton => localizedValues['ServiceInformationButton'][locale.languageCode];
- String get serviceInformationTitle => localizedValues['ServiceInformationTitle'][locale.languageCode];
+ localizedValues['ViewDoctorResponses'][locale.languageCode];
+ String get serviceInformationButton =>
+ localizedValues['ServiceInformationButton'][locale.languageCode];
+ String get serviceInformationTitle =>
+ localizedValues['ServiceInformationTitle'][locale.languageCode];
String get infoLab => localizedValues['info-lab'][locale.languageCode];
- String get infoRadiology => localizedValues['info-radiology'][locale.languageCode];
+ String get infoRadiology =>
+ localizedValues['info-radiology'][locale.languageCode];
+ String get orders => localizedValues['orders'][locale.languageCode];
+ String get lakum => localizedValues['lakum'][locale.languageCode];
+ String get wishlist => localizedValues['wishlist'][locale.languageCode];
+ String get reviews => localizedValues['reviews'][locale.languageCode];
+ String get myPrescriptions =>
+ localizedValues['myPrescriptions'][locale.languageCode];
+ String get medicationRefill =>
+ localizedValues['medicationRefill'][locale.languageCode];
+ String get pillReminder =>
+ localizedValues['pillReminder'][locale.languageCode];
+ String get shippingAddresses =>
+ localizedValues['shippingAddresses'][locale.languageCode];
+ String get reachUs => localizedValues['reachUs'][locale.languageCode];
+ String get ourLocations =>
+ localizedValues['ourLocations'][locale.languageCode];
+ String get changeAddress =>
+ localizedValues['changeAddress'][locale.languageCode];
+ String get edit => localizedValues['edit'][locale.languageCode];
+ String get delete => localizedValues['delete'][locale.languageCode];
+ String get addAddress => localizedValues['addAddress'][locale.languageCode];
+ String get addNewAddress =>
+ localizedValues['addNewAddress'][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate {
diff --git a/pubspec.yaml b/pubspec.yaml
index 21a14bab..846a264c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -163,6 +163,7 @@ flutter:
# assets:
assets:
- assets/images/
+ - assets/images/pharmacy/
- assets/images/medical/
- assets/images/new-design/
- assets/images/login/