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

.

Browse Source
This commit is contained in:
Aditya Gaikwad
2023-07-25 16:55:09 +05:30
parent 55ef83e93a
commit 8afbae1c29
45 changed files with 496 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
<bytecodeTargetLevel target="17" />
</component>
</project>

3
.idea/misc.xml generated
View File

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

2
app/build.gradle
View File

@@ -86,6 +86,8 @@ dependencies {
implementation 'com.github.dhaval2404:imagepicker:2.1'
implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.32'
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

1
app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
View File

@@ -26,7 +26,6 @@ public abstract class AppUtil {
private static final String TAG = "AppUtil";
// fields
public static final String USER_DETAILS = "user_details";
public static final String USER_TOKEN = "user_token";

41
app/src/main/java/com/ssb/simplitend/apputils/EditTextErrorRemover.java Normal file
View File

@@ -0,0 +1,41 @@
package com.ssb.simplitend.apputils;
import android.text.Editable;
import android.text.TextWatcher;
import android.widget.EditText;
import java.util.ArrayList;
import java.util.Arrays;
public class EditTextErrorRemover implements TextWatcher {
private final ArrayList<EditText> editTexts;
public EditTextErrorRemover(EditText... editText){
this.editTexts = new ArrayList<>();
editTexts.addAll(Arrays.asList(editText));
for (EditText e: editText){
e.addTextChangedListener(this);
}
}
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
for (EditText editText: editTexts){
editText.setError(null);
}
}
}

5
app/src/main/java/com/ssb/simplitend/patientprofile/PatientProfileAPIService.java
View File

@@ -6,6 +6,8 @@ import com.ssb.simplitend.patientprofile.medreminder.mvvm.models.Reminder;
import com.ssb.simplitend.patientprofile.medreminder.mvvm.models.ReminderResult;
import com.ssb.simplitend.patientprofile.setuproutine.mvvm.RoutineDetails;
import com.ssb.simplitend.welcome.mvvm.models.CallResponse;
import com.ssb.simplitend.welcome.mvvm.models.PatientData;
import com.ssb.simplitend.welcome.mvvm.models.PatientResult;
import java.util.List;
import java.util.Map;
@@ -23,6 +25,9 @@ import retrofit2.http.Query;
public interface PatientProfileAPIService {
@GET("api/auth-user-data")
Call<CallResponse<PatientData>> getUsrProfileProgress(@Header("Authorization") String token);
@GET("api/patient-reminder-list/{id}")
Call<CallResponse<List<ReminderResult>>> getRemindersList(@Path("id") int patient_id,
@Query("weekday") int week_day,

7
app/src/main/java/com/ssb/simplitend/patientprofile/ProfileContracts.java
View File

@@ -4,12 +4,19 @@ import com.ssb.simplitend.patientprofile.medicalinfo.mvvm.MedicationInfo;
import com.ssb.simplitend.patientprofile.medreminder.mvvm.models.FreqNMedTypeResult;
import com.ssb.simplitend.patientprofile.medreminder.mvvm.models.ReminderResult;
import com.ssb.simplitend.patientprofile.setuproutine.mvvm.RoutineDetails;
import com.ssb.simplitend.welcome.mvvm.models.PatientData;
import java.util.List;
public interface ProfileContracts {
interface ProfileProgressCallback{
void onProfileProgressFetched(PatientData patientData);
void onProfileProgressFetchFailed(Throwable t, String message);
}
interface GetRemindersListCallback {
void onRemindersListFetched(List<ReminderResult> reminderResult);

85
app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java
View File

@@ -1,10 +1,12 @@
package com.ssb.simplitend.patientprofile;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -12,15 +14,25 @@ import androidx.fragment.app.Fragment;
import androidx.navigation.Navigation;
import com.ssb.simplitend.R;
import com.ssb.simplitend.apputils.AppUtil;
import com.ssb.simplitend.apputils.RetrofitHelper;
import com.ssb.simplitend.careperson_dashboard.DashBoardActivityCP;
import com.ssb.simplitend.databinding.ProfileProgressFragmentBinding;
import com.ssb.simplitend.welcome.mvvm.models.CallResponse;
import com.ssb.simplitend.welcome.mvvm.models.PatientData;
public class ProfileProgressFragment extends Fragment {
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
public class ProfileProgressFragment extends Fragment implements ProfileContracts.ProfileProgressCallback {
// view binding
protected ProfileProgressFragmentBinding binding;
public ProfileProgressFragment(){
private ProgressDialog progressDialog;
public ProfileProgressFragment() {
// required empty const.
}
@@ -29,9 +41,6 @@ public class ProfileProgressFragment extends Fragment {
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
binding = ProfileProgressFragmentBinding.inflate(inflater, container, false);
// binding.medReminderImg.setImageResource(0);
// binding.medReminderImg.setBackgroundResource(R.drawable.ic_done);
initProgress();
clickEvents();
@@ -40,10 +49,46 @@ public class ProfileProgressFragment extends Fragment {
}
private void initProgress() {
progressDialog = new ProgressDialog(requireContext());
progressDialog.setTitle("Please wait...");
progressDialog.setMessage("while we load the profile progress.");
progressDialog.setCancelable(false);
progressDialog.show();
PatientProfileAPIService apiService = RetrofitHelper.getRetrofit().create(PatientProfileAPIService.class);
String token = "Bearer " + AppUtil.getUserToken(requireContext());
apiService.getUsrProfileProgress(token)
.enqueue(new Callback<CallResponse<PatientData>>() {
@Override
public void onResponse(Call<CallResponse<PatientData>> call, Response<CallResponse<PatientData>> response) {
if (response.body() != null) {
if (response.body().status != 200 || response.body().result == null) {
onProfileProgressFetchFailed(new Exception(), response.body().message);
return;
}
onProfileProgressFetched(response.body().result);
} else {
onProfileProgressFetchFailed(new Exception(), "Please try again later.");
}
}
@Override
public void onFailure(Call<CallResponse<PatientData>> call, Throwable t) {
onProfileProgressFetchFailed(new Exception(), "Please try again later.");
}
});
}
private void clickEvents() {
binding.addContact.setOnClickListener(v ->
Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_addContactFragment)
);
binding.medicReminder.setOnClickListener(v ->
Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_reminderFragment)
);
@@ -64,4 +109,34 @@ public class ProfileProgressFragment extends Fragment {
});
}
@Override
public void onProfileProgressFetched(@NonNull PatientData patientData) {
if (patientData.isCareGiverLink == 1) {
// TODO: 25-07-2023 look into this
}
if (patientData.isPatientReminderData == 1) {
binding.medReminderImg.setImageResource(0);
binding.medReminderImg.setBackgroundResource(R.drawable.ic_done);
}
if (patientData.isPatientMedicalData == 1) {
binding.medInfoImg.setImageResource(0);
binding.medInfoImg.setBackgroundResource(R.drawable.ic_done);
}
if (patientData.isPatientRoutineData == 1) {
binding.setupRoutineImg.setImageResource(0);
binding.setupRoutineImg.setBackgroundResource(R.drawable.ic_done);
}
progressDialog.dismiss();
}
@Override
public void onProfileProgressFetchFailed(Throwable t, String message) {
progressDialog.dismiss();
Toast.makeText(requireContext(), "Couldn't load profile progress.", Toast.LENGTH_SHORT).show();
}
}

3
app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/ReminderFragment.java
View File

@@ -110,7 +110,6 @@ public class ReminderFragment extends Fragment implements RecyclerTouchListener.
}
private void loadReminderList(int day_of_week){
Toast.makeText(requireContext(), "loading for " + reminderViewModel.getDayOfWeek(day_of_week-1), Toast.LENGTH_SHORT).show();
progressDialog.setTitle("Please wait...");
progressDialog.setMessage("while we fetch reminders list for you.");
progressDialog.setCancelable(false);
@@ -140,7 +139,7 @@ public class ReminderFragment extends Fragment implements RecyclerTouchListener.
Calendar calendar = Calendar.getInstance();
String today_date = reminderViewModel.getMonthOfYear(calendar.get(Calendar.MONTH));
String today_date = reminderViewModel.getMonthOfYear(calendar.get(Calendar.MONTH) + 1);
today_date = today_date.concat(", " + calendar.get(Calendar.DAY_OF_MONTH));
binding.todayDate.setText(today_date);

4
app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/RoutineFragment.java
View File

@@ -104,8 +104,6 @@ public class RoutineFragment extends Fragment implements RoutineAdapter.ClickLis
}
private void loadRoutineList(int day_of_week) {
Toast.makeText(requireContext(), "loading for " + routineViewModel.getDayOfWeek(day_of_week-1), Toast.LENGTH_SHORT).show();
progressDialog.setTitle("Please wait...");
progressDialog.setMessage("while we fetch reminders list for you.");
progressDialog.setCancelable(false);
@@ -130,7 +128,7 @@ public class RoutineFragment extends Fragment implements RoutineAdapter.ClickLis
Calendar calendar = Calendar.getInstance();
String today_date = routineViewModel.getMonthOfYear(calendar.get(Calendar.MONTH));
String today_date = routineViewModel.getMonthOfYear(calendar.get(Calendar.MONTH) + 1);
today_date = today_date.concat(", " + calendar.get(Calendar.DAY_OF_MONTH));
binding.todayDate.setText(today_date);

11
app/src/main/java/com/ssb/simplitend/welcome/fragments/SignInFragment.java
View File

@@ -17,6 +17,7 @@ import androidx.navigation.Navigation;
import com.ssb.simplitend.R;
import com.ssb.simplitend.apputils.AppUtil;
import com.ssb.simplitend.apputils.EditTextErrorRemover;
import com.ssb.simplitend.careperson_dashboard.DashBoardActivityCP;
import com.ssb.simplitend.databinding.SignInFragmentBinding;
import com.ssb.simplitend.welcome.mvvm.WelcomeContracts;
@@ -60,6 +61,12 @@ public class SignInFragment extends Fragment implements WelcomeContracts.Registe
private void initViews() {
progressDialog = new ProgressDialog(requireContext());
new EditTextErrorRemover(
binding.email,
binding.pin
);
}
private void clickEvents() {
@@ -110,10 +117,10 @@ public class SignInFragment extends Fragment implements WelcomeContracts.Registe
if (Objects.requireNonNull(binding.pin.getText()).toString().trim().isEmpty()){
allOkay = false;
binding.pin.setError("Required");
Toast.makeText(requireContext(), "Enter your security pin.", Toast.LENGTH_SHORT).show();
}else if (binding.pin.getText().toString().trim().length() != 4){
allOkay = false;
binding.pin.setError("Pin should be 4 digit.");
Toast.makeText(requireContext(), "Enter a valid pin.", Toast.LENGTH_SHORT).show();
}
return allOkay;

7
app/src/main/java/com/ssb/simplitend/welcome/fragments/WelcomeFragment.java
View File

@@ -38,6 +38,13 @@ public class WelcomeFragment extends Fragment {
return binding.getRoot();
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
Navigation.findNavController(binding.getRoot())
.popBackStack(R.id.welcomeFragment, false);
}
// Initialize views
private void initViews(Bundle savedInstanceState) {
WelcomeViewModel wv = new ViewModelProvider(requireActivity()).get(WelcomeViewModel.class);

49
app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java
View File

@@ -9,6 +9,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.text.InputFilter;
import android.util.Log;
import android.util.Patterns;
import android.view.LayoutInflater;
@@ -27,6 +28,8 @@ import androidx.navigation.Navigation;
import com.bumptech.glide.Glide;
import com.github.dhaval2404.imagepicker.ImagePicker;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber;
import com.ssb.simplitend.R;
import com.ssb.simplitend.apputils.AppUtil;
import com.ssb.simplitend.databinding.CreateEditContactFragmentBinding;
@@ -170,6 +173,52 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
Toast.makeText(requireContext(), "Task Cancelled", Toast.LENGTH_SHORT).show();
}
});
// phone number formatting
// to deal with input pasting in the edit text
InputFilter phoneFilter = (charSequence, i, i1, spanned, i2, i3) -> {
String phone_number_str = charSequence.toString();
String country_code;
if (binding.countryCodes.getSelectedIndex() == -2){
country_code = "+1";
}else{
country_code = countryCodeList.get(binding.countryCodes.getSelectedIndex());
}
try {
PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
Phonenumber.PhoneNumber phoneNumber = phoneNumberUtil.parse(charSequence, "US");
phone_number_str = String.valueOf(phoneNumber.getNationalNumber());
country_code = "+" + phoneNumber.getCountryCode();
} catch (Exception e) {
// nothing
}
if (!countryCodeList.contains(country_code)){
countryCodeList.add(country_code);
}
binding.countryCodes.selectItemByIndex(countryCodeList.indexOf(country_code));
if (phone_number_str.length() > 10){
// pasted number length is greater than 10
return phone_number_str.substring(0, 10);
}
String total_phone_number = binding.phoneNumber.getText().toString() + phone_number_str;
if (total_phone_number.length() > 10){
// max length should be 10
return "";
}else{
return phone_number_str;
}
};
binding.phoneNumber.setFilters(new InputFilter[]{phoneFilter});
}
private void clickEvents() {

10
app/src/main/java/com/ssb/simplitend/welcome/fragments/forgotpin/ChangePinFragment.java
View File

@@ -18,6 +18,7 @@ import androidx.navigation.Navigation;
import com.ssb.simplitend.R;
import com.ssb.simplitend.apputils.AppUtil;
import com.ssb.simplitend.apputils.EditTextErrorRemover;
import com.ssb.simplitend.databinding.ChangePinFragmentBinding;
import com.ssb.simplitend.welcome.mvvm.WelcomeContracts;
import com.ssb.simplitend.welcome.mvvm.WelcomeViewModel;
@@ -79,6 +80,11 @@ public class ChangePinFragment extends Fragment implements WelcomeContracts.Upda
private void initViews() {
progressDialog = new ProgressDialog(requireContext());
new EditTextErrorRemover(
binding.pin,
binding.confirmPin
);
}
private void clickEvents() {
@@ -121,11 +127,11 @@ public class ChangePinFragment extends Fragment implements WelcomeContracts.Upda
if (binding.pin.getText() == null || binding.pin.getText().toString().length() != 4) {
allOkay = false;
binding.pin.setError("Invalid pin");
Toast.makeText(requireContext(), "Enter a 4 digit security pin.", Toast.LENGTH_SHORT).show();
} else if (binding.confirmPin.getText() == null ||
!binding.confirmPin.getText().toString().equals(binding.pin.getText().toString())) {
allOkay = false;
binding.confirmPin.setError("Pin doesn't match");
Toast.makeText(requireContext(), "Confirm pin doesn't match.", Toast.LENGTH_SHORT).show();
}
return allOkay;

6
app/src/main/java/com/ssb/simplitend/welcome/fragments/forgotpin/ForgotPinFragment.java
View File

@@ -16,6 +16,7 @@ import androidx.navigation.Navigation;
import com.bumptech.glide.Glide;
import com.ssb.simplitend.R;
import com.ssb.simplitend.apputils.AppUtil;
import com.ssb.simplitend.apputils.EditTextErrorRemover;
import com.ssb.simplitend.databinding.ForgotPinFragmentBinding;
import com.ssb.simplitend.welcome.mvvm.WelcomeContracts;
import com.ssb.simplitend.welcome.mvvm.WelcomeViewModel;
@@ -60,6 +61,10 @@ public class ForgotPinFragment extends Fragment implements WelcomeContracts.Send
.load(R.raw.email_sending_anim)
.placeholder(R.drawable.forgot_pin_email_img)
.into(binding.image);
new EditTextErrorRemover(
binding.emailAddress
);
}
private void clickEvents() {
@@ -68,6 +73,7 @@ public class ForgotPinFragment extends Fragment implements WelcomeContracts.Send
Navigation.findNavController(v).popBackStack());
binding.submit.setOnClickListener(v -> {
AppUtil.closeKeyboard(requireActivity());
if (allOkay()){
sendOTP();

5
app/src/main/java/com/ssb/simplitend/welcome/fragments/register/CreatePinFragment.java
View File

@@ -6,6 +6,7 @@ import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -99,11 +100,11 @@ public class CreatePinFragment extends Fragment implements WelcomeContracts.Regi
if (binding.pin.getText() == null || binding.pin.getText().toString().length() != 4) {
allOkay = false;
binding.pin.setError("Invalid pin");
Toast.makeText(requireContext(), "Enter a 4 digit security pin.", Toast.LENGTH_SHORT).show();
} else if (binding.confirmPin.getText() == null ||
!binding.confirmPin.getText().toString().equals(binding.pin.getText().toString())) {
allOkay = false;
binding.confirmPin.setError("Pin doesn't match");
Toast.makeText(requireContext(), "Confirm pin doesn't match.", Toast.LENGTH_SHORT).show();
}
return allOkay;

3
app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java
View File

@@ -63,7 +63,6 @@ import java.util.List;
public class LocationFragment extends Fragment implements OnMapReadyCallback,
GoogleMap.OnMapClickListener, LocationListener {
private static final String TAG = "LocationFragment";
private static final String UNITED_STATES = "United States";
@@ -182,7 +181,7 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
currentLocation = new LatLng(lat, lng);
}else{
// default current location // washington DC
currentLocation = new LatLng(38.9072, 77.0369);
currentLocation = new LatLng(0, 0);
}
if (patientData.address_line1 != null){

70
app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java
View File

@@ -6,6 +6,12 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.telephony.PhoneNumberFormattingTextWatcher;
import android.telephony.PhoneNumberUtils;
import android.text.Editable;
import android.text.InputFilter;
import android.text.Spanned;
import android.text.TextWatcher;
import android.util.Log;
import android.util.Patterns;
import android.view.LayoutInflater;
@@ -20,8 +26,12 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.Navigation;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber;
import com.ssb.simplitend.R;
import com.ssb.simplitend.apputils.AppUtil;
import com.ssb.simplitend.apputils.EditTextErrorRemover;
import com.ssb.simplitend.databinding.RegisterFragmentBinding;
import com.ssb.simplitend.welcome.mvvm.WelcomeContracts;
import com.ssb.simplitend.welcome.mvvm.WelcomeViewModel;
@@ -33,7 +43,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
public class RegisterFragment extends Fragment implements WelcomeContracts.VerifyEmailCallBack {
public class RegisterFragment extends Fragment implements WelcomeContracts.VerifyEmailCallBack{
private static final String TAG = "RegisterFragment";
@@ -83,6 +93,64 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
loadPatientDataSavedState();
setErrorRemovers();
}
// This adds textChangeListener to all the EditTexts available to remove error if available
private void setErrorRemovers() {
new EditTextErrorRemover(
binding.name,
binding.contactNumber,
binding.email
);
// phone number formatting
// to deal with input pasting in the edit text
InputFilter phoneFilter = (charSequence, i, i1, spanned, i2, i3) -> {
String phone_number_str = charSequence.toString();
String country_code;
if (binding.countryCodes.getSelectedIndex() == -2){
country_code = "+1";
}else{
country_code = countryCodeList.get(binding.countryCodes.getSelectedIndex());
}
try {
PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
Phonenumber.PhoneNumber phoneNumber = phoneNumberUtil.parse(charSequence, "US");
phone_number_str = String.valueOf(phoneNumber.getNationalNumber());
country_code = "+" + phoneNumber.getCountryCode();
} catch (Exception e) {
// nothing
}
if (!countryCodeList.contains(country_code)){
countryCodeList.add(country_code);
}
binding.countryCodes.selectItemByIndex(countryCodeList.indexOf(country_code));
if (phone_number_str.length() > 10){
// pasted number length is greater than 10
return phone_number_str.substring(0, 10);
}
String total_phone_number = binding.contactNumber.getText().toString() + phone_number_str;
if (total_phone_number.length() > 10){
// max length should be 10
return "";
}else{
return phone_number_str;
}
};
binding.contactNumber.setFilters(new InputFilter[]{phoneFilter});
}
private void loadPatientDataSavedState() {

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

@@ -9,6 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.navigation.NavOptions;
import androidx.navigation.Navigation;
import com.ssb.simplitend.R;
@@ -26,7 +27,12 @@ public class SplashFragment extends Fragment {
new Handler().postDelayed(() -> {
Navigation.findNavController(binding.mainIcon).navigate(R.id.action_splashFragment_to_welcomeFragment);
NavOptions navOptions = new NavOptions.Builder()
.setPopUpTo(R.id.splashFragment, true)
.build();
Navigation.findNavController(binding.mainIcon)
.navigate(R.id.action_splashFragment_to_welcomeFragment, null, navOptions);
}, 1000);

4
app/src/main/java/com/ssb/simplitend/welcome/fragments/register/ThankYouFragment.java
View File

@@ -11,6 +11,9 @@ import androidx.fragment.app.Fragment;
import androidx.navigation.Navigation;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.gif.GifDrawable;
import com.bumptech.glide.request.target.ImageViewTarget;
import com.ssb.simplitend.R;
import com.ssb.simplitend.databinding.ThankYouFragmentBinding;
@@ -40,6 +43,7 @@ public class ThankYouFragment extends Fragment {
Glide.with(requireContext())
.asGif()
.load(R.raw.done_anim)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.into(binding.animIv);
}

6
app/src/main/java/com/ssb/simplitend/welcome/mvvm/models/PatientData.java
View File

@@ -23,6 +23,12 @@ public class PatientData {
// for payload purpose
public String pin_code, c_pin_code;
// progress flags
public int isCareGiverLink
, isPatientReminderData
, isPatientRoutineData
, isPatientMedicalData;
public PatientData() {
}

24
app/src/main/res/layout/add_contact_fragment.xml
View File

@@ -19,6 +19,8 @@
android:layout_margin="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView
@@ -31,28 +33,6 @@
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textColor="@color/black" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="10dp"
android:autofillHints="name"
android:background="@drawable/edit_text_bg"
android:drawableStart="@drawable/ic_search_outline"
android:drawablePadding="10dp"
android:fontFamily="@font/nunito_regular"
android:hint="@string/search_contact"
android:inputType="textPersonName"
android:paddingHorizontal="10dp"
android:paddingVertical="15dp"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
app/src/main/res/layout/add_medical_info.xml
View File

@@ -18,6 +18,8 @@
android:layout_height="35sp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back"
android:layout_margin="15dp"/>
@@ -176,7 +178,7 @@
android:drawablePadding="10dp"
android:autofillHints="name"
android:inputType="text|none"
android:inputType="text|textCapWords"
android:maxLines="1"
/>

4
app/src/main/res/layout/add_reminder_fragment.xml
View File

@@ -22,6 +22,8 @@
android:layout_marginBottom="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView
@@ -642,7 +644,7 @@
android:drawablePadding="10dp"
android:autofillHints="@null"
android:inputType="textMultiLine"
android:inputType="textMultiLine|textCapSentences"
android:maxHeight="150dp"

4
app/src/main/res/layout/add_routine_fragment.xml
View File

@@ -22,6 +22,8 @@
android:layout_marginBottom="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView
@@ -64,7 +66,7 @@
android:fontFamily="@font/nunito_regular"
android:hint="@string/enter_routine_name"
android:inputType="text|none"
android:inputType="text|textCapSentences"
android:padding="10dp"
android:paddingVertical="15dp"

3
app/src/main/res/layout/change_pin_fragment.xml
View File

@@ -8,6 +8,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/reset_pin"
android:overScrollMode="never">
<LinearLayout
@@ -22,6 +23,8 @@
android:layout_margin="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView

20
app/src/main/res/layout/check_mail_fragment.xml
View File

@@ -24,6 +24,8 @@
android:layout_margin="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView
@@ -34,7 +36,7 @@
android:layout_marginBottom="5dp"
android:fontFamily="@font/nunito_medium"
android:text="@string/check_your_mail"
android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge"
android:textSize="@dimen/_24ssp"
android:textColor="@color/black" />
<TextView
@@ -44,7 +46,7 @@
android:layout_marginTop="5dp"
android:fontFamily="@font/nunito_regular"
android:text="@string/please_enter_the_temporary_pin_recieved_at_email_address_at_k_gmail_com"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black" />
<LinearLayout
@@ -59,7 +61,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/nunito_regular"
android:text="@string/at"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black" />
<TextView
@@ -69,15 +71,15 @@
android:fontFamily="@font/nunito_regular"
android:layout_marginStart="10dp"
tools:text="************57@gmail.com"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black" />
</LinearLayout>
<ImageView
android:id="@+id/image"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_width="@dimen/_140sdp"
android:layout_height="@dimen/_140sdp"
android:layout_gravity="center_horizontal"
android:layout_marginVertical="35sp"
android:contentDescription="@string/forget_pin" />
@@ -89,7 +91,7 @@
android:layout_marginBottom="15dp"
android:fontFamily="@font/nunito_medium"
android:text="@string/enter_temporary_pin"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black" />
<LinearLayout
@@ -222,7 +224,7 @@
android:text="@string/didn_t_your_receive_any_code"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textSize="@dimen/_14ssp"
/>
<TextView
@@ -232,7 +234,7 @@
android:text="@string/resend"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/color_primary"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textSize="@dimen/_14ssp"
android:padding="5dp"
/>

18
app/src/main/res/layout/choose_role_fragment.xml
View File

@@ -17,21 +17,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/choose_a_role"
android:fontFamily="@font/nunito_medium"
android:fontFamily="@font/nunito_bold"
android:textColor="#131313"
android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge"
android:textSize="@dimen/_24ssp"
android:layout_marginTop="40dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_14ssp"
android:textColor="#2C2C2C"
android:text="@string/choose_role_description"
android:fontFamily="@font/nunito_regular"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="5dp"
android:layout_marginTop="10dp"
android:textAlignment="center"
/>
@@ -40,10 +40,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="30dp"
app:cardCornerRadius="5dp"
android:layout_marginTop="50dp"
app:cardCornerRadius="10dp"
app:cardElevation="3dp"
app:strokeColor="@android:color/holo_blue_light"
app:strokeColor="#AEE0FF"
app:strokeWidth="0.5dp"
app:cardBackgroundColor="@color/white_bg"
>
@@ -111,9 +111,9 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="30dp"
app:cardCornerRadius="5dp"
app:cardCornerRadius="10dp"
app:cardElevation="3dp"
app:strokeColor="@android:color/holo_blue_light"
app:strokeColor="#AEE0FF"
app:strokeWidth="0.5dp"
app:cardBackgroundColor="@color/white_bg"
>

2
app/src/main/res/layout/contact_info_fragment.xml
View File

@@ -26,6 +26,8 @@
android:layout_marginBottom="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<ImageView

2
app/src/main/res/layout/contact_list_fragment.xml
View File

@@ -13,6 +13,8 @@
android:layout_margin="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView

10
app/src/main/res/layout/create_edit_contact_fragment.xml
View File

@@ -19,6 +19,8 @@
android:layout_margin="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView
@@ -34,8 +36,8 @@
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/image"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/_100sdp"
android:layout_height="@dimen/_100sdp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
@@ -84,7 +86,7 @@
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:inputType="textPersonName"
android:inputType="textPersonName|textCapWords"
android:padding="10dp"
android:paddingVertical="15dp"
@@ -119,7 +121,7 @@
android:fontFamily="@font/nunito_regular"
android:hint="@string/enter_your_relationship"
android:inputType="textPersonName"
android:inputType="textPersonName|textCapSentences"
android:padding="10dp"
android:paddingVertical="15dp"

10
app/src/main/res/layout/create_pin_fragment.xml
View File

@@ -23,6 +23,8 @@
android:layout_margin="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView
@@ -33,7 +35,7 @@
android:layout_marginBottom="5dp"
android:fontFamily="@font/nunito_medium"
android:text="@string/create_a_pin"
android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge"
android:textSize="@dimen/_24ssp"
android:textColor="@color/black" />
<TextView
@@ -43,7 +45,7 @@
android:layout_marginVertical="5dp"
android:fontFamily="@font/nunito_regular"
android:text="@string/create_a_pin_to_securely_store_your_personal_data"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black" />
<TextView
@@ -54,7 +56,7 @@
android:layout_marginTop="50dp"
android:layout_marginHorizontal="15dp"
android:fontFamily="@font/nunito_medium"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black"
/>
@@ -112,7 +114,7 @@
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp"
android:fontFamily="@font/nunito_medium"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black"
/>

12
app/src/main/res/layout/forgot_pin_fragment.xml
View File

@@ -25,13 +25,15 @@
android:contentDescription="@string/back_button"
android:padding="5dp"
android:src="@drawable/arrow_back"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:layout_margin="15dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/forgot_pin"
android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge"
android:textSize="@dimen/_24ssp"
android:layout_marginHorizontal="15dp"
android:textColor="@color/black"
android:fontFamily="@font/nunito_medium"
@@ -44,7 +46,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:text="@string/don_t_worry_it_happens_please_enter_the_address_associated_with_your_account"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:fontFamily="@font/nunito_regular"
android:layout_marginVertical="5dp"
android:textColor="@color/black"
@@ -52,8 +54,8 @@
<ImageView
android:id="@+id/image"
android:layout_width="143dp"
android:layout_height="150dp"
android:layout_width="@dimen/_140sdp"
android:layout_height="@dimen/_140sdp"
android:layout_gravity="center_horizontal"
android:layout_marginVertical="25dp"
android:contentDescription="@string/forget_pin"/>
@@ -63,8 +65,8 @@
android:layout_height="wrap_content"
android:text="@string/enter_email_address"
android:fontFamily="@font/nunito_medium"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:layout_marginHorizontal="15dp"
android:textSize="@dimen/_18ssp"
android:textColor="@color/black"
android:layout_marginVertical="15dp"
/>

6
app/src/main/res/layout/how_to_set_up_fragment.xml
View File

@@ -73,7 +73,7 @@
android:background="@color/color_accent"
android:contentDescription="@string/how_to_setup"
android:layout_marginVertical="5dp"/>
android:layout_marginVertical="15dp"/>
</LinearLayout>
@@ -151,7 +151,7 @@
android:contentDescription="@string/how_to_setup"
android:layout_marginVertical="5dp"/>
android:layout_marginVertical="15dp"/>
</LinearLayout>
@@ -226,7 +226,7 @@
android:background="@color/color_accent"
android:contentDescription="@string/how_to_setup"
android:layout_marginVertical="5dp"/>
android:layout_marginVertical="15dp"/>
</LinearLayout>

12
app/src/main/res/layout/location_fragment.xml
View File

@@ -20,7 +20,10 @@
android:contentDescription="@string/back_button"
android:padding="5dp"
android:src="@drawable/arrow_back"
android:layout_margin="15dp"/>
android:layout_margin="15dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
/>
<TextView
android:layout_width="wrap_content"
@@ -135,7 +138,7 @@
android:drawablePadding="10dp"
android:autofillHints="postalAddress"
android:inputType="textPostalAddress"
android:inputType="text|textCapSentences"
/>
<EditText
@@ -159,7 +162,7 @@
android:drawablePadding="10dp"
android:autofillHints="postalAddress"
android:inputType="textPostalAddress"
android:inputType="text|textCapSentences"
/>
<LinearLayout
@@ -170,6 +173,7 @@
android:background="@drawable/edit_text_bg_2"
android:layout_marginHorizontal="15dp"
android:focusable="false"
android:layout_marginVertical="10dp">
<ImageView
@@ -229,7 +233,7 @@
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">

2
app/src/main/res/layout/medical_into_fragment.xml
View File

@@ -15,6 +15,8 @@
android:layout_marginBottom="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingEnd="0dp"
android:paddingStart="-15dp"
android:src="@drawable/arrow_back" />
<TextView

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

@@ -12,7 +12,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="6"
android:layout_weight="6.5"
android:scaleType="fitXY"
android:layout_marginHorizontal="15sp"
android:src="@drawable/onboard_one"
@@ -22,9 +22,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="2"
android:layout_weight="1.5"
android:text="@string/avoid_unwanted_phone_calls"
android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
android:textSize="@dimen/_22ssp"
android:textColor="@color/black"
android:fontFamily="@font/nunito_bold"
android:gravity="bottom"
@@ -42,7 +42,7 @@
android:fontFamily="@font/nunito_regular"
android:layout_marginVertical="10dp"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_18ssp"
android:layout_marginHorizontal="15dp"/>
</LinearLayout>

9
app/src/main/res/layout/profile_progress_fragment.xml
View File

@@ -12,6 +12,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="15dp"
android:paddingStart="0dp"
android:orientation="vertical">
<TextView
@@ -21,9 +22,9 @@
android:text="@string/lets_complete_nthe_rest_of_your_profile"
android:fontFamily="@font/nunito_medium"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textSize="@dimen/_20ssp"
android:layout_marginHorizontal="15dp"
android:layout_marginHorizontal="25dp"
android:layout_marginTop="25dp"
android:layout_marginBottom="15dp"
@@ -82,6 +83,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/add_contact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -358,7 +360,7 @@
android:text="@string/skip_to_dashboard"
android:fontFamily="@font/nunito_regular"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
android:textSize="@dimen/_16ssp"
android:textColor="@android:color/black"
app:drawableEndCompat="@drawable/ic_right_kb"
@@ -367,7 +369,6 @@
android:layout_gravity="end"
android:layout_marginVertical="25dp"
android:layout_marginHorizontal="15dp"
android:padding="5dp"

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

@@ -19,7 +19,10 @@
android:contentDescription="@string/back_button"
android:padding="5dp"
android:src="@drawable/arrow_back"
android:layout_margin="15dp"/>
android:layout_margin="15dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
/>
<TextView
android:layout_width="wrap_content"
@@ -200,7 +203,6 @@
android:paddingVertical="15dp"
android:padding="10dp"
android:maxLength="10"
android:autofillHints="phone"
android:inputType="number"
/>

5
app/src/main/res/layout/reminders_fragment.xml
View File

@@ -23,6 +23,8 @@
android:layout_marginBottom="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView
@@ -451,16 +453,17 @@
/>
<ScrollView
android:id="@+id/no_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider"
android:layout_centerHorizontal="true"
android:layout_marginTop="25dp"
android:overScrollMode="never"
>
<LinearLayout
android:id="@+id/no_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/routine_fragment.xml
View File

@@ -23,6 +23,8 @@
android:layout_marginBottom="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
android:src="@drawable/arrow_back" />
<TextView

21
app/src/main/res/layout/sign_in_fragment.xml
View File

@@ -13,8 +13,8 @@
android:gravity="center_horizontal">
<ImageView
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_width="@dimen/_150sdp"
android:layout_height="@dimen/_150sdp"
android:src="@drawable/welcome_img"
android:contentDescription="@string/welcome_illustration"
android:layout_marginTop="30dp"/>
@@ -25,15 +25,18 @@
android:text="@string/welcome_to_simplitend"
android:fontFamily="@font/nunito_semibold"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"/>
android:textSize="@dimen/_24ssp"
android:textAlignment="center"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sign_in_to_continue"
android:fontFamily="@font/nunito_regular"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textColor="@color/black"
android:textSize="@dimen/_18ssp"
android:textAlignment="center"
/>
<TextView
@@ -42,8 +45,8 @@
android:text="@string/email_address"
android:fontFamily="@font/nunito_medium"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:layout_gravity="start"
android:textSize="@dimen/_18ssp"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="35sp"
/>
@@ -78,8 +81,8 @@
android:layout_gravity="start"
android:layout_marginHorizontal="15dp"
android:fontFamily="@font/nunito_medium"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textColor="@color/black"
android:textSize="@dimen/_18ssp"
/>
<com.google.android.material.textfield.TextInputLayout
@@ -133,9 +136,9 @@
android:layout_marginHorizontal="15dp"
android:text="@string/remember_me"
android:fontFamily="@font/nunito_regular"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textColor="@color/black"
android:checked="true"
android:textSize="@dimen/_18ssp"
android:checked="false"
android:button="@drawable/remember_me_selector"
android:paddingHorizontal="10dp"
android:background="@android:color/transparent"
@@ -166,7 +169,7 @@
android:fontFamily="@font/nunito_medium"
android:padding="5dp"
android:text="@string/forget_pin"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textSize="@dimen/_16ssp"
android:textColor="@color/color_primary" />
</LinearLayout>

76
app/src/main/res/layout/thank_you_fragment.xml
View File

@@ -6,45 +6,57 @@
android:background="@color/white_bg"
android:overScrollMode="never">
<LinearLayout
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_centerInParent="true"
android:layout_height="match_parent"
android:layout_above="@id/proceed"
app:cardElevation="3dp"
app:cardCornerRadius="15dp"
android:layout_margin="15dp"
>
<ImageView
android:id="@+id/anim_iv"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="250dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="40dp"
android:layout_marginBottom="15dp"
android:layout_marginHorizontal="15dp"
android:contentDescription="@string/thank_you"/>
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/thank_you"
android:fontFamily="@font/nunito_bold"
android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge"
android:textColor="@color/black"
/>
<ImageView
android:id="@+id/anim_iv"
android:layout_width="match_parent"
android:layout_height="@dimen/_250sdp"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="15dp"
android:contentDescription="@string/thank_you" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/let_s_add_your_caregiver_contact_information"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:fontFamily="@font/nunito_regular"
android:textAlignment="center"
android:layout_marginBottom="25dp"
android:layout_marginTop="5dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/nunito_bold"
android:text="@string/thank_you"
android:textSize="@dimen/_24ssp"
android:textColor="@color/black" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="25dp"
android:layout_marginHorizontal="15dp"
android:fontFamily="@font/nunito_regular"
android:text="@string/let_s_add_your_caregiver_contact_information"
android:textAlignment="center"
android:textSize="@dimen/_20ssp"
android:textColor="@color/black" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.button.MaterialButton
android:id="@+id/proceed"

49
app/src/main/res/layout/welcome_fragment.xml
View File

@@ -42,7 +42,7 @@
android:layout_height="0dp"
android:layout_weight="6">
<ImageView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -52,8 +52,45 @@
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="25dp"
android:layout_marginTop="@dimen/_30sdp"
>
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginHorizontal="@dimen/_25sdp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/nunito_bold"
android:text="@string/welcome_to_nsimplitend"
android:textColor="@color/black"
android:textSize="@dimen/_24ssp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/nunito_regular"
android:text="@string/caring_for_a_loved_one_may_be_overwhelming_let_our_app_assist_you"
android:textAlignment="center"
android:textColor="@color/black"
android:layout_marginTop="@dimen/_5sdp"
android:textSize="@dimen/_19ssp"
/>
</LinearLayout>
</RelativeLayout>
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/next_btn"
@@ -63,19 +100,13 @@
android:src="@drawable/welcome_next"
android:layout_centerHorizontal="true"
app:civ_border_width="@dimen/_5sdp"
app:civ_border_width="@dimen/_8sdp"
app:civ_border_color="@color/white"
android:layout_marginBottom="@dimen/_15sdp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</RelativeLayout>
</LinearLayout>

3
app/src/main/res/navigation/welcome_nav_graph.xml
View File

@@ -162,6 +162,9 @@
<action
android:id="@+id/action_profileProgressFragment_to_routineFragment"
app:destination="@id/routineFragment" />
<action
android:id="@+id/action_profileProgressFragment_to_addContactFragment"
app:destination="@id/addContactFragment" />
</fragment>
<fragment
android:id="@+id/reminderFragment"