From 91e5a20fd026676cd16286ffd3599853dc9952a6 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 1 Sep 2020 12:46:26 +0300 Subject: [PATCH] fix merge issues --- lib/config/config.dart | 2 ++ lib/config/localized_values.dart | 2 -- lib/pages/landing/home_page.dart | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index e9ee7893..91cc2eda 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -60,6 +60,8 @@ const IS_LAST_APPOITMENT_RATED = const GET_APPOINTMENT_DETAILS_BY_NO = 'Services/MobileNotifications.svc/REST/GetAppointmentDetailsByApptNo'; +const GET_QR_PARKING = '/Services/SWP.svc/REST/GetQRParkingByID'; + //const BASE_URL = 'https://hmgwebservices.com/'; // Production Environment //const BASE_URL = 'https://hmgwebservices.com/Services'; // Production Environment //const BASE_URL = 'https://uat.hmgwebservices.com/Services'; // UAT Environment diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 4913f610..6d2cff69 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -373,7 +373,5 @@ const Map> localizedValues = { "building":{"en":"Building:","ar":"المبنى"}, "branch":{"en":"Branch:","ar":"الفرع"}, "emergencyServices":{"en":"Emergency Services:","ar":"خدمات الطوارئ"}, - - "logs": {"en": "Logs", "ar": "السجلات"}, "textToSpeech": {"en": "How May I Help You?", "ar": "كيف يمكنني مساعدتك؟"} }; diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index fd125475..06a2f9ca 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -374,7 +374,7 @@ class _HomePageState extends State { ), ), ), - height: 150, + height: MediaQuery.of(context).size.width*0.4, imageName: 'home_healthcare_service_bg.png', opacity: 0.5, ), @@ -403,7 +403,7 @@ class _HomePageState extends State { ), ), ), - height: 150, + height: MediaQuery.of(context).size.width*0.4, imageName: 'al-habib_onlne_pharmacy_bg.png', ), DashboardItem( @@ -431,7 +431,7 @@ class _HomePageState extends State { ), ), ), - height: 150, + height: MediaQuery.of(context).size.width*0.4, color: Hexcolor("#747C80"), imageName: 'emergency_service_image.png', ), @@ -472,7 +472,7 @@ class _HomePageState extends State { ), ), ), - height: 150, + height: MediaQuery.of(context).size.width*0.4, decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.0), color: Colors.white, @@ -505,7 +505,7 @@ class _HomePageState extends State { ), ), width: MediaQuery.of(context).size.width * 0.29, - height: 150, + height: MediaQuery.of(context).size.width*0.4, decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.0), color: Colors.white, @@ -536,7 +536,7 @@ class _HomePageState extends State { ), ), ), - height: 150, + height: MediaQuery.of(context).size.width*0.4, decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.0), color: Colors.white,