diff --git a/assets/images/new/Comprehensive checkup.svg b/assets/images/new/Comprehensive checkup.svg
new file mode 100644
index 00000000..b3f2feb1
--- /dev/null
+++ b/assets/images/new/Comprehensive checkup.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/new/Live Care.svg b/assets/images/new/Live Care.svg
new file mode 100644
index 00000000..b5a367d7
--- /dev/null
+++ b/assets/images/new/Live Care.svg
@@ -0,0 +1,11 @@
+
diff --git a/assets/images/new/blood donation.svg b/assets/images/new/blood donation.svg
new file mode 100644
index 00000000..95d0904f
--- /dev/null
+++ b/assets/images/new/blood donation.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/new/book appointment.svg b/assets/images/new/book appointment.svg
new file mode 100644
index 00000000..590ea8de
--- /dev/null
+++ b/assets/images/new/book appointment.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/new/child vaccines.svg b/assets/images/new/child vaccines.svg
new file mode 100644
index 00000000..d3f38a5e
--- /dev/null
+++ b/assets/images/new/child vaccines.svg
@@ -0,0 +1,89 @@
+
diff --git a/assets/images/new/covid drive thru.svg b/assets/images/new/covid drive thru.svg
new file mode 100644
index 00000000..563de151
--- /dev/null
+++ b/assets/images/new/covid drive thru.svg
@@ -0,0 +1,20 @@
+
diff --git a/assets/images/new/health calculator.svg b/assets/images/new/health calculator.svg
new file mode 100644
index 00000000..ac73e868
--- /dev/null
+++ b/assets/images/new/health calculator.svg
@@ -0,0 +1,15 @@
+
diff --git a/assets/images/new/health converter.svg b/assets/images/new/health converter.svg
new file mode 100644
index 00000000..961adc51
--- /dev/null
+++ b/assets/images/new/health converter.svg
@@ -0,0 +1,14 @@
+
diff --git a/assets/images/new/latest news.svg b/assets/images/new/latest news.svg
new file mode 100644
index 00000000..5b9cd805
--- /dev/null
+++ b/assets/images/new/latest news.svg
@@ -0,0 +1,17 @@
+
diff --git a/assets/images/new/medical file.svg b/assets/images/new/medical file.svg
new file mode 100644
index 00000000..0849b7a0
--- /dev/null
+++ b/assets/images/new/medical file.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/new/my family.svg b/assets/images/new/my family.svg
new file mode 100644
index 00000000..41d0b8a9
--- /dev/null
+++ b/assets/images/new/my family.svg
@@ -0,0 +1,47 @@
+
diff --git a/assets/images/new/parking details.svg b/assets/images/new/parking details.svg
new file mode 100644
index 00000000..dc25eb0e
--- /dev/null
+++ b/assets/images/new/parking details.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/new/reach us.svg b/assets/images/new/reach us.svg
new file mode 100644
index 00000000..b4634170
--- /dev/null
+++ b/assets/images/new/reach us.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/new/referral.svg b/assets/images/new/referral.svg
new file mode 100644
index 00000000..fb6b8591
--- /dev/null
+++ b/assets/images/new/referral.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/new/smart watch.svg b/assets/images/new/smart watch.svg
new file mode 100644
index 00000000..0667e31d
--- /dev/null
+++ b/assets/images/new/smart watch.svg
@@ -0,0 +1,12 @@
+
diff --git a/assets/images/new/todo.svg b/assets/images/new/todo.svg
new file mode 100644
index 00000000..be869c1d
--- /dev/null
+++ b/assets/images/new/todo.svg
@@ -0,0 +1,19 @@
+
diff --git a/assets/images/new/update insurance card.svg b/assets/images/new/update insurance card.svg
new file mode 100644
index 00000000..0139e27d
--- /dev/null
+++ b/assets/images/new/update insurance card.svg
@@ -0,0 +1,21 @@
+
diff --git a/assets/images/new/virtual tour.svg b/assets/images/new/virtual tour.svg
new file mode 100644
index 00000000..733f433e
--- /dev/null
+++ b/assets/images/new/virtual tour.svg
@@ -0,0 +1,9 @@
+
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 7e3ac75e..cb5a1ccd 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -1512,10 +1512,31 @@ const Map localizedValues = {
"modesBelow": {"en": "Please select the modes below:", "ar": ":الرجاء تحديد الأوضاع أدناه"},
"prefferedMode": {"en": "Please select the preferred mode below:", "ar": ":الرجاء تحديد الوضع المفضل أدناه"},
"permissionsBellow": {"en": "Please allow the permissions below:", "ar": ":الرجاء السماح الأذونات أدناه"},
-
"RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"},
"PatientInfo": {"en": "Patient Info", "ar": "معلومات المريض"},
"OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"},
- "inPrgress": { "en": "In Progress", "ar": "في تقدم" },
- "locked": { "en": "Locked", "ar": "مقفل" },
+ "inPrgress": {"en": "In Progress", "ar": "في تقدم"},
+ "locked": {"en": "Locked", "ar": "مقفل"},
+
+
+ "My_File_Details": {"en": "My File Details", "ar": "تفاصيل ملفي"},
+ "Ecommerce": {"en": "Ecommerce", "ar": "التجارة الإلكترونية"},
+ "Family_Files": {"en": "Family Files", "ar": "ملفات العائلة"},
+ "My_Child": {"en": "My Child", "ar": "طفلي"},
+ "Vaccines": {"en": "Vaccines", "ar": "اللقاحات"},
+ "Todo": {"en": "Todo", "ar": "لكى يفعل"},
+ "List": {"en": "List", "ar": "قائمة"},
+ "Blood": {"en": "Blood", "ar": "دم"},
+ "Donation": {"en": "Donation", "ar": "هبة"},
+ "Health": {"en": "Health", "ar": "الصحة"},
+ "Calculator": {"en": "Calculator", "ar": "آلة حاسبة"},
+ "Converter": {"en": "Converter", "ar": "محول"},
+ "Smart": {"en": "Smart", "ar": "ذكي"},
+ "Watches": {"en": "Watches", "ar": "ساعات"},
+ "Parking": {"en": "Parking", "ar": "موقف سيارات"},
+ "Details": {"en": "Details", "ar": "تفاصيل"},
+ "Virtual": {"en": "Virtual", "ar": "افتراضية"},
+ "News": {"en": "News", "ar": "أخبار"},
+ "Latest": {"en": "Latest", "ar": "أحدث"},
+ "Tour": {"en": "Tour", "ar": "رحلة"},
};
diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart
new file mode 100644
index 00000000..8feef0f5
--- /dev/null
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart
@@ -0,0 +1,251 @@
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/service/weather_service.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
+import 'package:diplomaticquarterapp/models/hmg_services.dart';
+import 'package:diplomaticquarterapp/pages/landing/widgets/services_view.dart';
+import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
+import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/location_util.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils_new.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
+import 'package:flutter/material.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:provider/provider.dart';
+
+import 'health-weather/health-weather-indicator.dart';
+
+class AllHabibMedicalSevicePage2 extends StatefulWidget {
+ @override
+ _AllHabibMedicalSevicePage2State createState() => _AllHabibMedicalSevicePage2State();
+}
+
+class _AllHabibMedicalSevicePage2State extends State {
+ List hmgServices = [];
+ LocationUtils locationUtils;
+ var weather = '--';
+ AppSharedPreferences sharedPref = AppSharedPreferences();
+ AuthenticatedUser authUser = new AuthenticatedUser();
+ AuthProvider authProvider = new AuthProvider();
+ WeatherService _weatherService = WeatherService();
+ double weatherNum = 30;
+
+ @override
+ void initState() {
+ // TODO: implement initState
+ super.initState();
+ WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+ locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
+ WidgetsBinding.instance.addPostFrameCallback((_) => {Geolocator.getLastKnownPosition().then((value) => setLocation(value))});
+ });
+ // getPatientAppointmentHistory1();
+ // getFamilyFiles();
+ }
+
+ initialiseHmgServices(bool isLogin) {
+ hmgServices.clear();
+
+ hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin));
+ hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/covid_test_drive_thru.svg", isLogin));
+ hmgServices.add(new HmgServices(2, TranslationBase.of(context).online, TranslationBase.of(context).payment, "assets/images/new/paymentMethods.png", isLogin));
+ hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin));
+ hmgServices.add(new HmgServices(4, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
+ hmgServices.add(new HmgServices(5, TranslationBase.of(context).emergency, TranslationBase.of(context).services2, "assets/images/new/emergency.svg", isLogin));
+ hmgServices.add(new HmgServices(6, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Referral.svg", isLogin));
+ hmgServices.add(new HmgServices(7, "H\u2082O", TranslationBase.of(context).dailyWater, "assets/images/new/h2o.svg", isLogin));
+ hmgServices.add(new HmgServices(8, TranslationBase.of(context).reachUs, TranslationBase.of(context).findUs, "assets/images/new/reach_us.svg", isLogin));
+
+ hmgServices.add(new HmgServices(9, TranslationBase.of(context).medicalFile, TranslationBase.of(context).My_File_Details, "assets/images/new/medical file.svg", isLogin));
+ hmgServices.add(new HmgServices(10, TranslationBase.of(context).book, TranslationBase.of(context).appointment, "assets/images/new/book appointment.svg", isLogin));
+ hmgServices.add(new HmgServices(11, TranslationBase.of(context).pharmacy, TranslationBase.of(context).Ecommerce, "assets/images/new/Pharmacy.svg", isLogin));
+ hmgServices.add(new HmgServices(12, TranslationBase.of(context).update, TranslationBase.of(context).insuranceCards, "assets/images/new/update insurance card.svg", isLogin));
+ hmgServices.add(new HmgServices(13, TranslationBase.of(context).myFamily, TranslationBase.of(context).Family_Files, "assets/images/new/my family.svg", isLogin));
+ hmgServices.add(new HmgServices(14, TranslationBase.of(context).My_Child, TranslationBase.of(context).Vaccines, "assets/images/new/child vaccines.svg", isLogin));
+ hmgServices.add(new HmgServices(15, TranslationBase.of(context).Todo, TranslationBase.of(context).list, "assets/images/new/todo.svg", isLogin));
+ hmgServices.add(new HmgServices(16, TranslationBase.of(context).Blood, TranslationBase.of(context).Donation, "assets/images/new/blood donation.svg", isLogin));
+ hmgServices.add(new HmgServices(17, TranslationBase.of(context).Health, TranslationBase.of(context).Calculator, "assets/images/new/health calculator.svg", isLogin));
+ hmgServices.add(new HmgServices(18, TranslationBase.of(context).Health, TranslationBase.of(context).Converter, "assets/images/new/health converter.svg", isLogin));
+ hmgServices.add(new HmgServices(19, TranslationBase.of(context).Smart, TranslationBase.of(context).Watches, "assets/images/new/smart watch.svg", isLogin));
+ hmgServices.add(new HmgServices(20, TranslationBase.of(context).Parking, TranslationBase.of(context).Details, "assets/images/new/parking details.svg", isLogin));
+ hmgServices.add(new HmgServices(21, TranslationBase.of(context).Virtual, TranslationBase.of(context).Tour, "assets/images/new/virtual tour.svg", isLogin));
+ hmgServices.add(new HmgServices(22, TranslationBase.of(context).News, TranslationBase.of(context).Latest, "assets/images/new/latest news.svg", isLogin));
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ ProjectViewModel projectViewModel = Provider.of(context);
+ initialiseHmgServices(false);
+ return AppScaffold(
+ isShowAppBar: true,
+ isShowDecPage: false,
+ showNewAppBar: true,
+ showNewAppBarTitle: true,
+ appBarTitle: TranslationBase.of(context).alhabiServices,
+ body: Container(
+ width: double.infinity,
+ height: double.infinity,
+ child: SingleChildScrollView(
+ child: Column(
+ children: [
+ AspectRatio(
+ aspectRatio: 1.8,
+ child: Container(
+ width: double.infinity,
+ height: double.infinity,
+ decoration: containerRadiusWithGradient(0,
+ color1: timeCalculator(6, 0, 10, 59)
+ ? Color(0xFFB3E3FE)
+ : timeCalculator(11, 0, 15, 59)
+ ? Color(0xFFFF9E7E)
+ : Color(0xFF2E6686),
+ color2: timeCalculator(6, 0, 10, 59)
+ ? Color(0xFF9AC7FF)
+ : timeCalculator(11, 0, 15, 59)
+ ? Color(0xFFFECB50)
+ : Color(0xFF122F48)),
+ child: Padding(
+ padding: const EdgeInsets.all(30.0),
+ child: Stack(
+ alignment: projectViewModel.isArabic ? Alignment.centerLeft : Alignment.centerRight,
+ children: [
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ weather,
+ style: TextStyle(
+ fontSize: 30,
+ letterSpacing: -0.83,
+ fontWeight: FontWeight.bold,
+ color: Colors.white,
+ ),
+ ),
+ Text(
+ DateUtil.formatDateToDate(new DateTime.now(), false),
+ style: TextStyle(
+ fontSize: 10,
+ letterSpacing: -0.60,
+ fontWeight: FontWeight.w600,
+ color: Colors.white,
+ ),
+ ),
+ mFlex(1),
+ Text(
+ TranslationBase.of(context).healthWeatherIndicators,
+ style: TextStyle(
+ fontSize: 16,
+ letterSpacing: -0.96,
+ fontWeight: FontWeight.bold,
+ color: Colors.white,
+ ),
+ ),
+ Text(
+ TranslationBase.of(context).healthTipsBasedOnCurrentWeather,
+ style: TextStyle(
+ fontSize: 12,
+ letterSpacing: -0.72,
+ fontWeight: FontWeight.w600,
+ color: Colors.white,
+ ),
+ ),
+ InkWell(
+ onTap: () {
+ Navigator.push(
+ context,
+ FadePage(
+ page: HealthWeatherIndicator(),
+ ),
+ );
+ },
+ child: Padding(
+ padding: const EdgeInsets.only(top: 8, bottom: 8),
+ child: Text(
+ TranslationBase.of(context).moreDetails,
+ style: TextStyle(fontSize: 12, letterSpacing: -0.72, fontWeight: FontWeight.w600, color: Colors.white, decoration: TextDecoration.underline),
+ ),
+ ),
+ )
+ ],
+ ),
+ Image.asset(
+ "assets/images/Weather_ico.png",
+ color: Colors.white.withOpacity(0.5),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ mHeight(16),
+ Padding(
+ padding: const EdgeInsets.only(
+ left: 16,
+ right: 16,
+ top: 0,
+ ),
+ child: GridView.builder(
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
+ physics: NeverScrollableScrollPhysics(),
+ shrinkWrap: true,
+ itemCount: hmgServices.length,
+ padding: EdgeInsets.zero,
+ itemBuilder: (BuildContext context, int index) {
+ return ServicesView(hmgServices[index], index);
+ },
+ ),
+ ),
+ mHeight(16),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ bool timeCalculator(int startHour, int startMint, int endHour, int endMint) {
+ DateTime now = DateTime.now();
+ DateTime startDate = DateTime(now.year, now.month, now.day, startHour, startHour);
+ DateTime endDate = DateTime(now.year, now.month, now.day, endHour, endMint);
+ print(startDate.toString());
+ print(endDate.toString());
+ print(now);
+ print("------------");
+ if (startDate.isBefore(now) && endDate.isAfter(now))
+ return true;
+ else
+ return false;
+ }
+
+ void setLocation(Position position) {
+ this.sharedPref.setDouble(USER_LAT, position.latitude ?? 0.0);
+ this.sharedPref.setDouble(USER_LONG, position.longitude ?? 0.0);
+ getAuthUser();
+ }
+
+ getAuthUser() async {
+ if (await this.sharedPref.getObject(USER_PROFILE) != null) {
+ var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
+ setState(() {
+ authUser = data;
+ });
+ }
+ var data = await this.sharedPref.getObject(WEATHER);
+ if (data == null) {
+ var d = await _weatherService.getWeatherData();
+
+ print(d);
+ weatherNum = d.temperature;
+ setState(() {
+ weather = d != null ? d.temperature.toString() + '\u2103' : '--';
+ });
+ } else {
+ setState(() {
+ weather = data != null ? data['Temperature'].toString() + '\u2103' : '--';
+ });
+ }
+ }
+}
diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart
index c6807ebb..ffd38060 100644
--- a/lib/pages/landing/fragments/home_page_fragment2.dart
+++ b/lib/pages/landing/fragments/home_page_fragment2.dart
@@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/models/gradient_color.dart';
import 'package:diplomaticquarterapp/models/hmg_services.dart';
import 'package:diplomaticquarterapp/models/slider_data.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart';
import 'package:diplomaticquarterapp/pages/landing/widgets/logged_slider_view.dart';
import 'package:diplomaticquarterapp/pages/landing/widgets/services_view.dart';
import 'package:diplomaticquarterapp/pages/landing/widgets/slider_view.dart';
@@ -235,7 +236,7 @@ class _HomePageFragment2State extends State {
),
FlatButton(
onPressed: () {
- Navigator.push(context, FadePage(page: AllHabibMedicalService()));
+ Navigator.push(context, FadePage(page: AllHabibMedicalSevicePage2()));
},
child: Text(
TranslationBase.of(context).viewAllServices,
diff --git a/lib/pages/landing/widgets/services_view.dart b/lib/pages/landing/widgets/services_view.dart
index e083448c..f6be4937 100644
--- a/lib/pages/landing/widgets/services_view.dart
+++ b/lib/pages/landing/widgets/services_view.dart
@@ -1,24 +1,47 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:diplomaticquarterapp/config/size_config.dart';
+import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
+import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/hmg_services.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/%E2%80%8B%20health_calculators.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h2o_page.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_converter.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/my_web_view.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/parking_page.dart';
+import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
+import 'package:diplomaticquarterapp/pages/ChildVaccines/child_vaccines_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/contact_us_page.dart';
import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart';
+import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart';
import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart';
+import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
+import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart';
+import 'package:diplomaticquarterapp/pages/medical/smart_watch_health_data/smart_watch_instructions.dart';
import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
+import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../../../locator.dart';
+import '../landing_page.dart';
+import '../landing_page_pharmcy.dart';
class ServicesView extends StatelessWidget {
HmgServices hmgServices;
int index;
+ AuthenticatedUser authUser = new AuthenticatedUser();
+ AuthProvider authProvider = new AuthProvider();
+ PharmacyModuleViewModel pharmacyModuleViewModel = locator();
ServicesView(this.hmgServices, this.index);
@@ -46,6 +69,83 @@ class ServicesView extends StatelessWidget {
Navigator.push(context, FadePage(page: H2OPage()));
} else if (index == 8) {
Navigator.push(context, FadePage(page: ContactUsPage()));
+ } else if (index == 9) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: MedicalProfilePageNew(),
+ ),
+ );
+ } else if (index == 10) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: Search(),
+ ),
+ );
+ } else if (index == 11) {
+ getPharmacyToken(context);
+ } else if (index == 12) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: InsuranceUpdate(),
+ ),
+ );
+ } else if (index == 13) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: MyFamily(),
+ ),
+ );
+ } else if (index == 14) {
+ Navigator.push(
+ context,
+ FadePage(page: ChildVaccinesPage()),
+ );
+ } else if (index == 15) {
+ Navigator.pop(context);
+ LandingPage.shared.switchToDoFromHMGServices();
+ } else if (index == 16) {
+ Navigator.push(
+ context,
+ FadePage(page: BloodDonationPage()),
+ );
+ } else if (index == 17) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: (HealthCalculators()),
+ ),
+ );
+ } else if (index == 18) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: HealthConverter(),
+ ),
+ );
+ } else if (index == 19) {
+ Navigator.push(
+ context,
+ FadePage(page: SmartWatchInstructions()),
+ );
+ } else if (index == 20) {
+ Navigator.push(
+ context,
+ FadePage(
+ page: ParkingPage(),
+ ),
+ );
+ } else if (index == 21) {
+ launch("https://hmgwebservices.com/vt_mobile/html/index.html");
+ } else if (index == 22) {
+ Navigator.of(context).push(MaterialPageRoute(
+ builder: (BuildContext context) => MyWebView(
+ title: "HMG News",
+ selectedUrl: "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
+ ),),);
}
},
child: Container(
@@ -147,4 +247,23 @@ class ServicesView extends StatelessWidget {
),
);
}
+
+ getPharmacyToken(BuildContext context) async {
+ if (!authProvider.isLogin) {
+ Navigator.push(context, FadePage(page: LandingPagePharmacy()));
+ } else {
+ GifLoaderDialogUtils.showMyDialog(context);
+ await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
+ if (pharmacyModuleViewModel.error.isNotEmpty) {
+ await pharmacyModuleViewModel.createUser().then((value) {
+ GifLoaderDialogUtils.hideDialog(context);
+ Navigator.push(context, FadePage(page: LandingPagePharmacy()));
+ });
+ } else {
+ GifLoaderDialogUtils.hideDialog(context);
+ Navigator.push(context, FadePage(page: LandingPagePharmacy()));
+ }
+ });
+ }
+ }
}
diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart
index 0d60500e..8c20ea34 100644
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@@ -111,6 +111,7 @@ class TranslationBase {
String get appointmentCalendar => localizedValues['appointmentCalendar'][locale.languageCode];
String get appointmentReminder => localizedValues['appointmentReminder'][locale.languageCode];
+
String get prescriptionReminder => localizedValues['prescriptionReminder'][locale.languageCode];
String get pleaseSelectFromBelowOptions => localizedValues['please_select_from_below_options'][locale.languageCode];
@@ -2374,8 +2375,11 @@ class TranslationBase {
String get recAlert => localizedValues["recAlert"][locale.languageCode];
String get modesBelow => localizedValues["modesBelow"][locale.languageCode];
+
String get prefferedMode => localizedValues["prefferedMode"][locale.languageCode];
+
String get permissionsBellow => localizedValues["permissionsBellow"][locale.languageCode];
+
String get invoiceDetails => localizedValues["invoiceDetails"][locale.languageCode];
String get appoDetails => localizedValues["appoDetails"][locale.languageCode];
@@ -2387,10 +2391,54 @@ class TranslationBase {
String get enterComplainNumber => localizedValues["enterComplainNumber"][locale.languageCode];
String get RequesterInfo => localizedValues["RequesterInfo"][locale.languageCode];
+
String get PatientInfo => localizedValues["PatientInfo"][locale.languageCode];
+
String get OtherInfo => localizedValues["OtherInfo"][locale.languageCode];
+
String get inPrgress => localizedValues["inPrgress"][locale.languageCode];
+
String get locked => localizedValues["locked"][locale.languageCode];
+
+ String get My_File_Details => localizedValues["My_File_Details"][locale.languageCode];
+
+ String get Ecommerce => localizedValues["Ecommerce"][locale.languageCode];
+
+ String get Family_Files => localizedValues["Family_Files"][locale.languageCode];
+
+ String get My_Child => localizedValues["My_Child"][locale.languageCode];
+
+ String get Vaccines => localizedValues["Vaccines"][locale.languageCode];
+
+ String get Todo => localizedValues["Todo"][locale.languageCode];
+
+ String get list => localizedValues["List"][locale.languageCode];
+
+ String get Blood => localizedValues["Blood"][locale.languageCode];
+
+ String get Donation => localizedValues["Donation"][locale.languageCode];
+
+ String get Health => localizedValues["Health"][locale.languageCode];
+
+ String get Calculator => localizedValues["Calculator"][locale.languageCode];
+
+ String get Converter => localizedValues["Converter"][locale.languageCode];
+
+ String get Smart => localizedValues["Smart"][locale.languageCode];
+
+ String get Watches => localizedValues["Watches"][locale.languageCode];
+
+ String get Parking => localizedValues["Parking"][locale.languageCode];
+
+ String get Details => localizedValues["Details"][locale.languageCode];
+
+ String get Virtual => localizedValues["Virtual"][locale.languageCode];
+
+ String get News => localizedValues["News"][locale.languageCode];
+
+ String get Latest => localizedValues["Latest"][locale.languageCode];
+
+ String get Tour => localizedValues["Tour"][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate {
diff --git a/lib/uitl/utils_new.dart b/lib/uitl/utils_new.dart
index e9d70a1f..242f47ad 100644
--- a/lib/uitl/utils_new.dart
+++ b/lib/uitl/utils_new.dart
@@ -219,13 +219,13 @@ RoundedRectangleBorder buttonShape() {
);
}
-Decoration containerRadiusWithGradient(double radius) {
+Decoration containerRadiusWithGradient(double radius,{Color color1,Color color2}) {
return BoxDecoration(
borderRadius: BorderRadius.circular(radius),
gradient: LinearGradient(
colors: [
- Color(0xFFF71787E),
- Color(0xFFF2B353E),
+ color1?? Color(0xFFF71787E),
+ color2?? Color(0xFFF2B353E),
],
begin: Alignment.centerLeft,
end: Alignment.centerRight,