diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index adfcbc8..c65ef8e 100644 --- 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"> + + + + + + + + + android:screenOrientation="portrait" /> @@ -34,7 +62,7 @@ android:exported="false" android:screenOrientation="portrait" /> - - - - + + + + + diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java index 997e3ac..58475c0 100644 --- 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(); } } } diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java new file mode 100644 index 0000000..0f6372f --- /dev/null +++ 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); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverSettingsActivity.java new file mode 100644 index 0000000..213c6d6 --- /dev/null +++ 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); + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgChangePwdActivity.java new file mode 100644 index 0000000..6a2786e --- /dev/null +++ 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); + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java index 4febda8..4e36507 100644 --- 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); }); diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ChangePinActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ChangePinActivity.java new file mode 100644 index 0000000..aaa1b40 --- /dev/null +++ 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()); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java new file mode 100644 index 0000000..205c118 --- /dev/null +++ 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()); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/PatientProfileInfoActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.java similarity index 82% rename from app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/PatientProfileInfoActivity.java rename to app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.java index fc42778..3a46d88 100644 --- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/PatientProfileInfoActivity.java +++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.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 countryList; private HashMap> 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 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 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); } } }); diff --git 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 new file mode 100644 index 0000000..3656458 --- /dev/null +++ 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; + }); + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java index f9fc220..109def7 100644 --- 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); }); diff --git a/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java b/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java index 600d4b1..fc21403 100644 --- 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 diff --git 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 index ad55f4c..df01a1a 100644 --- 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. diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml new file mode 100644 index 0000000..36d5b56 --- /dev/null +++ b/app/src/main/res/drawable/ic_alert.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_description_2.xml b/app/src/main/res/drawable/ic_description_2.xml new file mode 100644 index 0000000..100d4d3 --- /dev/null +++ b/app/src/main/res/drawable/ic_description_2.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_description_2_outline.xml b/app/src/main/res/drawable/ic_description_2_outline.xml new file mode 100644 index 0000000..d9908e5 --- /dev/null +++ b/app/src/main/res/drawable/ic_description_2_outline.xml @@ -0,0 +1,41 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_log_out.xml b/app/src/main/res/drawable/ic_log_out.xml new file mode 100644 index 0000000..0f1c467 --- /dev/null +++ b/app/src/main/res/drawable/ic_log_out.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml index 0cb66a2..e290770 100644 --- a/app/src/main/res/drawable/ic_notification.xml +++ b/app/src/main/res/drawable/ic_notification.xml @@ -1,44 +1,31 @@ + android:width="23.2dp" + android:height="28.2dp" + android:viewportWidth="23.2" + android:viewportHeight="28.2"> + 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"/> + 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"/> + 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"/> + 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"/> - - + 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"/> diff --git a/app/src/main/res/drawable/ic_ques.xml b/app/src/main/res/drawable/ic_ques.xml new file mode 100644 index 0000000..84783cc --- /dev/null +++ b/app/src/main/res/drawable/ic_ques.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_question.xml b/app/src/main/res/drawable/ic_question.xml new file mode 100644 index 0000000..cbd14d3 --- /dev/null +++ b/app/src/main/res/drawable/ic_question.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_sad.xml b/app/src/main/res/drawable/ic_sad.xml new file mode 100644 index 0000000..f13bee1 --- /dev/null +++ b/app/src/main/res/drawable/ic_sad.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/sub_check.xml b/app/src/main/res/drawable/sub_check.xml new file mode 100644 index 0000000..1aa59b9 --- /dev/null +++ b/app/src/main/res/drawable/sub_check.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_caregiver_profile.xml b/app/src/main/res/layout/activity_caregiver_profile.xml new file mode 100644 index 0000000..5dacfc4 --- /dev/null +++ b/app/src/main/res/layout/activity_caregiver_profile.xml @@ -0,0 +1,397 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cg_settings.xml b/app/src/main/res/layout/activity_cg_settings.xml new file mode 100644 index 0000000..74411bb --- /dev/null +++ b/app/src/main/res/layout/activity_cg_settings.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_contact_admin.xml b/app/src/main/res/layout/activity_contact_admin.xml new file mode 100644 index 0000000..0903aee --- /dev/null +++ b/app/src/main/res/layout/activity_contact_admin.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_deactivate_acc.xml b/app/src/main/res/layout/activity_deactivate_acc.xml new file mode 100644 index 0000000..77c697e --- /dev/null +++ b/app/src/main/res/layout/activity_deactivate_acc.xml @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_personal_info.xml b/app/src/main/res/layout/activity_personal_info.xml index 9a2d0fd..9c0bbfb 100644 --- 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" /> - - - android:orientation="horizontal" - - android:background="@drawable/edit_text_bg_2" - android:layout_marginHorizontal="15dp" - android:focusable="false" - android:layout_marginVertical="10dp"> - - - - - android:hint="@string/enter_your_country" - android:textColorHint="#A1A1A1" + - android:layout_marginVertical="5dp" - android:layout_marginEnd="5dp" + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + android:layout_weight="7.5"> + + + + + + + + - + android:orientation="vertical" + android:background="@color/white"> - - - - - - \ No newline at end of file + android:layout_marginHorizontal="15dp" + + android:layout_marginVertical="25dp" + app:cardBackgroundColor="#AEE0FF" + + app:cardCornerRadius="25dp" + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/change_pin_fragment.xml b/app/src/main/res/layout/change_pin_fragment.xml index 6b8667f..3fba956 100644 --- 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" diff --git a/app/src/main/res/layout/my_patient_fragment.xml b/app/src/main/res/layout/my_patient_fragment.xml index c7e6ff0..2f74f6b 100644 --- a/app/src/main/res/layout/my_patient_fragment.xml +++ b/app/src/main/res/layout/my_patient_fragment.xml @@ -146,6 +146,8 @@ Subscription plan Geofence FAQ + Profile + Change password + Change pin + Biometric lock + Old password + Enter your old password + Old pin + Enter your old pin + Contact Admin + Topic + Enter the topic + Query of concern + Enter your query of concern + Description + Setup Alert Notification + Delete Account + Logout + Sad to see you go + 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 + I don\'t want to deactivate + Yes I am ready to deactivate my account + Reason for leaving ? + Please select from below the possible reasons + Tell us why you are leaving ? + Enter your reason here\.\.\. + Do Not Deactivate + Confirm Deactivation + Yearly + -25% OFF + $71.4 + $53.5 + mo + $4.46 + Monthly + $5.95 + /year Kms