From ea02622977beebb09a97106c2115e0a8f53f945a Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 9 Sep 2020 11:00:37 +0300 Subject: [PATCH] fix merge issues --- android/app/src/main/AndroidManifest.xml | 1 + assets/images/new-design/AM.PNG | Bin 0 -> 1554 bytes lib/config/localized_values.dart | 18 ------------------ 3 files changed, 1 insertion(+), 18 deletions(-) create mode 100644 assets/images/new-design/AM.PNG diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 30575eb9..884c7e09 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> + diff --git a/assets/images/new-design/AM.PNG b/assets/images/new-design/AM.PNG new file mode 100644 index 0000000000000000000000000000000000000000..212ca0b154ff8a2826dcc331cc1e4bed16185c93 GIT binary patch literal 1554 zcmV+t2JQKYP)$r1p>+9ah+gb-0jwQ2w; zxmI_rFit{<$BvJF0Kj&JA{lAJwO}7n0R|%l7>vXkhLmzArR*}qKFg4(a`<=_TNqNx zR0#1RggDIw1idol47^}@NW~HcR{RxO(wP>u;xtFpjPJB-bs*_pyp;S1DyZan$?@05L(4CTa1LOH#_%B7E^Dy02wj1fZn@onG=EBi4S#@pMQ z_M9kMQZ(L70C3a{93OEyVv;7gwrQF|UDr^SC7eztsH*DDO)ZMza=seSsq=@V?$LIK z=XPy-+}%jy?!uI`Q>ENhMb*o1tAW)8V!PdvzIZAa_~N#jXQ?hN8atoSx6j6CrD-aj zpLH4hzl9m*zV+GR^Hg{AH1PR%05HxzaT+MBs>I9 zPYOtRo!Agy%&P}%A@4u}jQRD@%p{V*IG@jV-c&Q@2)dKO-fYc^wm>z&Qg<-U= z%^*kB_hGbCr(v?Q6%1E4@ocAmQsTzt{pU5!q6=wt?`_u+!3z(Hd!*^WbcqEm7*H7k#5F_ zFPEavchV{*!2q*;m}aYx=P%Oe6|K%;fZOd?NxP?xa!>u?ldf*fsg1L#RD>gMn+o+t zd6@%o4#En?RmBby0%$dr8#|)h+le-W>T8z> localizedValues = { "locationa":{"en":"location:","ar":"الموقع"}, "ambulancerequest":{"en":"Ambulance :","ar":"طلب نقل "}, "requestA":{"en":"Request:","ar":"اسعاف"}, - "parking": {"en": "Parking", "ar": "مواقف"}, - "alhabiServices": {"en": "HMG Service", "ar": "خدمات الحبيب"}, - "parkingTitle": { - "en": - "Car service, car service, service to save parking information, return to it later, 1- By clicking on (Read the code), save the parking data. 2- By clicking on the button (view my car park), it shows you the car’s location in Google Maps. 3- Read another position by pressing the Clear Position Data button.", - "ar": - " خدمة المواقف، تتيح هذه الخدمة للمستخدم معلومات عن موقف السيارة ليسهل عليه العودة لها لاحقاً ، 1- بالضغط على زر(قراءة الكود) تستطيع حفظ البيانات الخاصة بالموقف. 2-بالضغط على زر(عرض موقف سيارتي) يعرض لك موقع السيارة في خرائط قوقل. 3- لإعادة قراءة موقف آخرعن طريق الضغط على زر(مسح بيانات الموقف). " - }, - "readBarcode": {"en": "Read Barcode", "ar": "قراءة الكود"}, - "showMyPark": {"en": "Show My Park", "ar": "عرض بارك"}, - "clearMyData": {"en": "clear My Data", "ar": "امسح البيانات"}, - "floor": {"en": "Floor:", "ar": "الطابق"}, - "gate": {"en": "Gate:", "ar": "بوابة"}, - "building": {"en": "Building:", "ar": "المبنى"}, - "branch": {"en": "Branch:", "ar": "الفرع"}, - "emergencyServices": {"en": "Emergency Services:", "ar": "خدمات الطوارئ"}, - "textToSpeech": {"en": "How May I Help You?", "ar": "كيف يمكنني مساعدتك؟"}, "MyAppointments": {"en": "My Appointments", "ar": "مواعيدي"}, "NoBookedAppointments": { "en": "No Booked Appointments", @@ -466,7 +449,6 @@ const Map> localizedValues = { "OrderDetails": {"en": "Order Details", "ar": "تفاصيل الطلب"}, "VitalSign": {"en": "Vital Sign", "ar": "العلامة حيوية"}, "MonthlyReports": {"en": "Monthly Reports", "ar": "تقارير شهرية"}, - "locationDialogMessage": {"en": "Allow the HMG app to access your location will assist you in showing the hospitals according to the nearest to you.", "ar": "السماح لتطبيق مجموعة الحبيب الطبية بالوصول إلى موقعك سيساعدك في إظهار المستشفيات وفقًا للأقرب إليك."}, "km":{"en":"KMs:","ar":"كم"}, "PatientHealthSummaryReport":{"en":"Patient Health Summary Report","ar":" ملخص التقارير الشهرية"}, "ToViewTheTermsAndConditions":{"en":"To View The Terms And Conditions Report","ar":" عرض الشروط والأحكام "},