.

2023-08-22 21:06:03 +05:30
parent 668ef56c63
commit 8d49bd0d05
33 changed files with 2211 additions and 353 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,10 +18,38 @@
        android:supportsRtl="true"
        android:theme="@style/Theme.SimpliTend"
        tools:targetApi="31">
+
+
+        <activity android:name=".caregiverdashboard.activities.deactivateacc.DeActivateAccountActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize"
+            />
+        <activity
+            android:name=".caregiverdashboard.activities.CaregiverSettingsActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".caregiverdashboard.activities.ContactAdminActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".caregiverdashboard.activities.ChangePinActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".caregiverdashboard.activities.CgChangePwdActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".caregiverdashboard.activities.CaregiverProfileActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
        <activity
            android:name=".faqs.FAQ_Activity"
            android:exported="false"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
        <activity
            android:name=".articles.ArticleShowerActivity"
            android:exported="false" />
@@ -34,7 +62,7 @@
            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
-            android:name=".caregiverdashboard.activities.PatientProfileInfoActivity"
+            android:name=".caregiverdashboard.activities.EditProfileInfoActivity"
            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
@@ -69,11 +97,7 @@
            android:name=".welcome.activities.WelcomeActivity"
            android:exported="true"
            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />

-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>

            <meta-data
                android:name="android.app.lib_name"
@@ -91,6 +115,11 @@
            android:name=".cg_subscription.CgSubscriptionActivity"
            android:exported="true"
            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
            <meta-data
                android:name="android.app.lib_name"
                android:value="" />
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
@@ -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;
@@ -111,6 +110,21 @@ public class CaregiverDashActivity extends AppCompatActivity implements
            startActivity(intent);
        });

