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-04 21:25:44 +05:30
parent bc15d45173
commit 31cd093772
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/deploymentTargetDropDown.xml generated
View File

@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_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" />
<type value="SERIAL_NUMBER" />
<value value="RZCW41EJRPN" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-08-31T15:38:52.039533500Z" />
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-09-04T15:44:47.230401400Z" />
<runningDeviceTargetsSelectedWithDialog>
<Target>
<type value="RUNNING_DEVICE_TARGET" />

15
app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
View File

@@ -3,7 +3,6 @@ package com.ssb.simplitend.caregiverdashboard.activities;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.content.res.AppCompatResources;
@@ -51,6 +50,12 @@ public class CaregiverDashActivity extends AppCompatActivity implements
clickEvents();
CaregiverDataCache.getCaregiverData(this, (careGiverData) -> {
this.careGiverData = careGiverData;
watchSubscription();
}, true);
}
@Override
@@ -59,7 +64,6 @@ public class CaregiverDashActivity extends AppCompatActivity implements
CaregiverDataCache.getCaregiverData(this, (careGiverData) -> {
this.careGiverData = careGiverData;
watchSubscription();
setLayoutDetails();
}, true);
}
@@ -98,9 +102,6 @@ public class CaregiverDashActivity extends AppCompatActivity implements
.inject();
binding.bottomNav.setItemSelectListener(this);
// initializing dashboard fragment
replaceFragment(new CgDashBoardFragment(), "dashboard");
}
@@ -156,8 +157,12 @@ public class CaregiverDashActivity extends AppCompatActivity implements
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
finish();
return;
}
}
// initializing dashboard fragment
replaceFragment(new CgDashBoardFragment(), "dashboard");
}
private void setLayoutDetails() {

2
app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java
View File

@@ -7,6 +7,7 @@ import static com.ssb.simplitend.cg_geofencing.CgGeoFencingActivity.GEOFENCE_DET
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -86,6 +87,7 @@ public class CgDashBoardFragment extends Fragment implements
@Override
public void onResume() {
super.onResume();
Log.d("aditya", "onResume: ");
CaregiverDataCache.getCaregiverData(requireActivity(), (careGiverData1 -> {
this.careGiverData = careGiverData1;

2
app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java
View File

@@ -222,7 +222,7 @@ public class SplashFragment extends Fragment
binding.retry.setVisibility(View.GONE);
binding.loadAnim.setVisibility(View.GONE);
if (patientData.isCareGiverConnectedWithPatient == 1){
if (patientData.isCareGiverConnectedWithPatient == 1 && patientData.isCaregiverTakeSubscription == 1){
// go to dashboard
gotoPatientDashBoard();
}else if (patientData.isCareGiverLink == 1){