Merge remote-tracking branch 'origin/Reverted_back' into Syria_featur…

…es_sprint_1

# Conflicts:
#	.idea/codeStyles/Project.xml
#	app/build.gradle
#	app/src/main/assets/config.json
#	app/src/main/assets/engines/Abdominal Pain.json
#	app/src/main/assets/engines/Back & Neck pain.json
#	app/src/main/assets/engines/Diarrhea.json
#	app/src/main/assets/engines/Fever.json
#	app/src/main/assets/engines/Sick child (under 5years).json
#	app/src/main/assets/famHist-or-translation.json
#	app/src/main/assets/famHist.json
#	app/src/main/assets/patHist-or-translation.json
#	app/src/main/assets/patHist.json
#	app/src/main/assets/physExam-or-translation.json
#	app/src/main/assets/physExam.json
#	app/src/main/assets/physicalExamAssets/JA1.jpg
#	app/src/main/assets/physicalExamAssets/JA2.jpg
#	app/src/main/assets/physicalExamAssets/JA3.jpg
#	app/src/main/assets/physicalExamAssets/abdominalregions9.jpg
#	app/src/main/assets/physicalExamAssets/abnormalnails.jpg
#	app/src/main/assets/physicalExamAssets/ankleedemaexample.jpg
#	app/src/main/assets/physicalExamAssets/conjunctivaexample.jpg
#	app/src/main/assets/physicalExamAssets/jaundiceexample.jpg
#	app/src/main/assets/physicalExamAssets/lymphswelling.jpg
#	app/src/main/assets/physicalExamAssets/thyroidswelling.jpg
#	app/src/main/java/io/intelehealth/client/activities/activePatientsActivity/ActivePatientActivity.java
#	app/src/main/java/io/intelehealth/client/activities/activePatientsActivity/ActivePatientAdapter.java
#	app/src/main/java/io/intelehealth/client/activities/complaintNodeActivity/ComplaintNodeActivity.java
#	app/src/main/java/io/intelehealth/client/activities/familyHistoryActivity/FamilyHistoryActivity.java
#	app/src/main/java/io/intelehealth/client/activities/homeActivity/HomeActivity.java
#	app/src/main/java/io/intelehealth/client/activities/homeActivity/HomeAdapter.java
#	app/src/main/java/io/intelehealth/client/activities/loginActivity/LoginActivity.java
#	app/src/main/java/io/intelehealth/client/activities/pastMedicalHistoryActivity/PastMedicalHistoryActivity.java
#	app/src/main/java/io/intelehealth/client/activities/physcialExamActivity/PhysicalExamActivity.java
#	app/src/main/java/io/intelehealth/client/activities/privacyNoticeActivity/PrivacyNotice_Activity.java
#	app/src/main/java/io/intelehealth/client/activities/questionNodeActivity/QuestionNodeActivity.java
#	app/src/main/java/io/intelehealth/client/activities/setupActivity/SetupActivity.java
#	app/src/main/java/io/intelehealth/client/activities/todayPatientActivity/TodayPatientActivity.java
#	app/src/main/java/io/intelehealth/client/activities/todayPatientActivity/TodayPatientAdapter.java
#	app/src/main/java/io/intelehealth/client/activities/visitSummaryActivity/VisitSummaryActivity.java
#	app/src/main/java/io/intelehealth/client/activities/vitalActivity/VitalsActivity.java
#	app/src/main/java/io/intelehealth/client/app/AppConstants.java
#	app/src/main/java/io/intelehealth/client/database/dao/EmergencyEncounterDAO.java
#	app/src/main/java/io/intelehealth/client/database/dao/PullDataDAO.java
#	app/src/main/java/io/intelehealth/client/networkApiCalls/ApiInterface.java
#	app/src/main/java/io/intelehealth/client/services/DownloadProtocolsTask.java
#	app/src/main/res/layout/activity_home.xml
#	app/src/main/res/layout/activity_privacy_notice_2.xml
#	app/src/main/res/menu/today_filter.xml
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "io.intelehealth.client"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 27
-        versionName "version 2.0 beta 1"
+        versionCode 29
+        versionName "version 2.0 beta 4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         //Change this to true to enable multidex support for Kitkat
         multiDexEnabled true
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta1'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta2'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
     testImplementation 'junit:junit:4.13-beta-2'
