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

.

Browse Source
This commit is contained in:
14Sandee
2023-10-25 20:59:15 +05:30
parent d3d3aa9f9a
commit f562fb4d74
23 changed files with 339 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/deploymentTargetDropDown.xml generated
View File

@@ -12,7 +12,7 @@
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-10-23T11:50:58.381874Z" />
<timeTargetWasSelectedWithDropDown value="2023-10-25T15:04:24.464923Z" />
<targetsSelectedWithDialog>
<Target>
<type value="QUICK_BOOT_TARGET" />

27
app/src/main/java/com/app/simplitend/apputils/TextUtils.java Normal file
View File

@@ -0,0 +1,27 @@
package com.app.simplitend.apputils;
import android.text.Editable;
import android.text.TextWatcher;
public abstract class TextUtils {
public static final TextWatcher LEADING_SPACE_WATCHER = new TextWatcher() {
@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) {
if (editable.toString().trim().isEmpty()){
editable.delete(0, editable.length());
}
}
};
}

18
app/src/main/java/com/app/simplitend/caregiverdashboard/activities/deactivateacc/DeActivateAccountActivity.java
View File

@@ -8,6 +8,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.view.MotionEvent;
import android.view.View;
import android.widget.RadioButton;
import android.widget.Toast;
import com.app.simplitend.apputils.AppUtil;
@@ -17,6 +18,7 @@ import com.app.simplitend.databinding.ActivityDeactivateAccBinding;
import com.app.simplitend.welcome.activities.WelcomeActivity;
import com.app.simplitend.welcome.welcomecg.mvvm.CareGiverData;
import com.app.simplitend.welcome.welcomepatient.mvvm.models.PatientData;
import com.google.android.material.radiobutton.MaterialRadioButton;
public class DeActivateAccountActivity extends AppCompatActivity implements AccountPresenter.AccountReDeActivateCallback {
@@ -83,6 +85,7 @@ public class DeActivateAccountActivity extends AppCompatActivity implements Acco
String token;
if (isPatient){
if (patientData == null){
Toast.makeText(this, "Couldn't load data", Toast.LENGTH_SHORT).show();
return;
@@ -101,6 +104,21 @@ public class DeActivateAccountActivity extends AppCompatActivity implements Acco
return;
}
int selected_radio_id = binding.reasonRadio.getCheckedRadioButtonId();
if (selected_radio_id <= 0){
Toast.makeText(this, "Kindly select a reason", Toast.LENGTH_SHORT).show();
return;
}
String reason;
try {
reason = ((MaterialRadioButton) findViewById(selected_radio_id)).getText().toString();
}catch (Exception e){
reason = "Other";
}
// TODO: 25/10/23 use the reason
progressDialog.setTitle("Please wait....");
progressDialog.setMessage("while we de-activate your account");
progressDialog.setCancelable(false);

13
app/src/main/java/com/app/simplitend/patientprofile/medreminder/AddReminderFragment.java
View File

@@ -38,6 +38,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
public class AddReminderFragment extends Fragment implements CompoundButton.OnCheckedChangeListener,
ProfileContracts.FreqNMedTypesCallback,
@@ -192,6 +193,18 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh
reminderResult.time3 = null;
}
// Sending time zone
TimeZone timeZone = TimeZone.getDefault();
// Getting the GMT offset in milliseconds
int gmtOffsetMillis = timeZone.getRawOffset();
// Converting milliseconds to hours and minutes
int hours = gmtOffsetMillis / 3600000;
int minutes = (gmtOffsetMillis % 3600000) / 60000;
String gmtStandard = "GMT" + (gmtOffsetMillis >= 0 ? "+" : "") + hours + ":" + String.format(Locale.getDefault(), "%02d", minutes);
Toast.makeText(requireContext(), "" + gmtStandard, Toast.LENGTH_SHORT).show();
reminderResult.timezone = gmtStandard;
reminderResult.medication_quantity = binding.quantity.getText().toString();
reminderResult.medication_refill_date = binding.getDate.getText().toString();
reminderResult.medication_instruction = binding.instructions.getText().toString().trim();

1
app/src/main/java/com/app/simplitend/patientprofile/medreminder/mvvm/models/ReminderResult.java
View File

@@ -43,6 +43,7 @@ public class ReminderResult implements Serializable {
public String reminder_marked;
public String is_update;
public String timezone;
public ReminderResult(){}

14
app/src/main/java/com/app/simplitend/patientprofile/setuproutine/AddRoutineFragment.java
View File

@@ -5,6 +5,7 @@ import android.app.Activity;
import android.app.ProgressDialog;
import android.app.TimePickerDialog;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -31,6 +32,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.Objects;
import java.util.TimeZone;
public class AddRoutineFragment extends Fragment implements CompoundButton.OnCheckedChangeListener,
ProfileContracts.AddNUpdateRoutineCallback {
@@ -224,6 +226,18 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe
routineDetails.routine_start_time = binding.startTime.getHint().toString();
routineDetails.routine_end_time = binding.endTime.getHint().toString();
// Sending time zone
TimeZone timeZone = TimeZone.getDefault();
// Getting the GMT offset in milliseconds
int gmtOffsetMillis = timeZone.getRawOffset();
// Converting milliseconds to hours and minutes
int hours = gmtOffsetMillis / 3600000;
int minutes = (gmtOffsetMillis % 3600000) / 60000;
String gmtStandard = "GMT" + (gmtOffsetMillis >= 0 ? "+" : "") + hours + ":" + String.format(Locale.getDefault(), "%02d", minutes);
Toast.makeText(requireContext(), "" + gmtStandard, Toast.LENGTH_SHORT).show();
routineDetails.timezone = gmtStandard;
routineDetails.sun = week_state[0] ? "1" : "0";
routineDetails.mon = week_state[1] ? "1" : "0";
routineDetails.tue = week_state[2] ? "1" : "0";

1
app/src/main/java/com/app/simplitend/patientprofile/setuproutine/mvvm/RoutineDetails.java
View File

@@ -30,6 +30,7 @@ public class RoutineDetails implements Serializable {
public String updated_at;
public String routine_marked;
public String timezone;
@Override
public boolean equals(Object o) {

2
app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgCheckEmailFragment.java
View File

@@ -90,7 +90,7 @@ public class CgCheckEmailFragment extends Fragment implements WelcomeContracts.F
if (checkOTPInputs()){
verifyOTP();
}else{
Toast.makeText(requireContext(), "Enter OTP received on your email.", Toast.LENGTH_SHORT).show();
Toast.makeText(requireContext(), "Enter PIN received on your email.", Toast.LENGTH_SHORT).show();
}
});

10
app/src/main/java/com/app/simplitend/welcome/welcomecg/fragments/CgRegisterFragment.java
View File

@@ -8,6 +8,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.text.InputFilter;
import android.text.Spanned;
import android.util.Log;
import android.util.Patterns;
import android.view.LayoutInflater;
@@ -25,6 +26,7 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavOptions;
import androidx.navigation.Navigation;
import com.app.simplitend.apputils.TextUtils;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber;
@@ -122,6 +124,11 @@ public class CgRegisterFragment extends Fragment implements WelcomeContracts.Reg
}
}, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
datePickerDialog.getDatePicker().setMaxDate(calendar.getTimeInMillis());
// max age 120 years
calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 18 - 122);
datePickerDialog.getDatePicker().setMinDate(calendar.getTimeInMillis());
datePickerDialog.setTitle("Select a date");
datePickerDialog.setMessage("Note: Click on the date, month or year to edit manually");
@@ -147,6 +154,9 @@ public class CgRegisterFragment extends Fragment implements WelcomeContracts.Reg
setFocusManager();
// not allowing leading spaces
binding.name.addTextChangedListener(TextUtils.LEADING_SPACE_WATCHER);
binding.email.addTextChangedListener(TextUtils.LEADING_SPACE_WATCHER);
}
private void clickEvents() {

2
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java
View File

@@ -163,7 +163,7 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con
// and doctor not yet set
AppUtil.showAlert(requireContext(),
"This contact is reserved",
"Contact is reserved for your primary doctor, Please add medical information.",
"Last contact is reserved for your primary doctor. Once you complete your medical information, the contact information will be filled in automatically.",
getString(R.string.ok), ((dialogInterface, i) -> {}), null, null);
return;
}

