.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.ssb.simplitend.patientprofile;
|
||||
|
||||
import static com.ssb.simplitend.patientprofile.RegisterCompleteFragment.IS_CONNECTED_TO_CG;
|
||||
import static com.ssb.simplitend.patientprofile.RegisterCompleteFragment.PROFILE_PROGRESS;
|
||||
|
||||
import android.app.ProgressDialog;
|
||||
@@ -32,7 +33,7 @@ public class ProfileProgressFragment extends Fragment implements ProfileContract
|
||||
|
||||
private ProgressDialog progressDialog;
|
||||
|
||||
int profile_progress;
|
||||
int profile_progress, is_connected_to_caregiver;
|
||||
|
||||
public ProfileProgressFragment() {
|
||||
// required empty const.
|
||||
@@ -106,6 +107,7 @@ public class ProfileProgressFragment extends Fragment implements ProfileContract
|
||||
binding.proceed.setOnClickListener(v -> {
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putInt(PROFILE_PROGRESS, profile_progress);
|
||||
bundle.putInt(IS_CONNECTED_TO_CG, is_connected_to_caregiver);
|
||||
|
||||
Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_registerCompleteFragment, bundle);
|
||||
});
|
||||
@@ -116,6 +118,7 @@ public class ProfileProgressFragment extends Fragment implements ProfileContract
|
||||
public void onProfileProgressFetched(@NonNull PatientData patientData) {
|
||||
|
||||
profile_progress = 0;
|
||||
is_connected_to_caregiver = patientData.isCareGiverConnectedWithPatient;
|
||||
|
||||
if (patientData.isCareGiverLink == 1) {
|
||||
// TODO: 25-07-2023 look into this
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ssb.simplitend.patientprofile;
|
||||
|
||||
import android.animation.Animator;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
@@ -15,14 +16,16 @@ import com.daimajia.androidanimations.library.YoYo;
|
||||
import com.ssb.simplitend.R;
|
||||
import com.ssb.simplitend.apputils.AppUtil;
|
||||
import com.ssb.simplitend.databinding.RegisterationDoneFragmentBinding;
|
||||
import com.ssb.simplitend.patient_dashboard.DashBoardActivity;
|
||||
|
||||
public class RegisterCompleteFragment extends Fragment {
|
||||
|
||||
public RegisterationDoneFragmentBinding binding;
|
||||
|
||||
public static final String PROFILE_PROGRESS = "profile_progress";
|
||||
public static final String IS_CONNECTED_TO_CG = "is_connect_to_cg";
|
||||
|
||||
int profile_progress;
|
||||
int profile_progress, is_connect_to_caregiver;
|
||||
|
||||
public RegisterCompleteFragment(){
|
||||
// required
|
||||
@@ -35,6 +38,7 @@ public class RegisterCompleteFragment extends Fragment {
|
||||
|
||||
if (getArguments() != null){
|
||||
profile_progress = getArguments().getInt(PROFILE_PROGRESS, 20);
|
||||
is_connect_to_caregiver = getArguments().getInt(IS_CONNECTED_TO_CG, 0);
|
||||
}
|
||||
|
||||
binding.animIv.setAnimation(R.raw.done_anim_2);
|
||||
@@ -69,15 +73,27 @@ public class RegisterCompleteFragment extends Fragment {
|
||||
});
|
||||
|
||||
binding.proceed.setOnClickListener(v -> {
|
||||
AppUtil.showAlert(requireContext(),
|
||||
"Ask Caregiver to register",
|
||||
"Kindly ask CareGiver to complete registeration.",
|
||||
"OK",
|
||||
((dialogInterface, i) -> {
|
||||
|
||||
}), null, null);
|
||||
if (is_connect_to_caregiver == 1){
|
||||
gotoPatientDashBoard();
|
||||
}else {
|
||||
AppUtil.showAlert(requireContext(),
|
||||
"Ask Caregiver to register",
|
||||
"Kindly ask CareGiver to complete registeration.",
|
||||
"OK",
|
||||
((dialogInterface, i) -> {
|
||||
|
||||
}), null, null);
|
||||
}
|
||||
});
|
||||
|
||||
return binding.getRoot();
|
||||
}
|
||||
|
||||
private void gotoPatientDashBoard() {
|
||||
Intent intent = new Intent(requireActivity(), DashBoardActivity.class);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
startActivity(intent);
|
||||
requireActivity().finish();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -328,7 +328,7 @@ public class AddMedicalInfoFragment extends Fragment implements
|
||||
|
||||
AppUtil.showAnimateDBS(requireContext(),
|
||||
title,
|
||||
R.raw.done_anim_primary, 3000,
|
||||
R.raw.done_anim_primary, 3600,
|
||||
yes -> {
|
||||
Navigation.findNavController(binding.getRoot()).popBackStack(R.id.medicalInfoFragment, false);
|
||||
});
|
||||
|
||||
@@ -700,7 +700,7 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh
|
||||
|
||||
AppUtil.showAnimateDBS(requireContext(),
|
||||
getString(R.string.changes_successful), R.raw.done_anim_primary,
|
||||
3000, v3 -> {
|
||||
3600, v3 -> {
|
||||
// here v3 is null
|
||||
Navigation.findNavController(binding.getRoot()).popBackStack(R.id.reminderFragment, false, true);
|
||||
});
|
||||
|
||||
@@ -437,7 +437,7 @@ ReminderAdapter.ReminderCheckClickListener{
|
||||
dialog.dismiss();
|
||||
});
|
||||
}else{
|
||||
Toast.makeText(requireContext(), "Cannot done future routine.", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), "Cannot mark future routine.", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
}catch (Exception e){
|
||||
|
||||
@@ -476,7 +476,7 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe
|
||||
|
||||
AppUtil.showAnimateDBS(requireContext(),
|
||||
getString(R.string.changes_successful), R.raw.done_anim_primary,
|
||||
3000, v3 -> {
|
||||
3600, v3 -> {
|
||||
// here v3 is null
|
||||
Navigation.findNavController(binding.getRoot()).popBackStack(R.id.routineFragment, false, true);
|
||||
});
|
||||
|
||||
@@ -407,7 +407,7 @@ public class RoutineFragment extends Fragment implements RoutineAdapter.ClickLis
|
||||
dialog.dismiss();
|
||||
});
|
||||
}else{
|
||||
Toast.makeText(requireContext(), "Cannot done future routine.", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(requireContext(), "Cannot mark future routine.", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
}catch (Exception e){
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ssb.simplitend.welcome.welcomecg.fragments;
|
||||
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.text.Editable;
|
||||
import android.text.TextWatcher;
|
||||
@@ -18,6 +19,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.caregiverdashboard.CaregiverDashActivity;
|
||||
import com.ssb.simplitend.databinding.ConnectCaregiverFragmentBinding;
|
||||
import com.ssb.simplitend.welcome.welcomecg.WelcomeContracts;
|
||||
import com.ssb.simplitend.welcome.welcomecg.mvvm.CgWelcomeViewModel;
|
||||
@@ -143,6 +145,13 @@ public class CgConnectFragment extends Fragment implements WelcomeContracts.Conn
|
||||
progressDialog.dismiss();
|
||||
|
||||
Toast.makeText(requireContext(), "Caregiver connected.", Toast.LENGTH_SHORT).show();
|
||||
|
||||
// go to cg dash board
|
||||
Intent intent = new Intent(requireActivity(), CaregiverDashActivity.class);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
startActivity(intent);
|
||||
requireActivity().finish();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -205,6 +205,7 @@ public class CgRegisterFragment extends Fragment implements WelcomeContracts.Reg
|
||||
// todo should be removed afterwards
|
||||
binding.dob.setOnLongClickListener(v -> {
|
||||
binding.dob.setText("12-12-2001");
|
||||
binding.dob.setHint("12-12-2001");
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.navigation.NavOptions;
|
||||
import androidx.navigation.Navigation;
|
||||
|
||||
import com.ssb.simplitend.R;
|
||||
@@ -111,6 +112,24 @@ public class CgSignInFragment extends Fragment implements WelcomeContracts.CgLog
|
||||
return allOkay;
|
||||
}
|
||||
|
||||
private void gotoCgAuthActivity() {
|
||||
Intent intent = new Intent(requireActivity(), CgAuthActivity.class);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
startActivity(intent);
|
||||
|
||||
requireActivity().finish();
|
||||
}
|
||||
|
||||
private void gotoCgConnect() {
|
||||
NavOptions navOptions = new NavOptions.Builder()
|
||||
.setPopUpTo(R.id.welcomeFragment, true)
|
||||
.build();
|
||||
|
||||
// goto cg connect screen
|
||||
Navigation.findNavController(binding.getRoot())
|
||||
.navigate(R.id.action_cgSignInFragment_to_cgConnectFragment, null, navOptions);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoginSuccess(CareGiverData careGiverData, String token) {
|
||||
progressDialog.dismiss();
|
||||
@@ -118,11 +137,12 @@ public class CgSignInFragment extends Fragment implements WelcomeContracts.CgLog
|
||||
|
||||
AppUtil.saveCgData(token, requireContext());
|
||||
|
||||
Intent intent = new Intent(requireActivity(), CgAuthActivity.class);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
startActivity(intent);
|
||||
if (careGiverData.isPatientLinkedAndConnected == 1){
|
||||
gotoCgAuthActivity();
|
||||
}else{
|
||||
gotoCgConnect();
|
||||
}
|
||||
|
||||
requireActivity().finish();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -32,5 +32,6 @@ public class CareGiverData{
|
||||
public int is_patient;
|
||||
public int is_caregiver;
|
||||
public int is_caregiver_account_updated;
|
||||
public int isPatientLinkedAndConnected;
|
||||
public String is_admin;
|
||||
}
|
||||
|
||||
@@ -161,16 +161,23 @@ public class SignInFragment extends Fragment implements WelcomeContracts.Registe
|
||||
Toast.makeText(requireContext(), "Log in successful.", Toast.LENGTH_SHORT).show();
|
||||
|
||||
if (patientResult.patientData != null){
|
||||
if (patientResult.patientData.isCareGiverLink == 1){
|
||||
if (patientResult.patientData.isCareGiverConnectedWithPatient == 1){
|
||||
// connected to caregiver
|
||||
// thus, sending it to dashboard
|
||||
Intent intent = new Intent(requireActivity(), DashBoardActivity.class);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
startActivity(intent);
|
||||
requireActivity().finish();
|
||||
} else if (patientResult.patientData.isCareGiverLink == 1){
|
||||
gotoProfileProgress();
|
||||
return;
|
||||
}else{
|
||||
// no patient data or no caregiver contact yet added thus sending to contact list
|
||||
gotoContactList();
|
||||
}
|
||||
}else{
|
||||
// no patient data or no caregiver contact yet added thus sending to contact list
|
||||
gotoContactList();
|
||||
}
|
||||
|
||||
// no patient data or no caregiver contact yet added thus sending to contactlist
|
||||
gotoContactList();
|
||||
|
||||
// TODO: 09-08-2023 don't do anything further more.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -55,19 +55,5 @@ public class SignInSignUpFragment extends Fragment {
|
||||
onBoardPagerAdapter = new OnBoardPagerAdapter(getChildFragmentManager(), getLifecycle());
|
||||
binding.viewPager.setAdapter(onBoardPagerAdapter);
|
||||
binding.circleIndicator.setViewPager(binding.viewPager);
|
||||
|
||||
// margin top to indicator depending upon screen density so that... image in onboard looks non-stretched vertically
|
||||
float dynamic_size = getResources().getDisplayMetrics().ydpi;
|
||||
|
||||
if (dynamic_size >= 420){
|
||||
|
||||
dynamic_size = dynamic_size * 0.4f;
|
||||
|
||||
LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) binding.circleIndicator.getLayoutParams();
|
||||
layoutParams.setMargins(0, (int) dynamic_size, 0, 0);
|
||||
|
||||
binding.circleIndicator.setLayoutParams(layoutParams);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -387,7 +387,7 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
|
||||
Toast.makeText(requireActivity(), "Contact updated successFully.", Toast.LENGTH_SHORT).show();
|
||||
Navigation.findNavController(binding.getRoot()).popBackStack(R.id.addContactFragment, false);
|
||||
|
||||
}, 3000);
|
||||
}, 3600);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.ssb.simplitend.welcome.welcomepatient.fragments.onboardfragments;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.util.TypedValue;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
@@ -29,17 +29,29 @@ public class OnBoardOne extends Fragment {
|
||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
binding = OnboardOneFragmentBinding.inflate(inflater, container, false);
|
||||
|
||||
float dynamic_size = getResources().getDisplayMetrics().ydpi * 0.3f;
|
||||
// Calculate screen dimensions in pixels
|
||||
DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
|
||||
int screenWidth = displayMetrics.widthPixels;
|
||||
int screenHeight = displayMetrics.heightPixels;
|
||||
|
||||
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) binding.image.getLayoutParams();
|
||||
layoutParams.setMargins(10, 0, 10, (int) dynamic_size);
|
||||
// Calculate aspect ratio
|
||||
float aspectRatio = (float) screenHeight / (float) screenWidth;
|
||||
|
||||
binding.image.setLayoutParams(layoutParams);
|
||||
// Toast.makeText(requireContext(), "" + aspectRatio, Toast.LENGTH_SHORT).show();
|
||||
|
||||
LinearLayout.LayoutParams layoutParams3 = (LinearLayout.LayoutParams) binding.title.getLayoutParams();
|
||||
layoutParams.setMargins(10, 0,10, (int) dynamic_size);
|
||||
|
||||
binding.title.setLayoutParams(layoutParams3);
|
||||
if (aspectRatio > 2.1){
|
||||
// screen is taller
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_tall));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_tall));
|
||||
}else if (aspectRatio > 2){
|
||||
// screen is normal size
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_tall_medium));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_tall_medium));
|
||||
}else {
|
||||
// screen is smaller
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_small));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_small));
|
||||
}
|
||||
|
||||
return binding.getRoot();
|
||||
}
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.ssb.simplitend.welcome.welcomepatient.fragments.onboardfragments;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.util.TypedValue;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.RelativeLayout;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.ssb.simplitend.databinding.OnboardOneFragmentBinding;
|
||||
import com.ssb.simplitend.R;
|
||||
import com.ssb.simplitend.databinding.OnboardThreeFragmentBinding;
|
||||
|
||||
public class OnBoardThree extends Fragment {
|
||||
@@ -28,17 +28,30 @@ public class OnBoardThree extends Fragment {
|
||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
binding = OnboardThreeFragmentBinding.inflate(inflater, container, false);
|
||||
|
||||
float dynamic_size = getResources().getDisplayMetrics().ydpi * 0.3f;
|
||||
// Calculate screen dimensions in pixels
|
||||
DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
|
||||
int screenWidth = displayMetrics.widthPixels;
|
||||
int screenHeight = displayMetrics.heightPixels;
|
||||
|
||||
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) binding.image.getLayoutParams();
|
||||
layoutParams.setMargins(10, 0, 10, (int) dynamic_size);
|
||||
// Calculate aspect ratio
|
||||
float aspectRatio = (float) screenHeight / (float) screenWidth;
|
||||
|
||||
binding.image.setLayoutParams(layoutParams);
|
||||
// Toast.makeText(requireContext(), "" + aspectRatio, Toast.LENGTH_SHORT).show();
|
||||
|
||||
LinearLayout.LayoutParams layoutParams3 = (LinearLayout.LayoutParams) binding.title.getLayoutParams();
|
||||
layoutParams.setMargins(10, 0,10, (int) dynamic_size);
|
||||
if (aspectRatio > 2.1){
|
||||
// screen is taller
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_tall));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_tall));
|
||||
}else if (aspectRatio > 2){
|
||||
// screen is normal size
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_tall_medium));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_tall_medium));
|
||||
}else {
|
||||
// screen is smaller
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_small_2));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_small));
|
||||
}
|
||||
|
||||
binding.title.setLayoutParams(layoutParams3);
|
||||
|
||||
return binding.getRoot();
|
||||
}
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.ssb.simplitend.welcome.welcomepatient.fragments.onboardfragments;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.util.TypedValue;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.RelativeLayout;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.ssb.simplitend.databinding.OnboardOneFragmentBinding;
|
||||
import com.ssb.simplitend.R;
|
||||
import com.ssb.simplitend.databinding.OnboardTwoFragmentBinding;
|
||||
|
||||
public class OnBoardTwo extends Fragment {
|
||||
@@ -28,17 +28,30 @@ public class OnBoardTwo extends Fragment {
|
||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
binding = OnboardTwoFragmentBinding.inflate(inflater, container, false);
|
||||
|
||||
float dynamic_size = getResources().getDisplayMetrics().ydpi * 0.3f;
|
||||
// Calculate screen dimensions in pixels
|
||||
DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
|
||||
int screenWidth = displayMetrics.widthPixels;
|
||||
int screenHeight = displayMetrics.heightPixels;
|
||||
|
||||
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) binding.image.getLayoutParams();
|
||||
layoutParams.setMargins(10, 0, 10, (int) dynamic_size);
|
||||
// Calculate aspect ratio
|
||||
float aspectRatio = (float) screenHeight / (float) screenWidth;
|
||||
|
||||
binding.image.setLayoutParams(layoutParams);
|
||||
// Toast.makeText(requireContext(), "" + aspectRatio, Toast.LENGTH_SHORT).show();
|
||||
|
||||
LinearLayout.LayoutParams layoutParams3 = (LinearLayout.LayoutParams) binding.title.getLayoutParams();
|
||||
layoutParams.setMargins(10, 0,10, (int) dynamic_size);
|
||||
|
||||
binding.title.setLayoutParams(layoutParams3);
|
||||
if (aspectRatio > 2.1){
|
||||
// screen is taller
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_tall));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_tall));
|
||||
}else if (aspectRatio > 2){
|
||||
// screen is normal size
|
||||
binding.title.setText(getString(R.string.have_a_worry_nfree_stroll_2));
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_tall_medium));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_tall_medium));
|
||||
}else {
|
||||
// screen is smaller
|
||||
binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.title_small));
|
||||
binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.sub_title_small));
|
||||
}
|
||||
|
||||
return binding.getRoot();
|
||||
}
|
||||
|
||||
@@ -2,8 +2,6 @@ package com.ssb.simplitend.welcome.welcomepatient.fragments.register;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@@ -38,16 +36,24 @@ public class SplashFragment extends Fragment implements ProfileContracts.Profile
|
||||
@Override
|
||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
binding = SplashFragmentBinding.inflate(inflater, container, false);
|
||||
|
||||
binding.retry.setOnClickListener(v -> {
|
||||
checkIfAhyUser();
|
||||
});
|
||||
|
||||
return binding.getRoot();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
checkIfAhyUser();
|
||||
}
|
||||
|
||||
private void checkIfAhyUser() {
|
||||
binding.retry.setVisibility(View.GONE);
|
||||
binding.loadAnim.setVisibility(View.VISIBLE);
|
||||
|
||||
String token = AppUtil.getUserToken(requireContext());
|
||||
if (token != null && !token.isEmpty()){
|
||||
// user is already logged in as PATIENT
|
||||
@@ -103,7 +109,13 @@ public class SplashFragment extends Fragment implements ProfileContracts.Profile
|
||||
|
||||
@Override
|
||||
public void onProfileProgressFetched(PatientData patientData) {
|
||||
if (patientData.isCareGiverLink == 1){
|
||||
binding.retry.setVisibility(View.GONE);
|
||||
binding.loadAnim.setVisibility(View.GONE);
|
||||
|
||||
if (patientData.isCareGiverConnectedWithPatient == 1){
|
||||
// go to dashboard
|
||||
gotoDashBoard();
|
||||
}else if (patientData.isCareGiverLink == 1){
|
||||
// user has already added caregiver as a contact
|
||||
// thus, sending it to dashboard
|
||||
gotoProfileProgress();
|
||||
@@ -119,8 +131,19 @@ public class SplashFragment extends Fragment implements ProfileContracts.Profile
|
||||
}
|
||||
}
|
||||
|
||||
private void gotoDashBoard() {
|
||||
Intent intent = new Intent(requireActivity(), DashBoardActivity.class);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
startActivity(intent);
|
||||
requireActivity().finish();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onProfileProgressFetchFailed(Throwable t, String message) {
|
||||
|
||||
Toast.makeText(requireContext(), "Couldn't connect.", Toast.LENGTH_SHORT).show();
|
||||
|
||||
binding.retry.setVisibility(View.VISIBLE);
|
||||
binding.loadAnim.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,8 @@ public class PatientData {
|
||||
public int isCareGiverLink
|
||||
, isPatientReminderData
|
||||
, isPatientRoutineData
|
||||
, isPatientMedicalData;
|
||||
, isPatientMedicalData
|
||||
, isCareGiverConnectedWithPatient;
|
||||
|
||||
public PatientData() {
|
||||
}
|
||||
|
||||
@@ -1,58 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/white_bg"
|
||||
android:gravity="center_horizontal"
|
||||
android:id="@+id/relativeLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/white_bg"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image"
|
||||
android:layout_above="@id/ll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:scaleType="fitXY"
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
app:srcCompat="@drawable/onboard_one"
|
||||
android:contentDescription="@string/onboard_image"
|
||||
/>
|
||||
android:layout_marginBottom="@dimen/_15sdp"
|
||||
android:layout_marginHorizontal="5dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/onboard_one" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_alignParentBottom="true"
|
||||
<TextView
|
||||
android:id="@+id/sub_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:id="@+id/ll">
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:text="@string/continue_using_your_smartphone_without_the_annoying_robocalls_and_spam_text_messages"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/_14ssp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/avoid_unwanted_phone_calls"
|
||||
android:textSize="@dimen/_20ssp"
|
||||
android:textColor="@color/black"
|
||||
android:fontFamily="@font/nunito_bold"
|
||||
android:gravity="bottom"
|
||||
android:textAlignment="center"
|
||||
android:layout_marginTop="@dimen/_5sdp"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
android:fontFamily="@font/nunito_bold"
|
||||
android:text="@string/avoid_unwanted_phone_calls"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/_20ssp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/sub_title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sub_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/continue_using_your_smartphone_without_the_annoying_robocalls_and_spam_text_messages"
|
||||
android:textColor="@color/black"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:layout_marginBottom="@dimen/_15sdp"
|
||||
android:textAlignment="center"
|
||||
android:textSize="@dimen/_16ssp"
|
||||
android:layout_marginHorizontal="15dp"
|
||||
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -1,57 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/white_bg"
|
||||
android:gravity="center_horizontal"
|
||||
android:id="@+id/relativeLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/white_bg"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image"
|
||||
android:layout_above="@id/ll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:scaleType="fitXY"
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
app:srcCompat="@drawable/onboard_three"
|
||||
android:contentDescription="@string/onboard_image"
|
||||
/>
|
||||
android:layout_marginBottom="@dimen/_15sdp"
|
||||
android:layout_marginHorizontal="5dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/onboard_three" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_alignParentBottom="true"
|
||||
<TextView
|
||||
android:id="@+id/sub_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:id="@+id/ll">
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:text="@string/configure_medication_reminders_and_alerts_include_the_dosage_instructions_and_refill_date"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/_14ssp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/never_miss_a_med_or_forget_a_refill_again"
|
||||
android:textSize="@dimen/_17ssp"
|
||||
android:textColor="@color/black"
|
||||
android:fontFamily="@font/nunito_bold"
|
||||
android:gravity="bottom"
|
||||
android:textAlignment="center"
|
||||
android:layout_marginTop="@dimen/_5sdp"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
android:fontFamily="@font/nunito_bold"
|
||||
android:text="@string/never_miss_a_med_or_forget_a_refill_again"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/_20ssp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/sub_title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sub_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/configure_medication_reminders_and_alerts_include_the_dosage_instructions_and_refill_date"
|
||||
android:textColor="@color/black"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:layout_marginBottom="@dimen/_15sdp"
|
||||
android:textAlignment="center"
|
||||
android:textSize="@dimen/_14ssp"
|
||||
android:layout_marginHorizontal="5dp"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -1,58 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/white_bg"
|
||||
android:gravity="center_horizontal"
|
||||
android:id="@+id/relativeLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/white_bg"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image"
|
||||
android:layout_above="@id/ll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:scaleType="fitXY"
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
app:srcCompat="@drawable/onboard_two"
|
||||
android:contentDescription="@string/onboard_image"
|
||||
/>
|
||||
android:layout_marginBottom="@dimen/_15sdp"
|
||||
android:layout_marginHorizontal="5dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/onboard_two" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_alignParentBottom="true"
|
||||
<TextView
|
||||
android:id="@+id/sub_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:id="@+id/ll">
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:text="@string/get_direction_to_home_with_a_push_a_button_from_your_smartphone_home_screen"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/_14ssp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/have_a_worry_nfree_stroll"
|
||||
android:textSize="@dimen/_20ssp"
|
||||
android:textColor="@color/black"
|
||||
android:fontFamily="@font/nunito_bold"
|
||||
android:gravity="bottom"
|
||||
android:textAlignment="center"
|
||||
android:layout_marginTop="@dimen/_5sdp"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:layout_marginHorizontal="@dimen/_5sdp"
|
||||
android:fontFamily="@font/nunito_bold"
|
||||
android:text="@string/have_a_worry_nfree_stroll"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/_20ssp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/sub_title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sub_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/get_direction_to_home_with_a_push_a_button_from_your_smartphone_home_screen"
|
||||
android:textColor="@color/black"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:layout_marginBottom="@dimen/_15sdp"
|
||||
android:textAlignment="center"
|
||||
android:textSize="@dimen/_16ssp"
|
||||
android:layout_marginHorizontal="15dp"
|
||||
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -27,10 +27,10 @@
|
||||
<com.airbnb.lottie.LottieAnimationView
|
||||
android:id="@+id/anim_iv"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/_250sdp"
|
||||
android:layout_height="@dimen/_215sdp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginHorizontal="15dp"
|
||||
android:layout_marginTop="40dp"
|
||||
android:layout_marginTop="@dimen/_15sdp"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:contentDescription="@string/thank_you" />
|
||||
|
||||
|
||||
@@ -1,85 +1,91 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/linearLayout2"
|
||||
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:weightSum="20"
|
||||
android:orientation="vertical">
|
||||
android:weightSum="20">
|
||||
|
||||
<androidx.viewpager2.widget.ViewPager2
|
||||
android:id="@+id/view_pager"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="17"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:overScrollMode="never"
|
||||
/>
|
||||
app:layout_constraintBottom_toTopOf="@+id/circle_indicator"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<me.relex.circleindicator.CircleIndicator3
|
||||
android:id="@+id/circle_indicator"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
app:ci_drawable="@drawable/selected_dot_primary"
|
||||
app:ci_drawable_unselected="@drawable/unselected_dot_accent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
|
||||
app:ci_width="@dimen/_6sdp"
|
||||
app:ci_drawable_unselected="@drawable/unselected_dot_accent"
|
||||
app:ci_height="@dimen/_6sdp"
|
||||
|
||||
/>
|
||||
android:paddingVertical="@dimen/_15sdp"
|
||||
|
||||
app:ci_width="@dimen/_6sdp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/register"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/view_pager" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/register"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:layout_marginStart="15dp"
|
||||
android:paddingVertical="@dimen/_10sdp"
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginHorizontal="15dp"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:background="@drawable/round_corners"
|
||||
|
||||
android:weightSum="2"
|
||||
android:layout_weight="2">
|
||||
android:backgroundTint="@color/color_primary"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:gravity="center"
|
||||
android:text="@string/register"
|
||||
android:textAlignment="center"
|
||||
android:textAllCaps="false"
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
|
||||
android:textColor="@color/white_bg"
|
||||
|
||||
<TextView
|
||||
android:id="@+id/register"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/login"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/circle_indicator" />
|
||||
|
||||
android:layout_marginVertical="5dp"
|
||||
android:background="@drawable/round_corners"
|
||||
<TextView
|
||||
android:id="@+id/login"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:backgroundTint="@color/color_primary"
|
||||
android:layout_marginEnd="20dp"
|
||||
|
||||
android:textAlignment="center"
|
||||
android:gravity="center"
|
||||
android:paddingVertical="@dimen/_10sdp"
|
||||
|
||||
android:text="@string/register"
|
||||
android:textColor="@color/white_bg"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
|
||||
android:textAllCaps="false"
|
||||
android:layout_weight="1"/>
|
||||
android:background="@drawable/login_btn_bg"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
|
||||
<TextView
|
||||
android:id="@+id/login"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:text="@string/login"
|
||||
android:textAlignment="center"
|
||||
android:textAllCaps="false"
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
|
||||
android:textColor="@color/black"
|
||||
|
||||
android:background="@drawable/login_btn_bg"
|
||||
app:backgroundTint="#EEF5FC"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/register"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/register" />
|
||||
|
||||
android:layout_marginVertical="5dp"
|
||||
app:backgroundTint="#EEF5FC"
|
||||
|
||||
android:textAlignment="center"
|
||||
android:gravity="center"
|
||||
|
||||
android:layout_marginEnd="5dp"
|
||||
android:text="@string/login"
|
||||
android:textColor="@color/black"
|
||||
android:fontFamily="@font/nunito_regular"
|
||||
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
|
||||
android:textAllCaps="false"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -16,4 +16,41 @@
|
||||
android:layout_centerInParent="true"
|
||||
/>
|
||||
|
||||
<com.airbnb.lottie.LottieAnimationView
|
||||
android:id="@+id/load_anim"
|
||||
android:visibility="gone"
|
||||
android:layout_height="@dimen/_30sdp"
|
||||
android:layout_width="@dimen/_30sdp"
|
||||
|
||||
app:lottie_rawRes="@raw/loading_anim"
|
||||
app:lottie_autoPlay="true"
|
||||
app:lottie_loop="true"
|
||||
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
|
||||
android:layout_marginBottom="@dimen/_25sdp"
|
||||
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/retry"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:text="@string/retry"
|
||||
android:fontFamily="@font/nunito_semibold"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/_16ssp"
|
||||
|
||||
android:padding="5dp"
|
||||
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
|
||||
android:layout_marginBottom="@dimen/_25sdp"
|
||||
|
||||
/>
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -262,6 +262,9 @@
|
||||
<action
|
||||
android:id="@+id/action_cgSignInFragment_to_cgHowToSetUpFragment"
|
||||
app:destination="@id/cgHowToSetUpFragment" />
|
||||
<action
|
||||
android:id="@+id/action_cgSignInFragment_to_cgConnectFragment"
|
||||
app:destination="@id/cgConnectFragment" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/cgRegisterFragment"
|
||||
|
||||
1
app/src/main/res/raw/loading_anim.json
Normal file
1
app/src/main/res/raw/loading_anim.json
Normal file
@@ -0,0 +1 @@
|
||||
{"v":"5.5.0","fr":30,"ip":0,"op":60,"w":200,"h":200,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":80,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.526],"y":[0.673]},"o":{"x":[0.472],"y":[0.326]},"t":0,"s":[0]},{"t":60,"s":[183]}],"ix":10},"p":{"a":0,"k":[100.02066666666668,100.00000000000003,0],"ix":2},"a":{"a":0,"k":[-22.637,19.301,0],"ix":1},"s":{"a":0,"k":[33.33333333333334,33.33333333333334,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[368.602,368.602],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":49,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-22.699,19.301],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.438],"y":[1]},"o":{"x":[0.579],"y":[0]},"t":30,"s":[0]},{"t":60,"s":[49]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.504],"y":[1]},"o":{"x":[0.559],"y":[0]},"t":0,"s":[1]},{"t":30,"s":[50]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":10,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[107.56633333333339,93.56633333333338,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[33.33333333333334,33.33333333333334,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[368.602,368.602],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.8549019607843137,0.8392156862745098,0.8392156862745098,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":49,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-22.699,19.301],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}
|
||||
@@ -3,4 +3,13 @@
|
||||
|
||||
<dimen name="bottom_nav_base_height">75dp</dimen>
|
||||
|
||||
<dimen name="title_tall">@dimen/_26ssp</dimen>
|
||||
<dimen name="title_tall_medium">@dimen/_24ssp</dimen>
|
||||
<dimen name="title_small">@dimen/_20ssp</dimen>
|
||||
<dimen name="title_small_2">@dimen/_15ssp</dimen>
|
||||
|
||||
<dimen name="sub_title_tall">@dimen/_18ssp</dimen>
|
||||
<dimen name="sub_title_tall_medium">@dimen/_16ssp</dimen>
|
||||
<dimen name="sub_title_small">@dimen/_14ssp</dimen>
|
||||
|
||||
</resources>
|
||||
@@ -16,6 +16,7 @@
|
||||
<string name="avoid_unwanted_phone_calls">Avoid unwanted phone calls!</string>
|
||||
<string name="continue_using_your_smartphone_without_the_annoying_robocalls_and_spam_text_messages">Continue using your Smartphone without the annoying robocalls and spam text messages.</string>
|
||||
<string name="have_a_worry_nfree_stroll">Have a worry free stroll!</string>
|
||||
<string name="have_a_worry_nfree_stroll_2">Have a worry free\nstroll!</string>
|
||||
<string name="get_direction_to_home_with_a_push_a_button_from_your_smartphone_home_screen">Get direction to home with a push a button from your smartphone home screen.</string>
|
||||
<string name="never_miss_a_med_or_forget_a_refill_again">Never miss a med or forget a refill again!</string>
|
||||
<string name="configure_medication_reminders_and_alerts_include_the_dosage_instructions_and_refill_date">Configure medication reminders and alerts. Include the dosage, instructions, and refill date.</string>
|
||||
@@ -301,5 +302,6 @@
|
||||
<string name="real_time_patient_tracking">Real time patient tracking</string>
|
||||
<string name="real_time_alerts_and_notifications">Real-time alerts and notifications</string>
|
||||
<string name="setup_geo_fence_zone">Setup geo-fence zone</string>
|
||||
<string name="retry"><u>Retry</u></string>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user