fix merge issues

merge-requests/34/head
Mohammad Aljammal 5 years ago
parent 54b766de81
commit 91e5a20fd0

@ -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

@ -373,7 +373,5 @@ const Map<String, Map<String, String>> 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": "كيف يمكنني مساعدتك؟"}
};

@ -374,7 +374,7 @@ class _HomePageState extends State<HomePage> {
),
),
),
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<HomePage> {
),
),
),
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<HomePage> {
),
),
),
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<HomePage> {
),
),
),
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<HomePage> {
),
),
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<HomePage> {
),
),
),
height: 150,
height: MediaQuery.of(context).size.width*0.4,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6.0),
color: Colors.white,

Loading…
Cancel
Save