+        menuBinding.cgProfile.setOnClickListener(v -> {
+            Intent intent = new Intent(this, CaregiverProfileActivity.class);
+            startActivity(intent);
+        });
+
+        menuBinding.contactAdmin.setOnClickListener(v -> {
+            Intent intent = new Intent(this, ContactAdminActivity.class);
+            startActivity(intent);
+        });
+
+        menuBinding.settings.setOnClickListener(v -> {
+            Intent intent = new Intent(this, CaregiverSettingsActivity.class);
+            startActivity(intent);
+        });
+
    }

    private void watchSubscription(){
@@ -121,8 +135,6 @@ public class CaregiverDashActivity extends AppCompatActivity implements
                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                startActivity(intent);
                finish();
-            }else{
-                Toast.makeText(this, "Subscription on.", Toast.LENGTH_SHORT).show();
            }
        }
    }
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java
@@ -0,0 +1,106 @@
+package com.ssb.simplitend.caregiverdashboard.activities;
+
+import static com.ssb.simplitend.caregiverdashboard.activities.EditProfileInfoActivity.IS_CAREGIVER;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.CompoundButton;
+import android.widget.Toast;
+
+import com.bumptech.glide.Glide;
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.apputils.CaregiverDataCache;
+import com.ssb.simplitend.databinding.ActivityCaregiverProfileBinding;
+import com.ssb.simplitend.welcome.welcomecg.mvvm.CareGiverData;
+
+public class CaregiverProfileActivity extends AppCompatActivity implements CompoundButton.OnCheckedChangeListener {
+
+    protected ActivityCaregiverProfileBinding binding;
+
+    private CareGiverData careGiverData;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityCaregiverProfileBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        CaregiverDataCache.getCaregiverData(this, (careGiverData1 -> {
+            this.careGiverData = careGiverData1;
+
+            setCareGiverDetails();
+        }), true);
+
+        initViews();
+
+        clickEvents();
+    }
+
+    private void setCareGiverDetails() {
+        if (careGiverData == null) {
+            Toast.makeText(this, "Couldn't load the data.", Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        if (careGiverData.profile_photo != null) {
+            // image
+            Glide.with(this)
+                    .load(AppUtil.IMAGE_BASE_URL + careGiverData.profile_photo)
+                    .placeholder(android.R.color.darker_gray)
+                    .error(R.drawable.ic_contact)
+                    .into(binding.image);
+        }
+
+        binding.name.setText(careGiverData.first_name);
+        binding.phoneNumber.setText(careGiverData.phone_number);
+        binding.email.setText(careGiverData.email);
+        binding.dob.setText(careGiverData.date_of_birth);
+
+        int biometric  = AppUtil.getWantSecurityFlag(this);
+
+        if (biometric == AppUtil.CG_SECURITY_NEEDED){
+            binding.biometricCheck.setChecked(true);
+        }else {
+            binding.biometricCheck.setChecked(false);
+        }
+
+    }
+
+    private void initViews() {
+        binding.biometricCheck.setOnCheckedChangeListener(this);
+    }
+
+    private void clickEvents() {
+        binding.backBtn.setOnClickListener(v -> onBackPressed());
+
+        binding.editBtn.setOnClickListener(v -> {
+            Intent intent = new Intent(this, EditProfileInfoActivity.class);
+            intent.putExtra(IS_CAREGIVER, true);
+            startActivity(intent);
+        });
+
+        binding.changePwd.setOnClickListener(v -> {
+            Intent intent = new Intent(this, CgChangePwdActivity.class);
+            startActivity(intent);
+        });
+
+        binding.changePin.setOnClickListener(v -> {
+            Intent intent = new Intent(this, ChangePinActivity.class);
+            startActivity(intent);
+        });
+
+    }
+
+    // biometric check change listener
+    @Override
+    public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+        if (checked){
+            AppUtil.setWantSecurityFlag(this, AppUtil.CG_SECURITY_NEEDED);
+        }else{
+            AppUtil.setWantSecurityFlag(this, AppUtil.CG_NO_SECURITY_NEEDED);
+        }
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java
@@ -0,0 +1,57 @@
+package com.ssb.simplitend.caregiverdashboard.activities;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.caregiverdashboard.activities.deactivateacc.DeActivateAccountActivity;
+import com.ssb.simplitend.databinding.ActivityCgSettingsBinding;
+import com.ssb.simplitend.welcome.activities.WelcomeActivity;
+
+public class CaregiverSettingsActivity extends AppCompatActivity {
+
+    private ActivityCgSettingsBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityCgSettingsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        initViews();
+
+        clickEvents();
+    }
+
+    private void initViews() {
+
+    }
+
+    private void clickEvents() {
+        binding.backBtn.setOnClickListener(v -> onBackPressed());
+
+        binding.logout.setOnClickListener(v -> {
+            AppUtil.showAlert(this,
+                    "Are you sure?", "Do you want to sign out?",
+                    getString(R.string.no),
+                    ((dialogInterface, i) -> {}),
+                    getString(R.string.yes),
+                    ((dialogInterface, i) -> {
+                        AppUtil.cgSignOut(this);
+
+                        Intent intent = new Intent(this, WelcomeActivity.class);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                        startActivity(intent);
+                        finish();
+                    }));
+        });
+
+        binding.deActivate.setOnClickListener(v -> {
+            Intent intent = new Intent(this, DeActivateAccountActivity.class);
+            startActivity(intent);
+        });
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java
@@ -0,0 +1,26 @@
+package com.ssb.simplitend.caregiverdashboard.activities;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.databinding.CgChangePasswordFragmentBinding;
+
+public class CgChangePwdActivity extends AppCompatActivity {
+
+    private CgChangePasswordFragmentBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = CgChangePasswordFragmentBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        // viewing old pwd view
+        binding.oldPwdTitle.setVisibility(View.VISIBLE);
+        binding.oldPwdView.setVisibility(View.VISIBLE);
+
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java
@@ -1,24 +1,14 @@
 package com.ssb.simplitend.caregiverdashboard.activities;

 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.View;
 import android.widget.Toast;

-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat;

 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.gif.GifDrawable;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.Target;
-import com.daimajia.androidanimations.library.Techniques;
-import com.daimajia.androidanimations.library.YoYo;
 import com.ssb.simplitend.R;
 import com.ssb.simplitend.apputils.CaregiverDataCache;
 import com.ssb.simplitend.cg_geofencing.CgGeoFencingActivity;
@@ -73,7 +63,7 @@ public class CgProfileProgressActivity extends AppCompatActivity {
        });

        binding.profileInfo.setOnClickListener(v -> {
-            Intent intent = new Intent(this, PatientProfileInfoActivity.class);
+            Intent intent = new Intent(this, EditProfileInfoActivity.class);
            startActivity(intent);
        });

--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ChangePinActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ChangePinActivity.java
@@ -0,0 +1,20 @@
+package com.ssb.simplitend.caregiverdashboard.activities;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.databinding.ChangePinFragmentBinding;
+
+public class ChangePinActivity extends AppCompatActivity {
+
+    private ChangePinFragmentBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        binding = ChangePinFragmentBinding.inflate(getLayoutInflater());
+        super.onCreate(savedInstanceState);
+        setContentView(binding.getRoot());
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java
@@ -0,0 +1,65 @@
+package com.ssb.simplitend.caregiverdashboard.activities;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.view.MotionEvent;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.databinding.ActivityContactAdminBinding;
+
+public class ContactAdminActivity extends AppCompatActivity {
+
+    private ActivityContactAdminBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityContactAdminBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        initViews();
+
+        clickEvents();
+
+    }
+
+    private void initViews() {
+
+        smoothEditTextScroll();
+
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void smoothEditTextScroll() {
+        // scrolling edit text
+
+        binding.description.setOnTouchListener((v, event) -> {
+            if (binding.description.hasFocus()) {
+                v.getParent().requestDisallowInterceptTouchEvent(true);
+                if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_SCROLL) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                    return true;
+                }
+            }
+            return false;
+        });
+
+        binding.query.setOnTouchListener((v, event) -> {
+            if (binding.query.hasFocus()) {
+                v.getParent().requestDisallowInterceptTouchEvent(true);
+                if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_SCROLL) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                    return true;
+                }
+            }
+            return false;
+        });
+
+    }
+
+    private void clickEvents() {
+        binding.backBtn.setOnClickListener(v -> onBackPressed());
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/PatientProfileInfoActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/PatientProfileInfoActivity.java
@@ -2,11 +2,13 @@ package com.ssb.simplitend.caregiverdashboard.activities;

 import android.app.DatePickerDialog;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.View;
 import android.view.WindowManager;
 import android.widget.Toast;

@@ -19,6 +21,7 @@ import com.ssb.simplitend.R;
 import com.ssb.simplitend.apputils.AppUtil;
 import com.ssb.simplitend.apputils.CaregiverDataCache;
 import com.ssb.simplitend.databinding.ActivityPersonalInfoBinding;
+import com.ssb.simplitend.welcome.welcomecg.mvvm.CareGiverData;
 import com.ssb.simplitend.welcome.welcomepatient.mvvm.models.PatientData;

 import org.json.JSONArray;
@@ -28,16 +31,14 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;

-public class PatientProfileInfoActivity extends AppCompatActivity {
+public class EditProfileInfoActivity extends AppCompatActivity {

    private static final String TAG = "PatientProfileInfoActiv";

@@ -50,21 +51,38 @@ public class PatientProfileInfoActivity extends AppCompatActivity {

    private PatientData patientData;

+    private CareGiverData careGiverData;
+
    private ArrayList<String> countryList;
    private HashMap<String, ArrayList<String>> country_N_states_map;

+    public static final String IS_CAREGIVER = "is_caregiver";
+
+    private boolean isCaregiver;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        binding = ActivityPersonalInfoBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());

+        Intent intent = getIntent();
+        if (intent != null){
+            isCaregiver = intent.getBooleanExtra(IS_CAREGIVER, false);
+        }
+
+        if (isCaregiver){
+            // no address for caregiver
+            binding.addressView.setVisibility(View.GONE);
+        }
+
        initViews();

        clickEvents();

        CaregiverDataCache.getCaregiverData(this, (careGiverData -> {
            this.patientData = careGiverData.patientDetails;
+            this.careGiverData = careGiverData;

            setDetails();
        }), true);
@@ -73,34 +91,48 @@ public class PatientProfileInfoActivity extends AppCompatActivity {
    }

    private void setDetails() {
-        if (patientData == null) {
-            Toast.makeText(this, "Couldn't load patient data.", Toast.LENGTH_SHORT).show();
-            return;
-        }
+        if (isCaregiver){
+            // load caregiver data
+            if (careGiverData == null){
+                Toast.makeText(this, "Couldn't load your data.", Toast.LENGTH_SHORT).show();
+                return;
+            }

-        binding.name.setText(patientData.first_name);
-        binding.dob.setText(formatDateToMMddYYYY("yyyy-MM-dd", patientData.date_of_birth));
-        binding.contactNumber.setText(patientData.phone_number);
-        binding.email.setText(patientData.email);
+            binding.name.setText(careGiverData.first_name);
+            binding.dob.setText(formatDateToMMddYYYY("yyyy-MM-dd", careGiverData.date_of_birth));
+            binding.contactNumber.setText(careGiverData.phone_number);
+            binding.email.setText(careGiverData.email);
+        }else{
+            if (patientData == null) {
+                Toast.makeText(this, "Couldn't load patient data.", Toast.LENGTH_SHORT).show();
+                return;
+            }

-        binding.street.setText(patientData.address_line1);
-        binding.town.setText(patientData.city);
-        binding.zipCode.setText(patientData.post_code);
+            // load patient data
+            binding.name.setText(patientData.first_name);
+            binding.dob.setText(formatDateToMMddYYYY("yyyy-MM-dd", patientData.date_of_birth));
+            binding.contactNumber.setText(patientData.phone_number);
+            binding.email.setText(patientData.email);

-        String country = patientData.country;
-        String state = patientData.state;
-        if (!countryList.contains(country)){
-            countryList.add(country);
-            ArrayList<String> states = new ArrayList<>();
-            states.add(state);
-            country_N_states_map.put(country, states);
-        }
+            binding.street.setText(patientData.address_line1);
+            binding.town.setText(patientData.city);
+            binding.zipCode.setText(patientData.post_code);

-        binding.countrySpinner.selectItemByIndex(countryList.indexOf(country));
-        try {
-            binding.stateSpinner.selectItemByIndex(country_N_states_map.get(country).indexOf(state));
-        } catch (Exception e) {
-            Toast.makeText(this, "Couldn't load state.", Toast.LENGTH_SHORT).show();
+            String country = patientData.country;
+            String state = patientData.state;
+            if (!countryList.contains(country)){
+                countryList.add(country);
+                ArrayList<String> states = new ArrayList<>();
+                states.add(state);
+                country_N_states_map.put(country, states);
+            }
+
+            binding.countrySpinner.selectItemByIndex(countryList.indexOf(country));
+            try {
+                binding.stateSpinner.selectItemByIndex(country_N_states_map.get(country).indexOf(state));
+            } catch (Exception e) {
+                Toast.makeText(this, "Couldn't load state.", Toast.LENGTH_SHORT).show();
+            }
        }


@@ -293,7 +325,7 @@ public class PatientProfileInfoActivity extends AppCompatActivity {
            public void afterTextChanged(Editable editable) {
                if (editable.toString().length() == 6){
                    binding.zipCode.clearFocus();
-                    AppUtil.closeKeyboard(PatientProfileInfoActivity.this);
+                    AppUtil.closeKeyboard(EditProfileInfoActivity.this);
                }
            }
        });
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/deactivateacc/DeActivateAccountActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/deactivateacc/DeActivateAccountActivity.java
@@ -0,0 +1,63 @@
+package com.ssb.simplitend.caregiverdashboard.activities.deactivateacc;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.ssb.simplitend.databinding.ActivityDeactivateAccBinding;
+
+public class DeActivateAccountActivity extends AppCompatActivity {
+
+    protected ActivityDeactivateAccBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityDeactivateAccBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        initViews();
+
+        clickEvents();
+
+    }
+
+    private void initViews() {
+        // first showing the confirmation page
+        binding.firstView.setVisibility(View.VISIBLE);
+        binding.secondView.setVisibility(View.GONE);
+
+        smoothEditTextScroll();
+    }
+
+    private void clickEvents() {
+        binding.dont.setOnClickListener(v -> onBackPressed());
+        binding.dont2.setOnClickListener(v -> onBackPressed());
+
+        binding.doit.setOnClickListener(v -> {
+            // now showing the reason page
+            binding.firstView.setVisibility(View.GONE);
+            binding.secondView.setVisibility(View.VISIBLE);
+        });
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void smoothEditTextScroll() {
+        // scrolling edit text
+
+        binding.reasonInput.setOnTouchListener((v, event) -> {
+            if (binding.reasonInput.hasFocus()) {
+                v.getParent().requestDisallowInterceptTouchEvent(true);
+                if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_SCROLL) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                    return true;
+                }
+            }
+            return false;
+        });
+
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java
@@ -15,10 +15,9 @@ import androidx.fragment.app.Fragment;

 import com.ssb.simplitend.apputils.AppUtil;
 import com.ssb.simplitend.apputils.CaregiverDataCache;
-import com.ssb.simplitend.caregiverdashboard.activities.PatientProfileInfoActivity;
+import com.ssb.simplitend.caregiverdashboard.activities.EditProfileInfoActivity;
 import com.ssb.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity;
 import com.ssb.simplitend.cg_geofencing.CgGeoFencingActivity;
-import com.ssb.simplitend.databinding.CaregiverDashFragmentBinding;
 import com.ssb.simplitend.databinding.MyPatientFragmentBinding;
 import com.ssb.simplitend.welcome.welcomecg.mvvm.CareGiverData;

@@ -62,7 +61,7 @@ public class MyPatientFragment extends Fragment {
    private void clickEvents() {

        binding.peronalInfo.setOnClickListener(v -> {
-            Intent intent = new Intent(requireActivity(), PatientProfileInfoActivity.class);
+            Intent intent = new Intent(requireActivity(), EditProfileInfoActivity.class);
            startActivity(intent);
        });

--- a/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java
@@ -8,7 +8,6 @@ import android.widget.Toast;

 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.viewpager2.widget.ViewPager2;

 import com.ssb.simplitend.R;
 import com.ssb.simplitend.apputils.AppUtil;
@@ -81,11 +80,13 @@ public class CgSubscriptionActivity extends AppCompatActivity
            return;
        }

-        int position = binding.viewPager.getCurrentItem();
-        if (subscriptionPlans == null || position < 0 || position >= subscriptionPlans.size()) {
-            Toast.makeText(this, "Couldn't load plan.", Toast.LENGTH_SHORT).show();
-            return;
-        }
+//        int position = binding.viewPager.getCurrentItem();
+//        if (subscriptionPlans == null || position < 0 || position >= subscriptionPlans.size()) {
+//            Toast.makeText(this, "Couldn't load plan.", Toast.LENGTH_SHORT).show();
+//            return;
+//        }
+
+        int position = 0;

        progressDialog.setTitle("Please wait...");
        progressDialog.setMessage("while we take you to the payment gateway.");
@@ -131,17 +132,17 @@ public class CgSubscriptionActivity extends AppCompatActivity
    }

    private void initViews() {
-        binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
-            @Override
-            public void onPageSelected(int position) {
-                super.onPageSelected(position);
-                if (subscriptionPlans == null
-                        || position < 0 || position >= subscriptionPlans.size()) return;
-
-                String btn_text = "Make payment $" + subscriptionPlans.get(position).plan_value;
-                binding.makePayment.setText(btn_text);
-            }
-        });
+//        binding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+//            @Override
+//            public void onPageSelected(int position) {
+//                super.onPageSelected(position);
+//                if (subscriptionPlans == null
+//                        || position < 0 || position >= subscriptionPlans.size()) return;
+//
+//                String btn_text = "Make payment $" + subscriptionPlans.get(position).plan_value;
+//                binding.makePayment.setText(btn_text);
+//            }
+//        });

        // loading subscription plans
        progressDialog = new ProgressDialog(this);
@@ -246,10 +247,10 @@ public class CgSubscriptionActivity extends AppCompatActivity
        this.subscriptionPlans = subscriptionPlans;
        progressDialog.dismiss();

-        // loading plans
-        PlanAdapter planAdapter = new PlanAdapter(subscriptionPlans);
-        binding.viewPager.setAdapter(planAdapter);
-        binding.circleIndicator.setViewPager(binding.viewPager);
+//        // loading plans
+//        PlanAdapter planAdapter = new PlanAdapter(subscriptionPlans);
+//        binding.viewPager.setAdapter(planAdapter);
+//        binding.circleIndicator.setViewPager(binding.viewPager);
    }

    @Override
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomecg/fragments/CgAuthActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomecg/fragments/CgAuthActivity.java
@@ -132,7 +132,7 @@ public class CgAuthActivity extends AppCompatActivity {
    private void authenticateBiometrics() {
        if (biometricManager == null) return;

-        int biometric_status = biometricManager.canAuthenticate(BIOMETRIC_STRONG | BiometricManager.Authenticators.BIOMETRIC_WEAK);
+        int biometric_status = biometricManager.canAuthenticate(BIOMETRIC_STRONG);

        if (biometric_status == BiometricManager.BIOMETRIC_SUCCESS) {
            // go ahead and do it.
--- a/app/src/main/res/drawable/ic_alert.xml
+++ b/app/src/main/res/drawable/ic_alert.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="25dp"
+    android:viewportWidth="28"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M15.34,2.418a3.386,3.386 0,0 0,-2.683 0,3.9 3.9,0 0,0 -1.442,1.4c-0.627,0.862 -1.349,2.072 -2.36,3.771l-3.925,6.6C3.916,15.885 3.194,17.101 2.74,18.062a3.757,3.757 0,0 0,-0.527 1.917,3.2 3.2,0 0,0 1.342,2.265A4.028,4.028 0,0 0,5.521 22.762c1.085,0.1 2.528,0.1 4.554,0.1h7.85c2.026,0 3.469,0 4.554,-0.1a4.028,4.028 0,0 0,1.969 -0.516,3.194 3.194,0 0,0 1.342,-2.265 3.756,3.756 0,0 0,-0.527 -1.917c-0.457,-0.962 -1.179,-2.177 -2.195,-3.883l-3.925,-6.6c-1.012,-1.7 -1.733,-2.909 -2.36,-3.771A3.9,3.9 0,0 0,15.34 2.418ZM11.764,0.462a5.644,5.644 0,0 1,4.472 0,5.944 5.944,0 0,1 2.344,2.115c0.693,0.951 1.464,2.247 2.44,3.887l0.029,0.049 3.925,6.6 0.029,0.049c0.98,1.646 1.753,2.946 2.258,4.008a5.714,5.714 0,0 1,0.719 3.038A5.325,5.325 0,0 1,25.74 23.976a6.127,6.127 0,0 1,-3.063 0.917c-1.2,0.107 -2.742,0.107 -4.7,0.107L10.017,25c-1.955,0 -3.5,0 -4.7,-0.107a6.128,6.128 0,0 1,-3.063 -0.917A5.325,5.325 0,0 1,0.02 20.201,5.714 5.714,0 0,1 0.74,17.162c0.5,-1.061 1.279,-2.362 2.258,-4.008l0.029,-0.049 3.925,-6.6L6.98,6.462c0.976,-1.64 1.747,-2.936 2.44,-3.887A5.945,5.945 0,0 1,11.764 0.462ZM14,7.87a1.086,1.086 0,0 1,1.1 1.071v5a1.1,1.1 0,0 1,-2.2 0v-5A1.086,1.086 0,0 1,14 7.869ZM14,16.792a1.428,1.428 0,1 0,0 2.855h0.015a1.428,1.428 0,1 0,0 -2.855Z"
+      android:fillColor="#141414"
+      android:fillType="evenOdd"/>
+</vector>
--- a/app/src/main/res/drawable/ic_description_2.xml
+++ b/app/src/main/res/drawable/ic_description_2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_description_2_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
--- a/app/src/main/res/drawable/ic_description_2_outline.xml
+++ b/app/src/main/res/drawable/ic_description_2_outline.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="21dp"
+    android:viewportWidth="17"
+    android:viewportHeight="21">
+  <path
+      android:pathData="M10.5,0.5L2.5,0.5A2,2 0,0 0,0.5 2.5L0.5,18.5a2,2 0,0 0,2 2L14.5,20.5a2,2 0,0 0,2 -2L16.5,6.5Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M10.5,0.5L10.5,6.5h6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12.5,11.5L4.5,11.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12.5,15.5L4.5,15.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M6.5,7.5L4.5,7.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"
+      android:strokeLineCap="round"/>
+</vector>
--- a/app/src/main/res/drawable/ic_log_out.xml
+++ b/app/src/main/res/drawable/ic_log_out.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M18.706,18.864a1.1,1.1 0,0 1,-0.73 -0.182,0.882 0.882,0 0,1 0,-1.277l4.743,-4.743L17.977,7.917A0.9,0.9 0,0 1,19.253 6.641L24.727,12.117a0.882,0.882 0,0 1,0 1.277L19.253,18.864Z"
+      android:fillColor="#ea3829"/>
+  <path
+      android:pathData="M23.267,13.39L8.672,13.39a0.912,0.912 0,0 1,0 -1.824L23.267,11.566a0.912,0.912 0,0 1,0 1.824Z"
+      android:fillColor="#ea3829"/>
+  <path
+      android:pathData="M15.507,25L4.561,25A4.334,4.334 0,0 1,0 20.833L0,4.167A4.334,4.334 0,0 1,4.561 0L15.507,0a0.837,0.837 0,1 1,0 1.667L4.561,1.667a2.693,2.693 0,0 0,-2.737 2.5L1.824,20.833a2.693,2.693 0,0 0,2.737 2.5L15.507,23.333a0.837,0.837 0,1 1,0 1.667Z"
+      android:fillColor="#ea3829"/>
+</vector>
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -1,44 +1,31 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="34.016dp"
-    android:height="37dp"
-    android:viewportWidth="34.016"
-    android:viewportHeight="37">
+    android:width="23.2dp"
+    android:height="28.2dp"
+    android:viewportWidth="23.2"
+    android:viewportHeight="28.2">
  <path
-      android:pathData="M14.242,4.112a9.9,9.9 0,0 0,-9.866 9.921L4.376,18.812A7.935,7.935 0,0 1,3.442 22.218L1.552,25.376a3.179,3.179 0,0 0,1.776 4.845,34.221 34.221,0 0,0 21.82,0 3.317,3.317 0,0 0,1.776 -4.845l-1.891,-3.158a8.154,8.154 0,0 1,-0.921 -3.406L24.112,14.033A9.923,9.923 0,0 0,14.242 4.112Z"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
+      android:pathData="M19.82,24.108L3.288,24.108a1.807,1.807 0,0 1,-1.512 -0.861,2.2 2.2,0 0,1 -0.227,-1.855l0.995,-3.041L2.544,13.173c0,-6.029 4.06,-10.936 9.048,-10.936s9.048,4.906 9.048,10.936v5.685l0.9,2.467a2.2,2.2 0,0 1,-0.187 1.893,1.81 1.81,0 0,1 -1.532,0.893ZM11.592,3.37c-4.419,0 -8.013,4.4 -8.013,9.8v5.376l-1.055,3.228a0.952,0.952 0,0 0,0.1 0.817,0.788 0.788,0 0,0 0.667,0.379h16.532a0.787,0.787 0,0 0,0.676 -0.391,0.955 0.955,0 0,0 0.083,-0.833l-0.972,-2.669L19.61,13.17c0,-5.4 -3.594,-9.8 -8.013,-9.8Z"
+      android:strokeWidth="0.2"
+      android:fillColor="#141414"
+      android:strokeColor="#141414"/>
  <path
-      android:pathData="M17.443,4.112a7.987,7.987 0,0 0,-1.68 -0.494,8.527 8.527,0 0,0 -4.8,0.494c0.508,-1.828 1.768,-3.112 3.238,-3.112S16.935,2.284 17.443,4.112Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
+      android:pathData="M11.564,28.1a5,5 0,0 1,-5 -5h1.212a3.784,3.784 0,0 0,7.567 0h1.212A5,5 0,0 1,11.564 28.1Z"
+      android:strokeWidth="0.2"
+      android:fillColor="#141414"
+      android:strokeColor="#141414"/>
  <path
-      android:pathData="M19.952,31.913c0,2.248 -2.363,4.087 -5.25,4.087a6.1,6.1 0,0 1,-3.71 -1.2A3.712,3.712 0,0 1,9.453 31.913"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#fff"/>
+      android:pathData="M14.302,2.84h-1.212a1.528,1.528 0,1 0,-3.057 0h-1.212a2.74,2.74 0,0 1,5.48 0Z"
+      android:strokeWidth="0.2"
+      android:fillColor="#141414"
+      android:strokeColor="#141414"/>
  <path
-      android:pathData="M33.016,26.452A7.2,7.2 0,1 1,25.807 19.252,7.2 7.2,0 0,1 33.016,26.452Z"
-      android:fillColor="#fff"/>
+      android:pathData="M22.494,14.042a0.608,0.608 0,0 1,-0.606 -0.606,12.363 12.363,0 0,0 -5.022,-10.065 0.605,0.605 0,1 1,0.707 -0.983,13.576 13.576,0 0,1 5.527,11.048 0.608,0.608 0,0 1,-0.606 0.606Z"
+      android:strokeWidth="0.2"
+      android:fillColor="#141414"
+      android:strokeColor="#141414"/>
  <path
-      android:pathData="M33.016,26.452A7.2,7.2 0,1 1,25.807 19.252,7.322 7.322,0 0,1 30.907,21.362 7.047,7.047 0,0 1,33.016 26.452Z"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ea3829"/>
-  <path
-      android:pathData="M25.811,23.216v4.1"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ea3829"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M25.811,29.66v-0.009"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ea3829"
-      android:strokeLineCap="round"/>
+      android:pathData="M0.706,14.042a0.608,0.608 0,0 1,-0.606 -0.606A13.574,13.574 0,0 1,5.628 2.393a0.605,0.605 0,1 1,0.707 0.983,12.363 12.363,0 0,0 -5.022,10.065 0.608,0.608 0,0 1,-0.606 0.606Z"
+      android:strokeWidth="0.2"
+      android:fillColor="#141414"
+      android:strokeColor="#141414"/>
 </vector>
--- a/app/src/main/res/drawable/ic_ques.xml
+++ b/app/src/main/res/drawable/ic_ques.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21.5dp"
+    android:height="21.5dp"
+    android:viewportWidth="21.5"
+    android:viewportHeight="21.5">
+  <path
+      android:pathData="M8.017,8.079a2.733,2.733 0,1 1,3.644 2.578,1.367 1.367,0 0,0 -0.911,1.289v1.144"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M10.75,16.075v0.456"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M10.75,20.75a10,10 0,1 0,-10 -10A10,10 0,0 0,10.75 20.75Z"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#71717a"/>
+</vector>
--- a/app/src/main/res/drawable/ic_question.xml
+++ b/app/src/main/res/drawable/ic_question.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_ques"
+        android:gravity="center"
+        />
+
+</layer-list>
--- a/app/src/main/res/drawable/ic_sad.xml
+++ b/app/src/main/res/drawable/ic_sad.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="150dp"
+    android:height="150dp"
+    android:viewportWidth="150"
+    android:viewportHeight="150">
+  <path
+      android:pathData="M75,0C116.41,0 150,33.59 150,75C150,116.41 116.41,150 75,150C33.59,150 0,116.41 0,75C0,33.59 33.59,0 75,0Z"
+      android:fillColor="#005F9A"/>
+  <group>
+    <clip-path
+        android:pathData="M87.46,47.24H108.89V68.67H87.46V47.24Z"/>
+    <group>
+      <clip-path
+          android:pathData="M108.64,57.79C108.64,58.45 108.58,59.1 108.45,59.74C108.33,60.38 108.14,61.01 107.89,61.62C107.63,62.23 107.33,62.8 106.96,63.35C106.6,63.9 106.18,64.4 105.71,64.86C105.25,65.33 104.75,65.74 104.2,66.1C103.65,66.47 103.08,66.78 102.47,67.03C101.86,67.28 101.24,67.47 100.6,67.6C99.95,67.73 99.3,67.79 98.64,67.79C97.99,67.79 97.34,67.73 96.7,67.6C96.05,67.47 95.42,67.28 94.82,67.03C94.21,66.78 93.63,66.47 93.09,66.1C92.54,65.74 92.04,65.33 91.57,64.86C91.11,64.4 90.7,63.9 90.33,63.35C89.97,62.8 89.66,62.23 89.41,61.62C89.16,61.01 88.97,60.38 88.84,59.74C88.71,59.1 88.64,58.45 88.64,57.79C88.64,57.14 88.71,56.48 88.84,55.84C88.97,55.2 89.16,54.57 89.41,53.97C89.66,53.36 89.97,52.78 90.33,52.24C90.7,51.69 91.11,51.18 91.57,50.72C92.04,50.26 92.54,49.84 93.09,49.48C93.63,49.11 94.21,48.81 94.82,48.55C95.42,48.3 96.05,48.11 96.7,47.99C97.34,47.86 97.99,47.79 98.64,47.79C99.3,47.79 99.95,47.86 100.6,47.99C101.24,48.11 101.86,48.3 102.47,48.55C103.08,48.81 103.65,49.11 104.2,49.48C104.75,49.84 105.25,50.26 105.71,50.72C106.18,51.18 106.6,51.69 106.96,52.24C107.33,52.78 107.63,53.36 107.89,53.97C108.14,54.57 108.33,55.2 108.45,55.84C108.58,56.48 108.64,57.14 108.64,57.79Z"/>
+      <path
+          android:pathData="M88.64,67.79V47.79H108.64V67.79H88.64Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
+  <group>
+    <clip-path
+        android:pathData="M40.32,47.24H61.75V68.67H40.32V47.24Z"/>
+    <group>
+      <clip-path
+          android:pathData="M61.35,57.79C61.35,58.45 61.29,59.1 61.16,59.74C61.03,60.38 60.84,61.01 60.59,61.62C60.34,62.23 60.03,62.8 59.67,63.35C59.3,63.9 58.88,64.4 58.42,64.86C57.96,65.33 57.45,65.74 56.91,66.1C56.36,66.47 55.79,66.78 55.18,67.03C54.57,67.28 53.95,67.47 53.3,67.6C52.66,67.73 52.01,67.79 51.35,67.79C50.69,67.79 50.04,67.73 49.4,67.6C48.76,67.47 48.13,67.28 47.52,67.03C46.92,66.78 46.34,66.47 45.79,66.1C45.25,65.74 44.74,65.33 44.28,64.86C43.82,64.4 43.4,63.9 43.04,63.35C42.67,62.8 42.37,62.23 42.11,61.62C41.86,61.01 41.67,60.38 41.55,59.74C41.42,59.1 41.35,58.45 41.35,57.79C41.35,57.14 41.42,56.48 41.55,55.84C41.67,55.2 41.86,54.57 42.11,53.97C42.37,53.36 42.67,52.78 43.04,52.24C43.4,51.69 43.82,51.18 44.28,50.72C44.74,50.26 45.25,49.84 45.79,49.48C46.34,49.11 46.92,48.81 47.52,48.55C48.13,48.3 48.76,48.11 49.4,47.99C50.04,47.86 50.69,47.79 51.35,47.79C52.01,47.79 52.66,47.86 53.3,47.99C53.95,48.11 54.57,48.3 55.18,48.55C55.79,48.81 56.36,49.11 56.91,49.48C57.45,49.84 57.96,50.26 58.42,50.72C58.88,51.18 59.3,51.69 59.67,52.24C60.03,52.78 60.34,53.36 60.59,53.97C60.84,54.57 61.03,55.2 61.16,55.84C61.29,56.48 61.35,57.14 61.35,57.79Z"/>
+      <path
+          android:pathData="M41.35,67.79V47.79H61.35V67.79H41.35Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
+  <path
+      android:pathData="M110.24,114.91C108.89,114.91 107.68,114.03 107.39,112.7C103.9,97.95 90.28,87.25 75.02,87.25C59.76,87.25 46.14,97.95 42.65,112.7C42.3,114.23 40.71,115.19 39.13,114.83C37.54,114.49 36.54,112.95 36.92,111.42C41.03,94.15 57.06,81.58 75.02,81.58C92.98,81.58 109,94.15 113.09,111.45C113.44,112.98 112.47,114.49 110.88,114.85C110.68,114.88 110.44,114.91 110.24,114.91Z"
+      android:fillColor="#ffffff"/>
+</vector>
--- a/app/src/main/res/drawable/sub_check.xml
+++ b/app/src/main/res/drawable/sub_check.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <size android:height="@dimen/_25sdp"
+        android:width="@dimen/_25sdp"/>
+
+    <solid android:color="@color/color_primary"
+        />
+
+</shape>
--- a/app/src/main/res/layout/activity_caregiver_profile.xml
+++ b/app/src/main/res/layout/activity_caregiver_profile.xml
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:overScrollMode="never"
+    android:scrollbars="none"
+    android:background="@color/white"
+    tools:context=".caregiverdashboard.activities.CaregiverProfileActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <ImageView
+            android:id="@+id/back_btn"
+            android:layout_width="35sp"
+            android:layout_height="35sp"
+            android:layout_margin="15dp"
+            android:contentDescription="@string/back_button"
+            android:padding="5dp"
+            android:paddingStart="-15dp"
+            android:paddingEnd="0dp"
+            android:src="@drawable/arrow_back" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="5dp"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/nunito_medium"
+                android:text="@string/profile"
+                android:textSize="@dimen/_18ssp"
+                android:textColor="@color/black" />
+
+            <ImageView
+                android:id="@+id/edit_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:contentDescription="@string/edit_contact"
+                android:padding="5dp"
+                android:src="@drawable/ic_edit_outline" />
+
+        </RelativeLayout>
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="35dp"
+            android:layout_marginBottom="20dp"
+            app:cardCornerRadius="@dimen/_50sdp"
+            app:strokeColor="@color/color_accent"
+            app:strokeWidth="1dp"
+            >
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="@dimen/_100sdp"
+                android:layout_height="@dimen/_100sdp"
+                android:contentDescription="@string/onboard_image"
+                android:src="@drawable/ic_contact" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="5dp"
+
+            android:maxLines="1"
+            android:ems="8"
+            android:textAlignment="center"
+            android:ellipsize="end"
+
+            android:fontFamily="@font/nunito_bold"
+            tools:text="@string/aditya_gaikwad"
+            android:textSize="@dimen/_18ssp"
+            android:textColor="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/call_btn"
+                android:layout_width="@dimen/_30sdp"
+                android:layout_height="@dimen/_30sdp"
+                android:contentDescription="@string/phone_number"
+                android:src="@drawable/ic_phone_img" />
+
+            <TextView
+                android:id="@+id/phone_number"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="4"
+                android:fontFamily="@font/nunito_medium"
+                android:textSize="@dimen/_16ssp"
+                android:textColor="@color/black"
+
+                android:layout_marginStart="5dp"
+
+                android:maxLines="1"
+                android:ellipsize="end"
+
+                tools:text="@string/_918208401763" />
+
+        </LinearLayout>
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+
+            app:strokeWidth="1dp"
+            app:strokeColor="@color/color_accent"
+
+            app:cardCornerRadius="15dp"
+            app:cardElevation="2dp"
+            >
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="15dp"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/email_icon"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+
+                    android:layout_marginTop="5dp"
+
+                    android:src="@drawable/ic_email_outline"
+                    />
+
+                <TextView
+                    android:id="@+id/email_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="@string/email_address_"
+                    android:fontFamily="@font/nunito_bold"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_14ssp"
+
+                    android:layout_marginStart="15dp"
+
+                    android:layout_toEndOf="@id/email_icon"
+
+                    />
+
+                <TextView
+                    android:id="@+id/email"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    tools:text="google123@gmail.com"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_12ssp"
+
+                    android:layout_below="@id/email_title"
+                    android:layout_alignStart="@id/email_title"
+
+                    />
+
+                <ImageView
+                    android:id="@+id/dob_icon"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+
+                    android:layout_marginTop="5dp"
+
+                    android:src="@drawable/ic_dob_outline"
+                    android:layout_alignTop="@id/dob_title"
+                    />
+
+                <TextView
+                    android:id="@+id/dob_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="@string/date_of_birth_"
+                    android:fontFamily="@font/nunito_bold"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_14ssp"
+
+                    android:layout_marginStart="15dp"
+
+                    android:layout_toEndOf="@id/dob_icon"
+
+                    android:layout_below="@id/email"
+
+                    android:layout_marginTop="15dp"
+
+                    />
+
+                <TextView
+                    android:id="@+id/dob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    tools:text="12 - 2 - 1994"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_12ssp"
+
+                    android:layout_below="@id/dob_title"
+                    android:layout_alignStart="@id/dob_title"
+
+                    />
+
+            </RelativeLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/change_pwd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+
+            app:strokeWidth="1dp"
+            app:strokeColor="@color/color_accent"
+
+            app:cardCornerRadius="15dp"
+            app:cardElevation="2dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                >
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    android:text="@string/change_password"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textSize="@dimen/_16ssp"
+                    android:textColor="@color/black"
+
+                    android:layout_marginVertical="15dp"
+
+                    android:layout_toStartOf="@id/btn_1"
+
+                    android:maxLines="1"
+                    android:ellipsize="end"
+
+                    />
+
+                <ImageView
+                    android:id="@+id/btn_1"
+                    android:layout_width="@dimen/_25sdp"
+                    android:layout_height="@dimen/_25sdp"
+
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+
+                    android:src="@drawable/ic_next"
+                    app:tint="#043E61" />
+
+            </RelativeLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/change_pin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+
+            app:strokeWidth="1dp"
+            app:strokeColor="@color/color_accent"
+
+            app:cardCornerRadius="15dp"
+            app:cardElevation="2dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                >
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    android:text="@string/change_pin"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textSize="@dimen/_16ssp"
+                    android:textColor="@color/black"
+
+                    android:layout_marginVertical="15dp"
+
+                    android:layout_toStartOf="@id/btn_2"
+
+                    android:maxLines="1"
+                    android:ellipsize="end"
+
+                    />
+
+                <ImageView
+                    android:id="@+id/btn_2"
+                    android:layout_width="@dimen/_25sdp"
+                    android:layout_height="@dimen/_25sdp"
+
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+
+                    android:src="@drawable/ic_next"
+                    app:tint="#043E61" />
+
+            </RelativeLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="15dp"
+
+            app:strokeWidth="1dp"
+            app:strokeColor="@color/color_accent"
+
+            app:cardCornerRadius="15dp"
+            app:cardElevation="2dp"
+
+            >
+
+            <LinearLayout
+                android:id="@+id/caregiver_check_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginVertical="5dp"
+                android:weightSum="10"
+                android:gravity="center_vertical"
+                >
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="7"
+                    android:text="@string/biometric_lock"
+                    android:fontFamily="@font/nunito_medium"
+                    android:textSize="@dimen/_16ssp"
+                    android:textColor="@color/black"/>
+
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/biometric_check"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="3"
+                    android:layout_gravity="center_vertical"
+
+                    app:switchMinWidth="60dp"
+
+                    app:track="@drawable/switch_track_1"
+                    app:thumbTint="@color/color_primary"
+                    app:showText="false"
+                    />
+
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+    </LinearLayout>
+
+</ScrollView>
--- a/app/src/main/res/layout/activity_cg_settings.xml
+++ b/app/src/main/res/layout/activity_cg_settings.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:overScrollMode="never"
+    android:scrollbars="none"
+    android:background="@color/white"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/back_btn"
+            android:layout_width="35sp"
+            android:layout_height="35sp"
+            android:layout_margin="15dp"
+            android:contentDescription="@string/back_button"
+            android:padding="5dp"
+            android:paddingStart="-15dp"
+            android:paddingEnd="0dp"
+            android:src="@drawable/arrow_back" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="5dp"
+            android:fontFamily="@font/nunito_medium"
+            android:text="@string/settings"
+            android:textSize="@dimen/_18ssp"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:text="@string/setup_alert_notification"
+            android:fontFamily="@font/nunito_medium"
+            android:textColor="@color/black"
+            android:textSize="@dimen/_14ssp"
+
+            android:gravity="center_vertical"
+
+            android:layout_marginTop="25dp"
+            android:layout_marginHorizontal="15dp"
+
+            android:background="@drawable/edit_text_bg_2"
+            android:paddingHorizontal="15dp"
+            android:paddingVertical="15dp"
+
+            android:elevation="3dp"
+
+            android:drawablePadding="15dp"
+            app:drawableStartCompat="@drawable/ic_notification" />
+
+        <TextView
+            android:id="@+id/de_activate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:text="@string/delete_account"
+            android:fontFamily="@font/nunito_medium"
+            android:textColor="@color/black"
+            android:textSize="@dimen/_14ssp"
+
+            android:gravity="center_vertical"
+
+            android:layout_marginTop="25dp"
+            android:layout_marginHorizontal="15dp"
+
+            android:background="@drawable/edit_text_bg_2"
+            android:paddingHorizontal="15dp"
+            android:paddingVertical="15dp"
+
+            android:elevation="3dp"
+
+            android:drawablePadding="15dp"
+            app:drawableStartCompat="@drawable/ic_alert" />
+
+        <TextView
+            android:id="@+id/logout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:text="@string/logout"
+            android:fontFamily="@font/nunito_medium"
+            android:textColor="#EA3829"
+            android:textSize="@dimen/_14ssp"
+
+            android:gravity="center_vertical"
+
+            android:layout_marginVertical="25dp"
+            android:layout_marginHorizontal="15dp"
+
+            android:background="@drawable/edit_text_bg_2"
+            android:paddingHorizontal="15dp"
+            android:paddingVertical="15dp"
+
+            android:elevation="3dp"
+
+            android:drawablePadding="15dp"
+            app:drawableStartCompat="@drawable/ic_log_out" />
+
+    </LinearLayout>
+
+</ScrollView>
--- a/app/src/main/res/layout/activity_contact_admin.xml
+++ b/app/src/main/res/layout/activity_contact_admin.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:overScrollMode="never"
+    android:scrollbars="none"
+    android:background="@color/white"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/back_btn"
+            android:layout_width="35sp"
+            android:layout_height="35sp"
+            android:layout_margin="15dp"
+            android:contentDescription="@string/back_button"
+            android:padding="5dp"
+            android:paddingStart="-15dp"
+            android:paddingEnd="0dp"
+            android:src="@drawable/arrow_back" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="5dp"
+            android:fontFamily="@font/nunito_medium"
+            android:text="@string/contact_admin_"
+            android:textSize="@dimen/_18ssp"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/topic"
+            android:fontFamily="@font/nunito_medium"
+            android:textColor="@color/black"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:layout_gravity="start"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="35sp"
+            />
+
+        <EditText
+            android:id="@+id/topic"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/edit_text_bg_2"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+
+            android:hint="@string/enter_the_topic"
+            android:fontFamily="@font/nunito_regular"
+            android:textColor="@color/black"
+            android:textColorHint="@android:color/darker_gray"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+            android:paddingVertical="15dp"
+            android:padding="10dp"
+
+            android:drawableStart="@drawable/ic_description"
+            android:drawablePadding="10dp"
+
+            android:inputType="textCapSentences"
+
+            android:maxLines="1"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/query_of_concern"
+            android:fontFamily="@font/nunito_medium"
+            android:textColor="@color/black"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:layout_gravity="start"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+            />
+
+        <EditText
+            android:id="@+id/query"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/edit_text_bg_2"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+
+            android:hint="@string/enter_your_query_of_concern"
+            android:fontFamily="@font/nunito_regular"
+            android:textColor="@color/black"
+            android:textColorHint="@android:color/darker_gray"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+            android:paddingVertical="15dp"
+            android:padding="10dp"
+
+            android:drawableStart="@drawable/ic_question"
+            android:drawablePadding="10dp"
+
+            android:inputType="textCapSentences|textMultiLine"
+
+            android:maxHeight="150dp"
+
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/description"
+            android:fontFamily="@font/nunito_medium"
+            android:textColor="@color/black"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:layout_gravity="start"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+            />
+
+        <EditText
+            android:id="@+id/description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/edit_text_bg_2"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+
+            android:hint="@string/enter_description"
+            android:fontFamily="@font/nunito_regular"
+            android:textColor="@color/black"
+            android:textColorHint="@android:color/darker_gray"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+            android:paddingVertical="15dp"
+            android:padding="10dp"
+
+            android:drawableStart="@drawable/ic_description_2"
+            android:drawablePadding="10dp"
+
+            android:inputType="textCapSentences|textMultiLine"
+
+            android:maxHeight="150dp"
+
+            />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/submit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="25dp"
+            android:layout_marginHorizontal="15dp"
+            android:backgroundTint="@color/color_primary"
+            android:text="@string/submit"
+            android:textColor="@color/white_bg"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:textAllCaps="false"
+            android:paddingVertical="15dp"
+            app:cornerRadius="10dp"
+
+            />
+
+    </LinearLayout>
+
+</ScrollView>
--- a/app/src/main/res/layout/activity_deactivate_acc.xml
+++ b/app/src/main/res/layout/activity_deactivate_acc.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+
+    <ScrollView
+        android:id="@+id/second_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="15dp"
+        android:background="@drawable/edit_text_bg_4"
+        android:overScrollMode="never"
+        android:scrollbars="none"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="15dp"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="15dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:fontFamily="@font/nunito_bold"
+                android:text="@string/reason_for_leaving"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_18ssp"
+
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:fontFamily="@font/nunito_regular"
+                android:text="@string/please_select_from_below_the_possible_reasons"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_14ssp"
+
+                android:textAlignment="center"
+
+                android:layout_marginTop="25dp"
+
+                />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="Reason 1"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_14ssp"
+
+                    android:background="@drawable/edit_text_bg_2"
+                    android:paddingHorizontal="15dp"
+                    android:paddingVertical="5dp"
+                    android:layout_marginVertical="5dp"
+                    android:layout_marginHorizontal="5dp"
+
+                    android:elevation="3dp"
+
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="Reason 2"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_14ssp"
+
+                    android:background="@drawable/edit_text_bg_2"
+                    android:paddingHorizontal="15dp"
+                    android:paddingVertical="5dp"
+                    android:layout_marginVertical="5dp"
+                    android:layout_marginEnd="5dp"
+
+                    android:layout_marginStart="15dp"
+
+                    android:elevation="3dp"
+
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:text="@string/or"
+                android:textColor="#1B6DC1"
+                android:textSize="@dimen/_18ssp"
+                android:fontFamily="@font/nunito_bold"
+
+                android:layout_marginVertical="25dp"
+
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:fontFamily="@font/nunito_semibold"
+                android:text="@string/tell_us_why_you_are_leaving"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_14ssp"
+
+                android:layout_gravity="start"
+
+                />
+
+            <EditText
+                android:id="@+id/reason_input"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/_150sdp"
+
+                android:background="@drawable/edit_text_bg_2"
+                android:layout_marginTop="5dp"
+
+                android:hint="@string/enter_your_reason_here"
+                android:fontFamily="@font/nunito_regular"
+                android:textColor="@color/black"
+                android:textColorHint="@android:color/darker_gray"
+
+                android:gravity="top"
+
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="5dp"
+
+                android:inputType="textMultiLine|textCapSentences"
+
+                />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/dont_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="50dp"
+                android:layout_marginBottom="25dp"
+                android:backgroundTint="@color/color_primary"
+                android:paddingVertical="15dp"
+                android:text="@string/do_not_deactivate"
+                android:textAllCaps="false"
+                android:textColor="@color/white_bg"
+                android:textSize="@dimen/_12ssp"
+                app:cornerRadius="50dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/confirm_deactivate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginBottom="25dp"
+                android:backgroundTint="@color/white"
+                android:paddingVertical="15dp"
+                android:text="@string/confirm_deactivation"
+                android:textAllCaps="false"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_12ssp"
+                app:cornerRadius="50dp"
+                app:strokeColor="@color/color_accent"
+                app:strokeWidth="1dp" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <ScrollView
+        android:id="@+id/first_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="15dp"
+        android:background="@drawable/edit_text_bg_4"
+        android:overScrollMode="never"
+        android:scrollbars="none"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="15dp"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="15dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:fontFamily="@font/nunito_bold"
+                android:text="@string/sad_to_see_you_go"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_18ssp"
+
+                />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:layout_marginVertical="25dp"
+                android:src="@drawable/ic_sad"
+
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:layout_marginHorizontal="15dp"
+                android:fontFamily="@font/nunito_regular"
+                android:text="@string/lorem_ipsum_has_been_the_industry_s_standard_dummy_text_ever_since_the_1500s_when_an_unknown_printer_took_a_galley_of_type_and_scrambled_it_to_make_a_type"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+
+                android:textSize="@dimen/_14ssp"
+
+                />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/dont"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="50dp"
+                android:layout_marginBottom="25dp"
+                android:backgroundTint="@color/color_primary"
+                android:paddingVertical="15dp"
+                android:text="@string/i_don_t_want_to_deactivate"
+                android:textAllCaps="false"
+                android:textColor="@color/white_bg"
+                android:textSize="@dimen/_12ssp"
+                app:cornerRadius="50dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/doit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginBottom="25dp"
+                android:backgroundTint="@color/white"
+                android:paddingVertical="15dp"
+                android:text="@string/yes_i_am_ready_to_deactivate_my_account"
+                android:textAllCaps="false"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_12ssp"
+                app:cornerRadius="50dp"
+                app:strokeColor="@color/color_accent"
+                app:strokeWidth="1dp" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</RelativeLayout>
--- a/app/src/main/res/layout/activity_personal_info.xml
+++ b/app/src/main/res/layout/activity_personal_info.xml
@@ -256,217 +256,225 @@
                android:inputType="textEmailAddress"
                />

-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/home_address"
-                android:layout_marginHorizontal="15dp"
-                android:layout_marginTop="15dp"
-                android:textColor="@color/black"
-                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                android:fontFamily="@font/nunito_medium"
-                />
-
            <LinearLayout
+                android:id="@+id/address_view"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:orientation="vertical">

-                android:orientation="horizontal"
-
-                android:background="@drawable/edit_text_bg_2"
-                android:layout_marginHorizontal="15dp"
-                android:focusable="false"
-                android:layout_marginVertical="10dp">
-
-                <ImageView
+                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/medication_type"
-
-                    app:srcCompat="@drawable/ic_home"
-
-                    android:layout_marginVertical="10dp"
-                    android:layout_marginStart="10dp"
-
-                    />
-
-                <com.skydoves.powerspinner.PowerSpinnerView
-                    android:id="@+id/country_spinner"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-
-                    android:background="@color/white_bg"
-
-                    android:gravity="center_vertical"
-
-                    android:padding="10dp"
+                    android:text="@string/home_address"
+                    android:layout_marginHorizontal="15dp"
+                    android:layout_marginTop="15dp"
                    android:textColor="@color/black"
                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:fontFamily="@font/nunito_medium"
+                    />

-                    android:hint="@string/enter_your_country"
-                    android:textColorHint="#A1A1A1"
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"

-                    app:spinner_arrow_drawable="@drawable/ic_down"
+                    android:orientation="horizontal"

-                    app:spinner_popup_max_height="200dp"
-                    app:spinner_arrow_animate="true"
-                    app:fontFamily="@font/nunito_regular"
+                    android:background="@drawable/edit_text_bg_2"
+                    android:layout_marginHorizontal="15dp"
+                    android:focusable="false"
+                    android:layout_marginVertical="10dp">

-                    android:layout_marginVertical="5dp"
-                    android:layout_marginEnd="5dp"
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/medication_type"

-                    app:spinner_arrow_gravity="end"
-                    app:spinner_arrow_padding="8dp"
-                    app:spinner_arrow_tint="@color/black"
-                    app:spinner_divider_show="true"
-                    app:spinner_divider_size="0.4dp"
-                    app:spinner_divider_color="@color/black"
-                    app:spinner_item_height="46dp"
-                    app:spinner_popup_animation="dropdown"
-                    app:spinner_popup_background="@drawable/edit_text_bg_2"
-                    app:spinner_popup_elevation="14dp"
+                        app:srcCompat="@drawable/ic_home"

+                        android:layout_marginVertical="10dp"
+                        android:layout_marginStart="10dp"
+
+                        />
+
+                    <com.skydoves.powerspinner.PowerSpinnerView
+                        android:id="@+id/country_spinner"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+
+                        android:background="@color/white_bg"
+
+                        android:gravity="center_vertical"
+
+                        android:padding="10dp"
+                        android:textColor="@color/black"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                        android:hint="@string/enter_your_country"
+                        android:textColorHint="#A1A1A1"
+
+                        app:spinner_arrow_drawable="@drawable/ic_down"
+
+                        app:spinner_popup_max_height="200dp"
+                        app:spinner_arrow_animate="true"
+                        app:fontFamily="@font/nunito_regular"
+
+                        android:layout_marginVertical="5dp"
+                        android:layout_marginEnd="5dp"
+
+                        app:spinner_arrow_gravity="end"
+                        app:spinner_arrow_padding="8dp"
+                        app:spinner_arrow_tint="@color/black"
+                        app:spinner_divider_show="true"
+                        app:spinner_divider_size="0.4dp"
+                        app:spinner_divider_color="@color/black"
+                        app:spinner_item_height="46dp"
+                        app:spinner_popup_animation="dropdown"
+                        app:spinner_popup_background="@drawable/edit_text_bg_2"
+                        app:spinner_popup_elevation="14dp"
+
+                        />
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/street"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/edit_text_bg_2"
+                    android:layout_marginHorizontal="15dp"
+                    android:layout_marginVertical="10dp"
+
+                    android:hint="@string/enter_your_street"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textColorHint="@android:color/darker_gray"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:paddingVertical="5dp"
+                    tools:text="Aditya"
+                    android:padding="10dp"
+
+                    android:drawableStart="@drawable/ic_home"
+                    android:drawablePadding="10dp"
+
+                    android:autofillHints="postalAddress"
+                    android:inputType="text|textCapSentences"
+                    />
+
+                <EditText
+                    android:id="@+id/town"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/edit_text_bg_2"
+                    android:layout_marginHorizontal="15dp"
+                    android:layout_marginVertical="10dp"
+
+                    android:hint="@string/enter_your_town"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textColorHint="@android:color/darker_gray"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:paddingVertical="5dp"
+                    android:padding="10dp"
+
+                    android:drawableStart="@drawable/ic_home"
+                    android:drawablePadding="10dp"
+
+                    android:autofillHints="postalAddress"
+                    android:inputType="text|textCapSentences"
+                    />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    android:orientation="horizontal"
+                    android:focusable="false"
+                    android:background="@drawable/edit_text_bg_2"
+                    android:layout_marginHorizontal="15dp"
+                    android:layout_marginVertical="10dp">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/medication_type"
+
+                        app:srcCompat="@drawable/ic_home"
+
+                        android:layout_marginVertical="10dp"
+                        android:layout_marginStart="10dp"
+
+                        />
+
+                    <com.skydoves.powerspinner.PowerSpinnerView
+                        android:id="@+id/state_spinner"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+
+                        android:background="@color/white_bg"
+
+                        android:gravity="center_vertical"
+
+                        android:padding="10dp"
+                        android:textColor="@color/black"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                        android:hint="@string/enter_your_state"
+                        android:textColorHint="#A1A1A1"
+
+                        app:spinner_arrow_drawable="@drawable/ic_down"
+
+                        app:spinner_popup_max_height="200dp"
+                        app:spinner_arrow_animate="true"
+                        app:fontFamily="@font/nunito_regular"
+
+                        android:layout_marginVertical="5dp"
+                        android:layout_marginEnd="5dp"
+
+                        app:spinner_arrow_gravity="end"
+                        app:spinner_arrow_padding="8dp"
+                        app:spinner_arrow_tint="@color/black"
+                        app:spinner_divider_show="true"
+                        app:spinner_divider_size="0.4dp"
+                        app:spinner_divider_color="@color/black"
+                        app:spinner_item_height="46dp"
+                        app:spinner_popup_animation="dropdown"
+                        app:spinner_popup_background="@drawable/edit_text_bg_2"
+                        app:spinner_popup_elevation="14dp"
+
+                        />
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/zip_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/edit_text_bg_2"
+                    android:layout_marginHorizontal="15dp"
+                    android:layout_marginVertical="10dp"
+
+                    android:hint="@string/enter_your_zip_code"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textColorHint="@android:color/darker_gray"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:paddingVertical="5dp"
+                    android:padding="10dp"
+
+                    android:drawableStart="@drawable/ic_home"
+                    android:drawablePadding="10dp"
+
+                    android:maxLength="6"
+
+                    android:autofillHints="postalAddress"
+                    android:inputType="number"
                    />

            </LinearLayout>

-            <EditText
-                android:id="@+id/street"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/edit_text_bg_2"
-                android:layout_marginHorizontal="15dp"
-                android:layout_marginVertical="10dp"
-
-                android:hint="@string/enter_your_street"
-                android:fontFamily="@font/nunito_regular"
-                android:textColor="@color/black"
-                android:textColorHint="@android:color/darker_gray"
-                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-
-                android:paddingVertical="5dp"
-                tools:text="Aditya"
-                android:padding="10dp"
-
-                android:drawableStart="@drawable/ic_home"
-                android:drawablePadding="10dp"
-
-                android:autofillHints="postalAddress"
-                android:inputType="text|textCapSentences"
-                />
-
-            <EditText
-                android:id="@+id/town"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/edit_text_bg_2"
-                android:layout_marginHorizontal="15dp"
-                android:layout_marginVertical="10dp"
-
-                android:hint="@string/enter_your_town"
-                android:fontFamily="@font/nunito_regular"
-                android:textColor="@color/black"
-                android:textColorHint="@android:color/darker_gray"
-                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-
-                android:paddingVertical="5dp"
-                android:padding="10dp"
-
-                android:drawableStart="@drawable/ic_home"
-                android:drawablePadding="10dp"
-
-                android:autofillHints="postalAddress"
-                android:inputType="text|textCapSentences"
-                />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-
-                android:orientation="horizontal"
-                android:focusable="false"
-                android:background="@drawable/edit_text_bg_2"
-                android:layout_marginHorizontal="15dp"
-                android:layout_marginVertical="10dp">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/medication_type"
-
-                    app:srcCompat="@drawable/ic_home"
-
-                    android:layout_marginVertical="10dp"
-                    android:layout_marginStart="10dp"
-
-                    />
-
-                <com.skydoves.powerspinner.PowerSpinnerView
-                    android:id="@+id/state_spinner"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-
-                    android:background="@color/white_bg"
-
-                    android:gravity="center_vertical"
-
-                    android:padding="10dp"
-                    android:textColor="@color/black"
-                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-
-                    android:hint="@string/enter_your_state"
-                    android:textColorHint="#A1A1A1"
-
-                    app:spinner_arrow_drawable="@drawable/ic_down"
-
-                    app:spinner_popup_max_height="200dp"
-                    app:spinner_arrow_animate="true"
-                    app:fontFamily="@font/nunito_regular"
-
-                    android:layout_marginVertical="5dp"
-                    android:layout_marginEnd="5dp"
-
-                    app:spinner_arrow_gravity="end"
-                    app:spinner_arrow_padding="8dp"
-                    app:spinner_arrow_tint="@color/black"
-                    app:spinner_divider_show="true"
-                    app:spinner_divider_size="0.4dp"
-                    app:spinner_divider_color="@color/black"
-                    app:spinner_item_height="46dp"
-                    app:spinner_popup_animation="dropdown"
-                    app:spinner_popup_background="@drawable/edit_text_bg_2"
-                    app:spinner_popup_elevation="14dp"
-
-                    />
-
-            </LinearLayout>
-
-            <EditText
-                android:id="@+id/zip_code"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/edit_text_bg_2"
-                android:layout_marginHorizontal="15dp"
-                android:layout_marginVertical="10dp"
-
-                android:hint="@string/enter_your_zip_code"
-                android:fontFamily="@font/nunito_regular"
-                android:textColor="@color/black"
-                android:textColorHint="@android:color/darker_gray"
-                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-
-                android:paddingVertical="5dp"
-                android:padding="10dp"
-
-                android:drawableStart="@drawable/ic_home"
-                android:drawablePadding="10dp"
-
-                android:maxLength="6"
-
-                android:autofillHints="postalAddress"
-                android:inputType="number"
-                />
-
            <com.google.android.material.button.MaterialButton
                android:id="@+id/save"
                android:layout_width="match_parent"
--- a/app/src/main/res/layout/caregiver_dashboard_menu.xml
+++ b/app/src/main/res/layout/caregiver_dashboard_menu.xml
@@ -12,7 +12,7 @@
        android:layout_width="0dp"
        android:layout_height="match_parent"
        android:orientation="vertical"
-        android:layout_weight="7">
+        android:layout_weight="7.5">

        <ImageView
            android:id="@+id/close"
@@ -38,6 +38,7 @@
            />

        <LinearLayout
+            android:id="@+id/cg_profile"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
@@ -140,7 +141,7 @@
                android:text="@string/articles"
                android:fontFamily="@font/nunito_regular"
                android:textColor="@color/white"
-                android:textSize="@dimen/_16ssp"
+                android:textSize="@dimen/_14ssp"

                android:maxLines="1"
                android:ellipsize="end"
@@ -205,7 +206,7 @@
                android:text="@string/faqs"
                android:fontFamily="@font/nunito_regular"
                android:textColor="@color/white"
-                android:textSize="@dimen/_16ssp"
+                android:textSize="@dimen/_14ssp"

                android:maxLines="1"
                android:ellipsize="end"
@@ -226,6 +227,7 @@
        </LinearLayout>

        <LinearLayout
+            android:id="@+id/contact_admin"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
@@ -267,7 +269,7 @@
                android:text="@string/contact_admin"
                android:fontFamily="@font/nunito_regular"
                android:textColor="@color/white"
-                android:textSize="@dimen/_16ssp"
+                android:textSize="@dimen/_14ssp"

                android:maxLines="1"
                android:ellipsize="end"
@@ -288,6 +290,7 @@
        </LinearLayout>

        <LinearLayout
+            android:id="@+id/settings"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
@@ -329,7 +332,7 @@
                android:text="@string/settings"
                android:fontFamily="@font/nunito_regular"
                android:textColor="@color/white"
-                android:textSize="@dimen/_16ssp"
+                android:textSize="@dimen/_14ssp"

                android:maxLines="1"
                android:ellipsize="end"
--- a/app/src/main/res/layout/cg_change_password_fragment.xml
+++ b/app/src/main/res/layout/cg_change_password_fragment.xml
@@ -49,6 +49,64 @@
                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
                android:textColor="@color/black" />

+            <TextView
+                android:id="@+id/old_pwd_title"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginHorizontal="15dp"
+                android:fontFamily="@font/nunito_medium"
+                android:text="@string/old_password"
+                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                android:textColor="@color/black" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/old_pwd_view"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginVertical="15dp"
+
+                app:hintEnabled="false"
+                app:expandedHintEnabled="false"
+                app:hintAnimationEnabled="false"
+
+                android:background="@android:color/transparent"
+
+                app:boxStrokeWidth="0dp"
+                app:boxStrokeWidthFocused="0dp"
+                app:passwordToggleDrawable="@drawable/password_toggle"
+                app:passwordToggleEnabled="true"
+                >
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/old_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/edit_text_bg"
+
+                    android:hint="@string/enter_your_old_password"
+                    android:paddingVertical="15sp"
+                    android:paddingHorizontal="10dp"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textColorHint="#5B5B5B"
+
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:drawableStart="@drawable/ic_lock_outline"
+                    android:drawablePadding="20dp"
+
+                    android:autofillHints="password"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:maxLength="15"
+                    />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
--- a/app/src/main/res/layout/cg_subscription_layout.xml
+++ b/app/src/main/res/layout/cg_subscription_layout.xml
@@ -1,50 +1,312 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/white"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical"
+    android:background="@color/white">

-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/view_pager"
-        android:overScrollMode="never"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/circle_indicator"/>
-
-    <me.relex.circleindicator.CircleIndicator3
-        android:id="@+id/circle_indicator"
-        app:ci_drawable="@drawable/selected_dot_primary"
-        app:ci_drawable_unselected="@drawable/unselected_dot_accent"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/_15sdp"
-
-        android:layout_above="@id/make_payment"
-
-        android:layout_marginVertical="5dp"
-
-        app:ci_width="@dimen/_6sdp"
-        app:ci_height="@dimen/_6sdp"
-
-        />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/make_payment"
+    <androidx.cardview.widget.CardView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="15dp"
-        android:layout_marginTop="5dp"
-        tools:text="Make payment $35.00"
-        android:textAllCaps="false"
-        android:fontFamily="@font/nunito_regular"
-        android:textColor="@color/white_bg"
-        android:paddingVertical="15dp"
-        app:backgroundTint="@color/color_primary"
-        app:cornerRadius="25dp"
-        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-        />

-</RelativeLayout>
+        android:layout_marginHorizontal="15dp"
+
+        android:layout_marginVertical="25dp"
+        app:cardBackgroundColor="#AEE0FF"
+
+        app:cardCornerRadius="25dp"
+
+        >
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="@dimen/_150sdp"
+            android:layout_height="@dimen/_150sdp"
+
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="@dimen/_15sdp"
+            android:layout_marginVertical="@dimen/_15sdp"
+            android:src="@drawable/ic_sub_1" />
+
+    </androidx.cardview.widget.CardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="none"
+                android:overScrollMode="never"
+                android:layout_above="@id/make_payment"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:layout_marginHorizontal="10dp"
+                        android:layout_marginVertical="10dp"
+                        app:cardCornerRadius="15dp"
+
+                        app:strokeColor="@color/color_accent"
+                        app:strokeWidth="1dp"
+
+                        >
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="15dp"
+                            android:layout_marginVertical="10dp">
+
+                            <com.google.android.material.checkbox.MaterialCheckBox
+                                android:id="@+id/year_check"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+
+                                android:fontFamily="@font/nunito_bold"
+                                android:text="@string/year"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_14ssp"
+
+                                app:buttonIcon="@drawable/sub_check"
+
+                                android:padding="10dp"
+
+                                />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+
+                                android:background="@drawable/edit_text_bg"
+                                android:fontFamily="@font/nunito_regular"
+                                android:padding="10dp"
+                                android:text="@string/_25"
+
+                                android:textColor="@color/black"
+
+                                android:textSize="@dimen/_12ssp"
+
+                                android:visibility="visible"
+
+                                />
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/year_check"
+                                android:layout_marginVertical="5dp"
+                                android:orientation="horizontal"
+                                android:visibility="visible">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+
+                                    android:fontFamily="@font/nunito_regular"
+                                    android:text="@string/_71_4"
+                                    android:textColor="@color/black"
+                                    android:textSize="@dimen/_18ssp"
+
+                                    />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+
+                                    android:layout_marginStart="10dp"
+                                    android:fontFamily="@font/nunito_bold"
+                                    android:text="@string/_53_5"
+                                    android:textColor="@color/color_primary_dark"
+
+                                    android:textSize="@dimen/_18ssp"
+
+                                    />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+
+                                    android:layout_marginStart="5dp"
+                                    android:fontFamily="@font/nunito_regular"
+                                    android:text="@string/year_"
+                                    android:textColor="@color/color_primary_dark"
+
+                                    android:textSize="@dimen/_12ssp"
+
+                                    />
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentBottom="true"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+
+                                    android:layout_marginStart="10dp"
+                                    android:fontFamily="@font/nunito_bold"
+                                    android:text="@string/_4_46"
+                                    android:textColor="@color/black"
+
+                                    android:textSize="@dimen/_18ssp"
+
+                                    />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+
+                                    android:layout_marginStart="5dp"
+                                    android:fontFamily="@font/nunito_regular"
+                                    android:text="@string/mo"
+                                    android:textColor="@color/black"
+
+                                    android:textSize="@dimen/_12ssp"
+
+                                    />
+
+                            </LinearLayout>
+
+                        </RelativeLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:layout_marginHorizontal="10dp"
+                        android:layout_marginVertical="10dp"
+                        app:cardCornerRadius="15dp"
+
+                        app:strokeColor="@color/color_accent"
+                        app:strokeWidth="1dp"
+
+                        >
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="15dp"
+                            android:layout_marginVertical="10dp">
+
+                            <com.google.android.material.checkbox.MaterialCheckBox
+                                android:id="@+id/month_check"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+
+                                android:fontFamily="@font/nunito_bold"
+                                android:text="@string/monthly"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_14ssp"
+
+                                />
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentEnd="true"
+                                android:layout_alignParentBottom="true"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+
+                                    android:layout_marginStart="10dp"
+                                    android:fontFamily="@font/nunito_bold"
+                                    android:text="@string/_5_95"
+                                    android:textColor="@color/black"
+
+                                    android:textSize="@dimen/_18ssp"
+
+                                    />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+
+                                    android:layout_marginStart="5dp"
+                                    android:fontFamily="@font/nunito_regular"
+                                    android:text="@string/mo"
+                                    android:textColor="@color/black"
+
+                                    android:textSize="@dimen/_12ssp"
+
+                                    />
+
+                            </LinearLayout>
+
+                        </RelativeLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:text="Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book a galley of type and scrambled it to make a type specimen book a galley of type and scrambled it to make a type specimen book."
+                        android:fontFamily="@font/nunito_regular"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/_12ssp"
+
+                        android:layout_marginHorizontal="15dp"
+                        android:layout_marginVertical="15dp"
+
+                        />
+
+                </LinearLayout>
+
+            </ScrollView>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/make_payment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:layout_alignParentBottom="true"
+
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginVertical="10dp"
+
+                android:fontFamily="@font/nunito_regular"
+
+                android:paddingVertical="12dp"
+                android:text="@string/subscribe"
+                android:textAllCaps="false"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_12ssp"
+
+                app:cornerRadius="25dp"
+
+                />
+
+        </RelativeLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</LinearLayout>
+
+    <!--last code in the commit of 21st august 2023-->
--- a/app/src/main/res/layout/change_pin_fragment.xml
+++ b/app/src/main/res/layout/change_pin_fragment.xml
@@ -42,7 +42,8 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="15dp"
-                android:layout_marginVertical="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="35dp"
                android:fontFamily="@font/nunito_regular"
                android:text="@string/for_your_security_please_change_the_temporary_pin_to_a_new_pin"
                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
@@ -53,7 +54,7 @@
                android:layout_height="wrap_content"
                android:text="@string/new_pin"
                android:layout_gravity="start"
-                android:layout_marginTop="50dp"
+                android:layout_marginTop="15dp"
                android:layout_marginHorizontal="15dp"
                android:fontFamily="@font/nunito_medium"
                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
--- a/app/src/main/res/layout/my_patient_fragment.xml
+++ b/app/src/main/res/layout/my_patient_fragment.xml
@@ -146,6 +146,8 @@
            <ScrollView
                android:layout_width="match_parent"
                android:layout_height="match_parent"
+                android:overScrollMode="never"
+                android:scrollbars="none"
                >

                <LinearLayout
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -334,6 +334,42 @@
    <string name="subscription_plan">Subscription plan</string>
    <string name="geofence">Geofence</string>
    <string name="faq">FAQ</string>
+    <string name="profile">Profile</string>
+    <string name="change_password">Change password</string>
+    <string name="change_pin">Change pin</string>
+    <string name="biometric_lock">Biometric lock</string>
+    <string name="old_password">Old password</string>
+    <string name="enter_your_old_password">Enter your old password</string>
+    <string name="old_pin">Old pin</string>
+    <string name="enter_your_old_pin">Enter your old pin</string>
+    <string name="contact_admin_">Contact Admin</string>
+    <string name="topic">Topic</string>
+    <string name="enter_the_topic">Enter the topic</string>
+    <string name="query_of_concern">Query of concern</string>
+    <string name="enter_your_query_of_concern">Enter your query of concern</string>
+    <string name="description">Description</string>
+    <string name="setup_alert_notification">Setup Alert Notification</string>
+    <string name="delete_account">Delete Account</string>
+    <string name="logout">Logout</string>
+    <string name="sad_to_see_you_go">Sad to see you go</string>
+    <string name="lorem_ipsum_has_been_the_industry_s_standard_dummy_text_ever_since_the_1500s_when_an_unknown_printer_took_a_galley_of_type_and_scrambled_it_to_make_a_type">Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type</string>
+    <string name="i_don_t_want_to_deactivate">I don\'t want to deactivate</string>
+    <string name="yes_i_am_ready_to_deactivate_my_account">Yes I am ready to deactivate my account</string>
+    <string name="reason_for_leaving">Reason for leaving ?</string>
+    <string name="please_select_from_below_the_possible_reasons">Please select from below the possible reasons</string>
+    <string name="tell_us_why_you_are_leaving">Tell us why you are leaving ?</string>
+    <string name="enter_your_reason_here">Enter your reason here\.\.\.</string>
+    <string name="do_not_deactivate">Do Not Deactivate</string>
+    <string name="confirm_deactivation">Confirm Deactivation</string>
+    <string name="year">Yearly</string>
+    <string name="_25">-25% OFF</string>
+    <string name="_71_4"><strike>$71.4</strike></string>
+    <string name="_53_5">$53.5</string>
+    <string name="mo">mo</string>
+    <string name="_4_46">$4.46</string>
+    <string name="monthly">Monthly</string>
+    <string name="_5_95">$5.95</string>
+    <string name="year_">/year</string>

    <string-array name="radius_units">
        <item>Kms</item>