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

.

Browse Source
This commit is contained in:
14Sandee
2023-10-20 20:52:17 +05:30
parent 8f7156e3e3
commit 8fd739dbb9
6 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.idea/deploymentTargetDropDown.xml generated
View File

@@ -1,26 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetsSelectedWithDialog>
<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>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="5203ae2be8ec4353" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetsSelectedWithDialog>
<targetsSelectedWithDialog>
<Target>
<type value="QUICK_BOOT_TARGET" />

1
.idea/gradle.xml generated
View File

@@ -7,6 +7,7 @@
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

3
.idea/misc.xml generated
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

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

@@ -268,6 +268,8 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
binding.resetBtn.setOnClickListener(v -> {
loadPatientsLocation();
binding.updateBtnsView.setVisibility(View.GONE);
binding.homeLocationBtn.setVisibility(View.VISIBLE);
binding.cgLocationBtn.setVisibility(View.VISIBLE);
});
binding.updateBtn.setOnClickListener(v -> {
@@ -277,6 +279,18 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
Toast.makeText(this, "Cannot update address.", Toast.LENGTH_SHORT).show();
}
});
binding.homeLocationBtn.setOnClickListener(v -> {
if (mMap != null && home_loc_marker != null){
mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(home_loc_marker.getPosition(), 16));
}
});
binding.cgLocationBtn.setOnClickListener(v -> {
if (mMap != null && curr_loc_marker != null){
mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(curr_loc_marker.getPosition(), 16));
}
});
}
private void updatePatientCurrentLocationDetails() {
@@ -457,6 +471,8 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
this.mHomeLatLng = latLng1;
binding.updateBtnsView.setVisibility(View.VISIBLE);
binding.homeLocationBtn.setVisibility(View.GONE);
binding.cgLocationBtn.setVisibility(View.GONE);
updateHomeMarker(this.mHomeLatLng);
addRadius();
@@ -550,6 +566,8 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
this.mHomeLatLng = place.getLatLng();
binding.updateBtnsView.setVisibility(View.VISIBLE);
binding.homeLocationBtn.setVisibility(View.GONE);
binding.cgLocationBtn.setVisibility(View.GONE);
updateHomeMarker(this.mHomeLatLng);
addRadius();
@@ -578,6 +596,8 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead
@Override
public void onPatientAddressUpdated(@NonNull PatientData patientData) {
binding.updateBtnsView.setVisibility(View.GONE);
binding.homeLocationBtn.setVisibility(View.VISIBLE);
binding.cgLocationBtn.setVisibility(View.VISIBLE);
this.careGiverData.patientDetails = patientData;
this.patientData = patientData;
CaregiverDataCache.setCareGiverData(this.careGiverData);

36
app/src/main/res/layout/activity_cg_geofencing.xml
View File

@@ -212,20 +212,34 @@
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.google.android.material.card.MaterialCardView
android:id="@+id/home_location_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_home_nav_up"
android:src="@drawable/img_pat_curr_location"
android:layout_alignParentBottom="true"
android:layout_margin="15dp"
/>
app:backgroundTint="@color/white"
<com.google.android.material.floatingactionbutton.FloatingActionButton
app:cardCornerRadius="30dp"
app:cardElevation="5dp"
>
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/img_home_marker"
android:layout_margin="8dp"/>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/cg_location_Btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/caregiver_img"
android:src="@drawable/img_pat_curr_location"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
@@ -233,7 +247,17 @@
app:backgroundTint="@color/white"
/>
app:cardCornerRadius="30dp"
app:cardElevation="5dp"
>
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/img_pat_curr_location"
android:layout_margin="8dp"/>
</com.google.android.material.card.MaterialCardView>
</RelativeLayout>

8
app/src/main/res/layout/register_fragment.xml
View File

@@ -65,12 +65,18 @@
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp"
android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ "
android:maxLines="1"
android:maxLength="20"
android:hint="@string/enter_your_full_name"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:imeOptions="actionNext"
android:paddingVertical="15dp"
android:padding="10dp"
@@ -78,7 +84,7 @@
android:drawablePadding="10dp"
android:autofillHints="name"
android:inputType="textCapWords"
android:inputType="textPersonName|textCapWords"
/>
<TextView