4
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/ContactViewModel.java
View File

@@ -181,9 +181,7 @@ public class ContactViewModel extends AndroidViewModel {
String title;
if (isSosSet && sos_contact_name != null){
title = "Are you sure you want to remove " + sos_contact_name + " as Sos? & add " +
((current_name.trim().isEmpty())?"this contact":current_name) +
" as Sos?";
title = "You are about to change emergency number from " + sos_contact_name + " to this contact. Please confirm";
}else{
title = context.getString(R.string.make_sos);
}

2
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/forgotpin/CheckMailFragment.java
View File

@@ -221,7 +221,7 @@ public class CheckMailFragment extends Fragment implements WelcomeContracts.Veri
if (checkOTPInputs()){
verifyOTP();
}else {
Toast.makeText(requireContext(), "Enter OTP received on your email.", Toast.LENGTH_SHORT).show();
Toast.makeText(requireContext(), "Enter PIN received on your email.", Toast.LENGTH_SHORT).show();
}
});

5
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/ReActivateFragment.java
View File

@@ -73,10 +73,12 @@ public class ReActivateFragment extends Fragment implements AccountPresenter.Acc
// setting message
String message;
String title = null;
if (AccountPresenter.ACC_DEACTIVATE_BY_USER == caregiver_status){
// deactivated by cg
if (is_caregiver){
message = getString(R.string.re_activate_msg_cg_by_cg);
title = getString(R.string.deactivate_title_cg);
binding.reActivateBtn.setVisibility(View.VISIBLE);
}else {
@@ -96,6 +98,9 @@ public class ReActivateFragment extends Fragment implements AccountPresenter.Acc
}
binding.message.setText(message);
if (title != null){
binding.title.setText(title);
}
}
private void clickEvents() {

11
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/RegisterFragment.java
View File

@@ -5,7 +5,10 @@ import android.app.ProgressDialog;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
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,6 +23,7 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.Navigation;
import com.app.simplitend.apputils.TextUtils;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber;
@@ -95,6 +99,10 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
}
}, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
datePickerDialog.getDatePicker().setMaxDate(calendar.getTimeInMillis());
// max age 120 years
calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 18 - 122);
datePickerDialog.getDatePicker().setMinDate(calendar.getTimeInMillis());
datePickerDialog.setTitle("Select a date");
datePickerDialog.setMessage("Note: Click on the date, month or year to edit manually");
@@ -120,6 +128,9 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
setFocusManager();
// not allowing leading spaces
binding.name.addTextChangedListener(TextUtils.LEADING_SPACE_WATCHER);
binding.email.addTextChangedListener(TextUtils.LEADING_SPACE_WATCHER);
}
private void setFocusManager() {

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

@@ -580,7 +580,7 @@
android:id="@+id/fua"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible"
android:visibility="gone"
android:orientation="horizontal">
<LinearLayout

166
app/src/main/res/layout/activity_deactivate_acc.xml
View File

@@ -28,13 +28,16 @@
android:layout_height="wrap_content"
android:fontFamily="@font/nunito_bold"
android:text="@string/reason_for_leaving"
android:text="@string/we_are_sorry_to_see_you_go"
android:textColor="@color/black"
android:textSize="@dimen/_18ssp"
android:textAlignment="center"
/>
<TextView
android:id="@+id/sub_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -45,101 +48,107 @@
android:textAlignment="center"
android:layout_marginTop="25dp"
android:layout_marginTop="5dp"
/>
<LinearLayout
android:layout_width="wrap_content"
<RadioGroup
android:id="@+id/reason_radio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Reason 1"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textSize="@dimen/_14ssp"
android:background="@drawable/edit_text_bg_2"
android:paddingHorizontal="15dp"
android:paddingVertical="5dp"
android:layout_marginVertical="5dp"
android:layout_marginHorizontal="5dp"
android:elevation="3dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Reason 2"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textSize="@dimen/_14ssp"
android:background="@drawable/edit_text_bg_2"
android:paddingHorizontal="15dp"
android:paddingVertical="5dp"
android:layout_marginVertical="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="15dp"
android:elevation="3dp"
/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/or"
android:textColor="#1B6DC1"
android:textSize="@dimen/_18ssp"
android:fontFamily="@font/nunito_bold"
android:layout_marginVertical="25dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/nunito_semibold"
android:text="@string/tell_us_why_you_are_leaving"
android:textColor="@color/black"
android:textSize="@dimen/_14ssp"
android:layout_gravity="start"
android:layout_marginVertical="15dp"
android:orientation="vertical"
>
<com.google.android.material.radiobutton.MaterialRadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/too_difficult_to_use_the_application"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
android:fontFamily="@font/nunito_regular"
app:buttonTint="@color/color_primary_dark"
/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/missing_feature"
android:fontFamily="@font/nunito_regular"
app:buttonTint="@color/color_primary_dark"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/too_expensive"
android:fontFamily="@font/nunito_regular"
app:buttonTint="@color/color_primary_dark"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
android:textColor="@color/black"
/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bad_customer_support"
android:fontFamily="@font/nunito_regular"
app:buttonTint="@color/color_primary_dark"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
android:textColor="@color/black"
/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/i_don_t_have_a_need_for_this_app_anymore"
android:fontFamily="@font/nunito_regular"
app:buttonTint="@color/color_primary_dark"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
/>
<com.google.android.material.radiobutton.MaterialRadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/other"
android:fontFamily="@font/nunito_regular"
app:buttonTint="@color/color_primary_dark"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
/>
</RadioGroup>
/>
<EditText
android:id="@+id/reason_input"
android:layout_width="match_parent"
android:layout_height="@dimen/_150sdp"
android:layout_height="@dimen/_100sdp"
android:maxHeight="@dimen/_100sdp"
android:background="@drawable/edit_text_bg_2"
android:layout_marginTop="5dp"
android:hint="@string/enter_your_reason_here"
android:hint="@string/add_a_comment"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
android:gravity="top"
android:paddingHorizontal="10dp"
android:paddingVertical="5dp"
android:paddingHorizontal="15dp"
android:paddingVertical="10dp"
android:inputType="textMultiLine|textCapSentences"
@@ -150,7 +159,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="50dp"
android:layout_marginTop="25dp"
android:layout_marginBottom="25dp"
android:backgroundTint="@color/color_primary"
android:paddingVertical="15dp"
@@ -222,9 +231,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:fontFamily="@font/nunito_regular"
android:text="@string/lorem_ipsum_has_been_the_industry_s_standard_dummy_text_ever_since_the_1500s_when_an_unknown_printer_took_a_galley_of_type_and_scrambled_it_to_make_a_type"
android:text="@string/deactivate_account_text_cg"
android:textAlignment="center"
android:textColor="@color/black"

1
app/src/main/res/layout/activity_pat_settings.xml
View File

@@ -36,6 +36,7 @@
<TextView
android:id="@+id/de_activate"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -345,15 +345,15 @@
android:layout_marginVertical="15dp"
android:layout_marginHorizontal="15dp"
android:text="@string/next"
android:text="@string/let_s_get_started"
android:textColor="@color/white_bg"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textAllCaps="false"
android:fontFamily="@font/nunito_regular"
android:fontFamily="@font/nunito_bold"
android:layout_alignParentBottom="true"
android:paddingVertical="15dp"
android:paddingVertical="10dp"
app:cornerRadius="10dp"

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

@@ -80,6 +80,10 @@
android:autofillHints="name"
android:inputType="textCapWords"
android:maxLength="50"
android:singleLine="true"
android:digits="@string/allowed_alphabets_with_space"
/>
<TextView

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

@@ -27,6 +27,7 @@
/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -38,6 +39,8 @@
android:textColor="@color/black"
android:textSize="@dimen/_16ssp"
android:textAlignment="center"
/>
<TextView
@@ -75,6 +78,7 @@
<TextView
android:id="@+id/call"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -345,15 +345,15 @@
android:layout_marginVertical="15dp"
android:layout_marginHorizontal="15dp"
android:text="@string/next"
android:text="@string/let_s_get_started"
android:textColor="@color/white_bg"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textAllCaps="false"
android:fontFamily="@font/nunito_regular"
android:fontFamily="@font/nunito_bold"
android:layout_alignParentBottom="true"
android:paddingVertical="15dp"
android:paddingVertical="10dp"
app:cornerRadius="10dp"

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

@@ -1,161 +1,152 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/white_bg"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
android:orientation="vertical">
<ImageView
android:id="@+id/back_btn"
android:layout_width="35sp"
android:layout_height="35sp"
android:layout_margin="15dp"
android:contentDescription="@string/back_button"
android:padding="5dp"
android:src="@drawable/arrow_back"
android:layout_margin="15dp"
android:paddingStart="-15dp"
android:paddingEnd="0dp"
/>
android:src="@drawable/arrow_back" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lets_get_started"
android:layout_marginHorizontal="15dp"
android:fontFamily="@font/nunito_medium"
android:text="@string/lets_get_started"
android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
android:textColor="@color/black"
android:layout_marginHorizontal="15dp"
/>
android:textColor="@color/black" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="5dp"
android:fontFamily="@font/nunito_regular"
android:text="@string/enter_your_contact_information"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:fontFamily="@font/nunito_regular"
android:layout_marginVertical="5dp"
android:textColor="@color/black"
/>
android:textColor="@color/black" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/name"
android:fontFamily="@font/nunito_medium"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:layout_gravity="start"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="35sp"
/>
android:fontFamily="@font/nunito_medium"
android:text="@string/name"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black" />
<EditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/edit_text_bg_2"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp"
android:autofillHints="name"
android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ "
android:maxLines="1"
android:maxLength="20"
android:hint="@string/enter_your_full_name"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:imeOptions="actionNext"
android:paddingVertical="15dp"
android:padding="10dp"
android:background="@drawable/edit_text_bg_2"
android:drawableStart="@drawable/ic_user"
android:drawablePadding="10dp"
android:fontFamily="@font/nunito_regular"
android:hint="@string/enter_your_full_name"
android:autofillHints="name"
android:inputType="textPersonName|textCapWords"
android:inputType="textCapWords"
android:padding="10dp"
android:paddingVertical="15dp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
android:maxLength="50"
android:singleLine="true"
android:digits="@string/allowed_alphabets_with_space"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/date_of_birth"
android:fontFamily="@font/nunito_medium"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:layout_gravity="start"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp"
/>
android:fontFamily="@font/nunito_medium"
android:text="@string/date_of_birth"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black" />
<TextView
android:id="@+id/dob"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/edit_text_bg_2"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp"
android:hint="@string/enter_your_date_of_birth"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:gravity="center_vertical"
android:paddingVertical="15dp"
android:padding="10dp"
android:background="@drawable/edit_text_bg_2"
android:drawablePadding="10dp"
android:fontFamily="@font/nunito_regular"
android:gravity="center_vertical"
android:hint="@string/enter_your_date_of_birth"
android:padding="10dp"
android:paddingVertical="15dp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
app:drawableStartCompat="@drawable/ic_dob" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/contact_number"
android:fontFamily="@font/nunito_medium"
android:textColor="@color/black"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:layout_gravity="start"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp"
/>
android:fontFamily="@font/nunito_medium"
android:text="@string/contact_number"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp"
android:background="@drawable/edit_text_bg_2"
android:gravity="center_vertical"
android:background="@drawable/edit_text_bg_2"
android:orientation="horizontal"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/phone_number"
android:layout_marginVertical="10dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_phone"
android:layout_marginVertical="10dp"/>
android:contentDescription="@string/phone_number"
android:src="@drawable/ic_phone" />
<com.skydoves.powerspinner.PowerSpinnerView
android:id="@+id/country_codes"
@@ -170,78 +161,75 @@
android:textColor="@color/black"
android:textSize="14.5sp"
app:spinner_arrow_drawable="@drawable/ic_down"
app:spinner_popup_max_height="200dp"
app:spinner_arrow_animate="true"
app:fontFamily="@font/nunito_regular"
app:spinner_arrow_animate="true"
app:spinner_arrow_drawable="@drawable/ic_down"
app:spinner_arrow_gravity="end"
app:spinner_arrow_padding="8dp"
app:spinner_divider_color="@color/black"
app:spinner_divider_show="true"
app:spinner_divider_size="0.4dp"
app:spinner_divider_color="@color/black"
app:spinner_item_height="46dp"
app:spinner_popup_animation="dropdown"
app:spinner_popup_background="@drawable/edit_text_bg_2"
app:spinner_popup_elevation="14dp" />
app:spinner_popup_elevation="14dp"
app:spinner_popup_max_height="200dp" />
<View
android:layout_width="0.5dp"
android:layout_height="match_parent"
android:background="@android:color/darker_gray"
android:layout_marginVertical="10dp"/>
android:layout_marginVertical="10dp"
android:background="@android:color/darker_gray" />
<EditText
android:id="@+id/contact_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autofillHints="phone"
android:background="@android:color/transparent"
android:hint="@string/phone_number"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:paddingVertical="15dp"
android:hint="@string/phone_number"
android:inputType="number"
android:padding="10dp"
android:autofillHints="phone"
android:inputType="number"
/>
android:paddingVertical="15dp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="start"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="15dp"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/email_address"
android:fontFamily="@font/nunito_medium"
android:textColor="@color/black"
android:text="@string/email_address"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
/>
android:textColor="@color/black" />
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/optional"-->
<!-- android:fontFamily="@font/nunito_medium"-->
<!-- android:textAppearance="@style/TextAppearance.Material3.TitleMedium"-->
<!-- android:textColor="@android:color/darker_gray"-->
<!-- android:layout_marginStart="5dp"-->
<!-- />-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/optional"-->
<!-- android:fontFamily="@font/nunito_medium"-->
<!-- android:textAppearance="@style/TextAppearance.Material3.TitleMedium"-->
<!-- android:textColor="@android:color/darker_gray"-->
<!-- android:layout_marginStart="5dp"-->
<!-- />-->
</LinearLayout>
@@ -249,51 +237,48 @@
android:id="@+id/email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/edit_text_bg_2"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp"
android:autofillHints="emailAddress"
android:hint="@string/enter_email_address"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:paddingVertical="15dp"
android:padding="10dp"
android:background="@drawable/edit_text_bg_2"
android:drawableStart="@drawable/ic_email"
android:drawablePadding="10dp"
android:fontFamily="@font/nunito_regular"
android:hint="@string/enter_email_address"
android:autofillHints="emailAddress"
android:inputType="textEmailAddress"
/>
android:padding="10dp"
android:paddingVertical="15dp"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black"
android:textColorHint="@android:color/darker_gray" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginHorizontal="15dp"
android:gravity="center_vertical"
>
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/tncCheck"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:checked="false"
android:button="@drawable/remember_me_selector"
android:paddingHorizontal="10dp"
android:background="@android:color/transparent"
/>
android:button="@drawable/remember_me_selector"
android:checked="false"
android:paddingHorizontal="10dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/i_accept"
android:fontFamily="@font/nunito_regular"
android:text="@string/i_accept"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black"
@@ -304,12 +289,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/terms_n_conditions"
android:fontFamily="@font/nunito_regular"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black"
android:padding="5dp"
android:text="@string/terms_n_conditions"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/black"
/>
@@ -321,18 +306,17 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="15dp"
android:text="@string/next"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textAllCaps="false"
android:fontFamily="@font/nunito_regular"
android:textColor="@color/white_bg"
android:paddingVertical="15dp"
app:backgroundTint="@color/color_primary"
app:cornerRadius="15dp"
android:drawableEnd="@drawable/ic_forward_error"
android:drawablePadding="15dp"
/>
android:fontFamily="@font/nunito_regular"
android:paddingVertical="15dp"
android:text="@string/next"
android:textAllCaps="false"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="@color/white_bg"
app:backgroundTint="@color/color_primary"
app:cornerRadius="15dp" />
</LinearLayout>

22
app/src/main/res/values/strings.xml
View File

@@ -293,7 +293,7 @@
<string name="enter_otp">Enter OTP</string>
<string name="password_details"><![CDATA[- Be at least 8 characters in length. \n- Contain both upper and lowercase alphabetic characters (e.g. A-Z, a-z). \n- Have at least one numerical character (e.g. 0-9). \n- Have at least one special character (e.g. ~!@#$%^&*()_-+=).]]></string>
<string name="info">info</string>
<string name="create_geo_fence">Create Geo Fence</string>
<string name="create_geo_fence">Create geofence</string>
<string name="unlock_with_faceid">Unlock with FaceID</string>
<string name="or">OR</string>
<string name="unlock_with_fingerprint">Unlock with Fingerprint or FaceID</string>
@@ -352,15 +352,14 @@
<string name="delete_account">Deactivate Account</string>
<string name="logout">Logout</string>
<string name="sad_to_see_you_go">Sad to see you go</string>
<string name="lorem_ipsum_has_been_the_industry_s_standard_dummy_text_ever_since_the_1500s_when_an_unknown_printer_took_a_galley_of_type_and_scrambled_it_to_make_a_type">Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type</string>
<string name="deactivate_account_text_cg">Once your account is deactivated, both your data and the senior profile data will be deleted after 30 days. You will be able to access your profile data if you reactivate your account within 30 days.</string>
<string name="i_don_t_want_to_deactivate">I don\'t want to deactivate</string>
<string name="yes_i_am_ready_to_deactivate_my_account">Yes I am ready to deactivate my account</string>
<string name="reason_for_leaving">Reason for leaving ?</string>
<string name="please_select_from_below_the_possible_reasons">Please select from below the possible reasons</string>
<string name="please_select_from_below_the_possible_reasons">Would you tell us why?</string>
<string name="tell_us_why_you_are_leaving">Tell us why you are leaving ?</string>
<string name="enter_your_reason_here">Enter your reason here\.\.\.</string>
<string name="do_not_deactivate">Do Not Deactivate</string>
<string name="confirm_deactivation">Confirm Deactivation</string>
<string name="confirm_deactivation">Confirm deactivation and cancel my subscription</string>
<string name="year">Yearly</string>
<string name="_25">-25% OFF</string>
<string name="_71_4"><strike>$71.4</strike></string>
@@ -396,7 +395,7 @@
<string name="instructions_title">Instructions:</string>
<string name="you_are_about_to_change_emergency_number_from_this_contact_to_911_please_confirm">You are about to change emergency number from this contact to 911. Please confirm</string>
<string name="your_account_has_been_deactivated">Your account has been deactivated</string>
<string name="re_activate_msg_cg_by_cg">To reactivate your account, please click on the re-activate button below. You will be able to use your account again.</string>
<string name="re_activate_msg_cg_by_cg">Kindly uninstall the SimpliTend apps from your phone as well as the Senior phone.\n\nYou will be able to reactivate your account within the next 30 days installing the SimpliTend app and log into your account.</string>
<string name="re_activate_msg_cg_by_admin">Your account is disabled/deactivated by admin. To reactivate your account, please contact admin.</string>
<string name="re_activate_msg_patient_by_cg">Your caregiver has deactivated your account. To reactivate account please inform caregiver to activate the account and continue for uninterrupted services.</string>
<string name="re_activate_msg_patient_by_admin">Your account is disabled/deactivated by admin. To reactivate your account, please contact admin.</string>
@@ -455,5 +454,16 @@
<string name="your_payment_was_successfully_processed">Your payment was successfully processed</string>
<string name="you_can_now_link_to_your_loved_one_s_smartphone_and_receive_notifications">You can now link to your loved one\'s smartphone and receive notifications</string>
<string name="link_to_senior_phone">Link to senior phone</string>
<string name="deactivate_title_cg">Your account has been deactivated and your subscription has been cancelled</string>
<string name="we_are_sorry_to_see_you_go">We are sorry to see you go</string>
<string name="add_a_comment">Add a comment...</string>
<string name="too_difficult_to_use_the_application">Too difficult to use the application</string>
<string name="missing_feature">Missing feature</string>
<string name="too_expensive">Too expensive</string>
<string name="bad_customer_support">Bad customer support</string>
<string name="other">Other</string>
<string name="i_don_t_have_a_need_for_this_app_anymore">I don\'t have a need for this app anymore</string>
<string name="let_s_get_started">Let\'s get started</string>
<string name="allowed_alphabets_with_space">abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
</resources>