Aditya.Gaikwad/SimpliTend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Aditya Gaikwad
2023-09-05 18:43:37 +05:30
parent 1d387e0f54
commit 87bf0798a7
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/deploymentTargetDropDown.xml generated
View File

@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\adity\.android\avd\Samsung_Z3_flip_API_34.avd" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-09-05T10:50:12.835061Z" />
<runningDeviceTargetsSelectedWithDialog>
<Target>
<type value="RUNNING_DEVICE_TARGET" />

7
app/src/main/java/com/ssb/simplitend/cg_geofencing/CgGeoFencingActivity.java
View File

@@ -262,6 +262,11 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
}
private void saveGeoFence() {
if (careGiverData == null) {
Toast.makeText(this, "Couldn't add Fence.", Toast.LENGTH_SHORT).show();
return;
}
Float radius = getRadius();
if (radius == null) {
@@ -290,6 +295,8 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
geoFenceDetails.location_name = geofence_bs_binding.location.getText().toString();
geoFenceDetails.radius = "" + radius;
geoFenceDetails.type = geofence_bs_binding.unitSpinner.getSelectedIndex() == 0?KMS:MILES;
geoFenceDetails.patient_xid = "" + careGiverData.patientId;
geoFenceDetails.caregiver_xid = "" + careGiverData.caregiver_xid;
progressDialog.setTitle("Please wait...");
progressDialog.setMessage("while we set Geofence for you.");

5
app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
View File

@@ -484,8 +484,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
binding.caregiverCheckView.setVisibility(View.GONE);
}
boolean default_contact_set = false;
if (contactData.phone_number != null){
addContactView(contactData.phone_number, true);
addContactView(contactData.phone_number, default_contact_set = true);
}
// adding contacts to Contact_rv
@@ -493,7 +494,7 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
String[] phone_numbers = contactData.extra_phone_numbers.split(",");
for (String phone_number : phone_numbers) {
addContactView(phone_number, phone_numbers.length == 1);
addContactView(phone_number, phone_numbers.length == 1 && !default_contact_set);
}
}