@@ -75,14 +75,8 @@ dependencies {
     //Google Guava
     implementation 'com.google.guava:guava:27.1-jre'
     //Storage librabry
-//    implementation 'com.snatik:storage:2.1.0'
+    //    implementation 'com.snatik:storage:2.1.0'
     //    dexter permission
-    //    implementation 'com.karumi:dexter:5.0.0'
-    //Room database
-//    annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
-//    implementation "android.arch.persistence.room:runtime:1.1.1"
-//    annotationProcessor "android.arch.persistence.room:compiler:1.1.1"
-//    implementation "android.arch.persistence.room:rxjava2:1.1.1"
     //Parse SDK
     implementation 'com.parse:parse-android:1.15.7'
     //date and time
@@ -105,6 +99,11 @@ dependencies {
     implementation "com.google.firebase:firebase-messaging:17.3.4"
     implementation 'com.google.firebase:firebase-crash:16.2.1'
 
+    implementation('com.github.SandroMachado:restaurant:0.2.0@aar') {
+        transitive = true
+    }
+
+    implementation 'com.rengwuxian.materialedittext:library:2.1.4'
 
 
 }

app/release/output.json

@@ -6,8 +6,8 @@
     "apkData": {
       "type": "MAIN",
       "splits": [],
-      "versionCode": 27,
-      "versionName": "version 2.0 beta 1",
+      "versionCode": 29,
+      "versionName": "version 2.0 beta 4",
       "enabled": true,
       "outputFile": "app-release.apk",
       "fullName": "release",

app/src/main/assets/config.json

@@ -0,0 +1,86 @@
+{
+  "mFirstName": true,
+  "mMiddleName": true,
+  "mLastName": true,
+  "mGenderM": true,
+  "mGenderF": true,
+  "mDOB": true,
+  "mAge": true,
+  "mPhoneNum": true,
+  "mCountry": "India",
+  "countryText": true,
+  "mState": "",
+  "stateText": true,
+  "mCity": true,
+  "mAddress1": true,
+  "mAddress2": true,
+  "mOccupation": true,
+  "casteLayout": true,
+  "educationLayout": true,
+  "economicLayout": true,
+  "mPostal": true,
+  "countryStateLayout": true,
+  "mRelationship": true,
+  "mHeight": true,
+  "mWeight": true,
+  "mPulse": true,
+  "mBpSys": true,
+  "mBpDia": true,
+  "mTemperature": true,
+  "mCelsius": true,
+  "mFahrenheit": false,
+  "mSpo2": true,
+  "mBMI": true,
+  "mResp": true,
+  "privacyNotice": true,
+  "privacyNoticeText": "Privacy notice and consent form for patients
+
+Personal Information
+We collect the following personal information from you when the health-worker meets you at the clinic location or on home visits:
+●	Full name
+●	Gender
+●	Date of birth
+●	Home address
+●	Email address
+●	Contact numbers
+●	Health information – height, weight, blood type, blood pressure, medical history, allergy information, and other diagnostic information as required
+
+Use
+Your medical records and other personal data will be processed in compliance with the relevant Data Privacy Act, and its Implementing Rules and Regulations of the jurisdiction where your data is collected. 
+
+Your information is used for diagnosing and treating you. 
+
+Your contact information may be used to 
+•	send you reminders
+•	prescription information, 
+•	other related communication.
+
+In addition, your personal information will be anonymized for use in research, disease monitoring, and analysis to help us improve our products and services. Anonymization removes your identifying information and protects your privacy.
+
+We may disclose your personal information:
+●	as required by law, such as to comply with a subpoena, or similar legal process;
+●	when we believe in good faith that disclosure is necessary to protect our rights, protect your safety or the safety of others, investigate fraud, or respond to a government request;
+●	with our trusted services providers who work on our behalf, do not have an independent use of the information we disclose to them, and have agreed to adhere to our privacy policy.
+●	if Intelehealth, Inc. is involved in a merger, acquisition, or sale of all or a portion of its assets, you will be notified via email and/or a prominent notice on our website of any change in ownership or uses of this information, as well as any choices you may have regarding this information.
+
+Protection Measures
+•	We provide physical, electronic, and procedural safeguards to protect information we process and maintain. 
+•	Only authorized personnel have access to your personal information. If a transfer of information is required, the exchange of which will be facilitated through email or hard copy. Digital files will be encrypted and/or password-protected before such transfers.
+•	Personal data records will be stored in a secure database for the period of our contract to provide these services, after which any physical records shall be disposed of through shredding, while digital files shall be anonymized. 
+
+Access and Correction
+You have the right to ask for a copy of any personal information we hold about you, as well as to ask for it to be corrected if you think it is wrong.
+
+If you’d like us to delete your personal data that you have provided to us, please contact us at [email protected] and we will respond in a reasonable time. 
+
+To make any requests for access, modification, or deletion of your personal information with us, please contact the Data Privacy Officer, at [email protected]
+
+On clicking “Accept”, I consent to the collection and use of my personal data, including health information, and to give access to the above-mentioned entities.
+",
+
+  "privacyNoticeText_Cebuano" : "",
+
+"privacyNoticeText_Odiya" : "",
+  "presciptionHeader1": "Philippines Telemedicine Project",
+  "presciptionHeader2": "ePrescription"
+}