From 38874cb5bd1911004347f5f2cbed4aebfa7190ea Mon Sep 17 00:00:00 2001
From: 14Sandee <sandee.vit14@gmail.com>
Date: Fri, 15 Dec 2023 15:37:26 +0530
Subject: [PATCH] ,

---
 .idea/deploymentTargetDropDown.xml                   | 12 ++++++------
 app/build.gradle                                     |  4 ++--
 .../locationupdates/DefaultLocationClient.java       |  4 +++-
 .../fragments/contacts/CreateContactFragment.java    |  3 +++
 app/src/main/res/layout/add_medical_info.xml         |  2 +-
 app/src/main/res/layout/add_routine_fragment.xml     |  1 +
 app/src/main/res/layout/medical_into_fragment.xml    |  4 ++--
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 327fdd9..52d2edf 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
+    <targetSelectedWithDropDown>
       <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
+        <type value="QUICK_BOOT_TARGET" />
         <deviceKey>
           <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="RZCW41EJRPN" />
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_7_Pro_API_33.avd" />
           </Key>
         </deviceKey>
       </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-12-15T07:22:33.208914Z" />
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-12-15T09:11:22.247476Z" />
     <targetsSelectedWithDialog>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/app/build.gradle b/app/build.gradle
index 3b6c4ba..5adcf00 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.app.simplitend"
         minSdk 24
         targetSdk 33
-        versionCode 2
-        versionName "1.0.0"
+        versionCode 3
+        versionName "1.0.0 (testing)"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/app/simplitend/locationupdates/DefaultLocationClient.java b/app/src/main/java/com/app/simplitend/locationupdates/DefaultLocationClient.java
index 25ab0d1..27efa6b 100644
--- a/app/src/main/java/com/app/simplitend/locationupdates/DefaultLocationClient.java
+++ b/app/src/main/java/com/app/simplitend/locationupdates/DefaultLocationClient.java
@@ -1,6 +1,7 @@
 package com.app.simplitend.locationupdates;
 
 import static com.app.simplitend.patientgeofencing.PatientLocationUpdatesReceiver.LOCATION_REQUEST_TAG;
+import static com.google.android.gms.location.Priority.PRIORITY_HIGH_ACCURACY;
 
 import android.Manifest;
 import android.content.Context;
@@ -50,8 +51,9 @@ public class DefaultLocationClient implements LocationClient{
             throw locationException;
         }
 
-        locationRequest = new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, interval)
+        locationRequest = new LocationRequest.Builder(PRIORITY_HIGH_ACCURACY, interval)
                 .setMinUpdateDistanceMeters(50) // receive updates only if user has moved over 100 meters
+                .setPriority(PRIORITY_HIGH_ACCURACY)
                 .build();
 
          locationCallback = new LocationCallback() {
diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
index 8685de9..7721cee 100644
--- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
+++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
@@ -536,6 +536,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.caregiverCheckView.setVisibility(View.VISIBLE);
             binding.caregiverCheck.setChecked(true);
             binding.caregiverCheck.setEnabled(false);
+
+            binding.relationship.setClickable(false);
+            binding.relationship.setFocusable(false);
             binding.relationship.setEnabled(false);
 
             binding.relationOptional.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/add_medical_info.xml b/app/src/main/res/layout/add_medical_info.xml
index a719786..9508e79 100644
--- a/app/src/main/res/layout/add_medical_info.xml
+++ b/app/src/main/res/layout/add_medical_info.xml
@@ -320,7 +320,7 @@
             android:drawablePadding="10dp"
 
             android:inputType="textCapSentences"
-            android:maxLines="1"
+            android:singleLine="true"
 
             android:maxLength="255"
             android:digits="@string/allowed_alphanumeric_space_special"
diff --git a/app/src/main/res/layout/add_routine_fragment.xml b/app/src/main/res/layout/add_routine_fragment.xml
index cb755ec..e094a21 100644
--- a/app/src/main/res/layout/add_routine_fragment.xml
+++ b/app/src/main/res/layout/add_routine_fragment.xml
@@ -140,6 +140,7 @@
 
             android:overScrollMode="never"
             android:scrollbars="vertical"
+            android:singleLine="true"
 
             android:maxLength="255"
             android:digits="@string/allowed_alphanumeric_space_special"
diff --git a/app/src/main/res/layout/medical_into_fragment.xml b/app/src/main/res/layout/medical_into_fragment.xml
index ef39d13..176e2da 100644
--- a/app/src/main/res/layout/medical_into_fragment.xml
+++ b/app/src/main/res/layout/medical_into_fragment.xml
@@ -602,8 +602,8 @@
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/add_med_info"
         android:visibility="gone"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
 
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"