diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java index 0b457b1..c0e436d 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java @@ -233,6 +233,7 @@ public class CaregiverDashActivity extends AppCompatActivity implements } menuBinding.name.setText(careGiverData.first_name); + if (careGiverData.profile_photo != null) { Glide.with(this) .load(AppUtil.IMAGE_BASE_URL + careGiverData.profile_photo) @@ -258,6 +259,15 @@ public class CaregiverDashActivity extends AppCompatActivity implements } } + String patient_name; + try { + patient_name = careGiverData.patientDetails.first_name.split(" ")[0]; + } catch (Exception e) { + patient_name = careGiverData.patientDetails.first_name; + } + + binding.bottomNav.setChatWithTxt("Chat with " + patient_name); + binding.bottomNav.setMyPatient(patient_name); } private void replaceFragment(Fragment fragment, String tag) { diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java index c42e9ca..dfa22aa 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CgProfileProgressActivity.java @@ -112,7 +112,7 @@ public class CgProfileProgressActivity extends AppCompatActivity implements CgHo binding.fua.setOnClickListener(v -> { AppUtil.showAlert(this, "App Whitelist", - "You can whitelist app from the patients device.", + "You can whitelist app from the patient's device.", getString(R.string.ok), ((dialogInterface, i) -> {}), null, null); diff --git a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java index f108941..d064bda 100644 --- a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java +++ b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java @@ -28,6 +28,9 @@ import com.app.simplitend.cg_subscription.mvp.SubscriptionPresenter; import com.app.simplitend.databinding.CgSubscriptionLayoutBinding; import com.app.simplitend.welcome.welcomecg.mvvm.CareGiverData; import com.stripe.android.PaymentConfiguration; +import com.stripe.android.model.PaymentMethod; +import com.stripe.android.paymentsheet.CreateIntentCallback; +import com.stripe.android.paymentsheet.CreateIntentResult; import com.stripe.android.paymentsheet.PaymentSheet; import com.stripe.android.paymentsheet.PaymentSheetResult; @@ -37,6 +40,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import kotlin.coroutines.Continuation; import okhttp3.MediaType; import okhttp3.RequestBody; @@ -77,10 +81,11 @@ public class CgSubscriptionActivity extends AppCompatActivity this.careGiverData = careGiverData; if (careGiverData != null){ + if (careGiverData.isCaregiverTakeSubscription != 1){ // not subscribed thus, load plans loadPlans(); - paymentSheet = new PaymentSheet(this, this::onPaymentSheetResult); + paymentSheet = new PaymentSheet(this, this::onPaymentSheetResult); }else{ // Already subscribed thus, loading current plans loadCurrentPlans(); @@ -320,6 +325,7 @@ public class CgSubscriptionActivity extends AppCompatActivity RequestBody price_id_body = RequestBody.create(this.stripe_price_id, MediaType.parse("text/plain")); bodyMap.put("price_id", price_id_body); + presenter.createSubscription(bodyMap, "Bearer " + AppUtil.getCgToken(this), this); @@ -460,6 +466,7 @@ public class CgSubscriptionActivity extends AppCompatActivity credentials.customerId, credentials.ephemeralKey ); + String paymentIntentClientSecret = credentials.paymentIntent; PaymentConfiguration.init(getApplicationContext(), credentials.stripe_publish_key); @@ -470,6 +477,7 @@ public class CgSubscriptionActivity extends AppCompatActivity .customer(customerConfig) .allowsDelayedPaymentMethods(true) .build(); + paymentSheet.presentWithPaymentIntent( paymentIntentClientSecret, configuration diff --git a/app/src/main/java/com/app/simplitend/customsviews/HomeBottomNav.java b/app/src/main/java/com/app/simplitend/customsviews/HomeBottomNav.java index fcc120b..e1eafe6 100644 --- a/app/src/main/java/com/app/simplitend/customsviews/HomeBottomNav.java +++ b/app/src/main/java/com/app/simplitend/customsviews/HomeBottomNav.java @@ -5,6 +5,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -20,6 +21,8 @@ public class HomeBottomNav extends FrameLayout { private FloatingActionButton dashBtnBig, patientBig, chatsBig; private LinearLayout dashSmall, patientSmall, chatsSmall; + private TextView chatWithTxt, myPatientTxt; + // fields private MenuItem selected_item = MenuItem.DASHBOARD; @@ -53,6 +56,9 @@ public class HomeBottomNav extends FrameLayout { chatsBig = view.findViewById(R.id.chat_big); chatsSmall = view.findViewById(R.id.chats_small); + chatWithTxt = view.findViewById(R.id.chat_with); + myPatientTxt = view.findViewById(R.id.my_patient); + clickEvents(); } @@ -83,6 +89,18 @@ public class HomeBottomNav extends FrameLayout { this.itemSelectListener = itemSelectListener; } + public void setMyPatient(String myPatient){ + if (myPatient != null && myPatientTxt != null){ + myPatientTxt.setText(myPatient); + } + } + + public void setChatWithTxt(String chatWith){ + if (chatWith != null && chatWithTxt != null){ + chatWithTxt.setText(chatWith); + } + } + public void selectMenuItem(MenuItem menuitem){ clearItemSelection(this.selected_item); diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java index 645974b..405e99f 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/DashBoardActivity.java @@ -135,7 +135,6 @@ public class DashBoardActivity extends AppCompatActivity implements CgHomeContra public void onGeofenceDetailsFetched(@NonNull GeoFenceDetails geoFenceDetails) { validateAndAddGeofence(geoFenceDetails); } - @Override public void onGeofenceDetailsFetchFailed(Throwable throwable, String message) { Log.d(GEOFENCE_TAG, "onGeofenceDetailsFetchFailed: " + message); diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java index 4ab9ba2..c8f8c94 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/NotificationsActivity.java @@ -66,6 +66,20 @@ public class NotificationsActivity extends AppCompatActivity implements Callback token = getIntent().getStringExtra(USER_TOKEN); isCaregiver = getIntent().getBooleanExtra(IS_CAREGIVER, false); + initViews(); + + clickEvents(); + + page_no = 1; // loading first page + loadNotifications(false); + + } + + private void clickEvents() { + binding.backBtn.setOnClickListener(v -> onBackPressed()); + } + + private void initViews() { binding.notificationRv.setLayoutManager(new LinearLayoutManager(this)); notificationsAdapter = new NotificationsAdapter(); binding.notificationRv.setAdapter(notificationsAdapter); @@ -89,10 +103,6 @@ public class NotificationsActivity extends AppCompatActivity implements Callback } } }); - - page_no = 1; // loading first page - loadNotifications(false); - } private void loadNotifications(boolean show_bottom_progress) { @@ -216,6 +226,34 @@ public class NotificationsActivity extends AppCompatActivity implements Callback if (notification == null) return; binding.description.setText(notification.description); + + // 0-> medcine , 1-> activity , 2-> outofgeofence, 3-> reuqestedDirection , 4-> SOS , 5-> location , 6- radius add or update + int imageRes = -1; + + switch (notification.type){ + case "0": + imageRes = R.drawable.ic_med_noti; + break; + case "1": + imageRes = R.drawable.ic_activity_not; + break; + case "2": + case "5": + imageRes = R.drawable.ic_geofence_noti; + break; + case "3": + case "6": + imageRes = R.drawable.ic_home_noti; + break; + case "4": + imageRes = R.drawable.ic_sos_noti; + break; + } + + if (imageRes != -1) { + binding.image.setImageResource(imageRes); + binding.imageCard.setCardBackgroundColor(itemView.getContext().getColor(R.color.color_accent)); + } } } } diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/PatientMainViewModel.java b/app/src/main/java/com/app/simplitend/patient_dashboard/PatientMainViewModel.java index 90d3de2..ab8a1bf 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/PatientMainViewModel.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/PatientMainViewModel.java @@ -104,7 +104,7 @@ public class PatientMainViewModel extends ViewModel { LocationRequest locationRequest = new LocationRequest(); locationRequest.setInterval(10_000); - locationRequest.setSmallestDisplacement(100); + locationRequest.setSmallestDisplacement(15); locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY); Intent intent = new Intent(activity, PatientLocationUpdatesReceiver.class); diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java index be05c13..2005596 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java @@ -163,6 +163,10 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac .error(R.drawable.senior_img) .into(binding.profile); } + + if (patientData.caregiver_name != null){ + binding.chatWith.setText("Chat with " + patientData.caregiver_name); + } } private void initViews() { diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgSignInFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgSignInFragment.java index 0c04c0f..f439a1e 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgSignInFragment.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgSignInFragment.java @@ -9,6 +9,7 @@ import static com.app.simplitend.welcome.welcomepatient.fragments.register.ReAct import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; +import android.util.Patterns; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -114,6 +115,9 @@ public class CgSignInFragment extends Fragment implements WelcomeContracts.CgLog if (binding.email.getText().toString().trim().isEmpty()){ allOkay = false; binding.email.setError("Please enter email."); + }else if (!Patterns.EMAIL_ADDRESS.matcher(binding.email.getText().toString()).matches()){ + allOkay = false; + binding.email.setError("Invalid email"); } if (binding.password.getText() != null && binding.password.getText().toString().trim().isEmpty()){ diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/RegisterFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/RegisterFragment.java index 4ae193f..4fbed79 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/RegisterFragment.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/RegisterFragment.java @@ -217,7 +217,6 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif progressDialog.show(); viewModel.verifyEmail(binding.email.getText().toString().trim(), this); - } }); diff --git a/app/src/main/res/drawable/ic_activity_not.png b/app/src/main/res/drawable/ic_activity_not.png new file mode 100644 index 0000000..5691f21 Binary files /dev/null and b/app/src/main/res/drawable/ic_activity_not.png differ diff --git a/app/src/main/res/drawable/ic_geofence_noti.png b/app/src/main/res/drawable/ic_geofence_noti.png new file mode 100644 index 0000000..4471dd4 Binary files /dev/null and b/app/src/main/res/drawable/ic_geofence_noti.png differ diff --git a/app/src/main/res/drawable/ic_home_noti.png b/app/src/main/res/drawable/ic_home_noti.png new file mode 100644 index 0000000..df3ad5f Binary files /dev/null and b/app/src/main/res/drawable/ic_home_noti.png differ diff --git a/app/src/main/res/drawable/ic_med_noti.png b/app/src/main/res/drawable/ic_med_noti.png new file mode 100644 index 0000000..27481c2 Binary files /dev/null and b/app/src/main/res/drawable/ic_med_noti.png differ diff --git a/app/src/main/res/drawable/ic_sos_noti.png b/app/src/main/res/drawable/ic_sos_noti.png new file mode 100644 index 0000000..d6f0721 Binary files /dev/null and b/app/src/main/res/drawable/ic_sos_noti.png differ diff --git a/app/src/main/res/drawable/ic_subscription_noti.png b/app/src/main/res/drawable/ic_subscription_noti.png new file mode 100644 index 0000000..65d1cb4 Binary files /dev/null and b/app/src/main/res/drawable/ic_subscription_noti.png differ diff --git a/app/src/main/res/layout/add_reminder_fragment.xml b/app/src/main/res/layout/add_reminder_fragment.xml index a223784..bc15a33 100644 --- a/app/src/main/res/layout/add_reminder_fragment.xml +++ b/app/src/main/res/layout/add_reminder_fragment.xml @@ -694,17 +694,36 @@ /> - + android:orientation="horizontal"> + + + + + + @@ -138,14 +143,19 @@ /> diff --git a/app/src/main/res/layout/notification_viewholder.xml b/app/src/main/res/layout/notification_viewholder.xml index e1e3159..61b3d92 100644 --- a/app/src/main/res/layout/notification_viewholder.xml +++ b/app/src/main/res/layout/notification_viewholder.xml @@ -22,6 +22,7 @@ android:orientation="horizontal"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0678aa9..b030c26 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,8 +214,8 @@ Are you sure you want to delete the Medication Activity? notification close - Calls - Chats + Call + Chat Apps Direction sos