From 78b2592d26d3d9bf57902e4961b2044e115fe633 Mon Sep 17 00:00:00 2001 From: Aditya_WDI Date: Thu, 27 Jul 2023 20:50:41 +0530 Subject: [PATCH] . --- app/build.gradle | 4 + app/src/main/AndroidManifest.xml | 5 +- .../CaregiverDashActivity.java | 106 ++++-- .../fragments/CaregiverChatsFragment.java | 30 ++ .../fragments/DashBoardFragment.java | 30 ++ .../fragments/MyPatientFragment.java | 31 ++ .../mvvm/CaregiverMainViewModel.java | 1 + .../customsviews/HomeBottomNav.java | 141 +++++++ .../ssb/simplitend/customsviews/MenuItem.java | 7 + .../DashBoardActivity.java} | 4 +- .../chats/ChatFragment.java | 10 +- .../chats/ChatListAdapter.java | 4 +- .../chats/ChatListFragment.java | 8 +- .../chats/mvvm/Author.java | 2 +- .../chats/mvvm/ChatItem.java | 2 +- .../chats/mvvm/ChatListViewModel.java | 4 +- .../chats/mvvm/Message.java | 2 +- .../chats/mvvm/Receiver.java | 2 +- .../fragments/PatientDashboardFragment.java | 2 +- .../ProfileProgressFragment.java | 4 +- .../welcome/fragments/SignInFragment.java | 4 +- app/src/main/res/drawable/ic_articles.png | Bin 0 -> 1059 bytes .../main/res/drawable/ic_chats_outline.png | Bin 0 -> 4301 bytes .../res/drawable/ic_close_roud_outline.xml | 16 + app/src/main/res/drawable/ic_contact_us.png | Bin 0 -> 3867 bytes app/src/main/res/drawable/ic_dash_outline.png | Bin 0 -> 1952 bytes app/src/main/res/drawable/ic_faqs.png | Bin 0 -> 5192 bytes app/src/main/res/drawable/ic_menu.xml | 5 + app/src/main/res/drawable/ic_next.xml | 5 + app/src/main/res/drawable/ic_settings.png | Bin 0 -> 3267 bytes app/src/main/res/drawable/ic_user_outline.xml | 42 +- .../res/layout/activity_dash_board_cp.xml | 2 +- .../res/layout/caregiver_chats_fragment.xml | 7 + .../res/layout/caregiver_dash_fragment.xml | 26 ++ ...d.xml => caregiver_dashboard_activity.xml} | 50 +-- .../res/layout/caregiver_dashboard_menu.xml | 358 +++++++++++++++++- app/src/main/res/layout/home_bottom_nav.xml | 276 +++++++------- .../main/res/layout/my_patient_fragment.xml | 26 ++ .../res/navigation/cp_dashboard_graph.xml | 6 +- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/strings.xml | 6 + app/src/main/res/values/themes.xml | 2 +- 44 files changed, 976 insertions(+), 260 deletions(-) create mode 100644 app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CaregiverChatsFragment.java create mode 100644 app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/DashBoardFragment.java create mode 100644 app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java create mode 100644 app/src/main/java/com/ssb/simplitend/customsviews/MenuItem.java rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard/DashBoardActivityCP.java => patient_dashboard/DashBoardActivity.java} (72%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/ChatFragment.java (91%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/ChatListAdapter.java (95%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/ChatListFragment.java (88%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/mvvm/Author.java (86%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/mvvm/ChatItem.java (86%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/mvvm/ChatListViewModel.java (86%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/mvvm/Message.java (91%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/chats/mvvm/Receiver.java (86%) rename app/src/main/java/com/ssb/simplitend/{careperson_dashboard => patient_dashboard}/fragments/PatientDashboardFragment.java (94%) create mode 100644 app/src/main/res/drawable/ic_articles.png create mode 100644 app/src/main/res/drawable/ic_chats_outline.png create mode 100644 app/src/main/res/drawable/ic_close_roud_outline.xml create mode 100644 app/src/main/res/drawable/ic_contact_us.png create mode 100644 app/src/main/res/drawable/ic_dash_outline.png create mode 100644 app/src/main/res/drawable/ic_faqs.png create mode 100644 app/src/main/res/drawable/ic_menu.xml create mode 100644 app/src/main/res/drawable/ic_next.xml create mode 100644 app/src/main/res/drawable/ic_settings.png create mode 100644 app/src/main/res/layout/caregiver_chats_fragment.xml create mode 100644 app/src/main/res/layout/caregiver_dash_fragment.xml rename app/src/main/res/layout/{caregiver_dashboard.xml => caregiver_dashboard_activity.xml} (51%) create mode 100644 app/src/main/res/layout/my_patient_fragment.xml diff --git a/app/build.gradle b/app/build.gradle index e65e546..ddce82a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,6 +90,10 @@ dependencies { implementation 'com.yarolegovich:sliding-root-nav:1.1.1' + // views animation + implementation 'com.daimajia.easing:library:2.4@aar' + implementation 'com.daimajia.androidanimations:library:2.4@aar' + implementation 'androidx.appcompat:appcompat:1.6.0' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 305b563..8023753 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,7 +28,8 @@ + android:exported="true" + android:screenOrientation="portrait"> @@ -38,7 +39,7 @@ diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/CaregiverDashActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/CaregiverDashActivity.java index 9804056..0bafe3b 100644 --- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/CaregiverDashActivity.java +++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/CaregiverDashActivity.java @@ -1,48 +1,49 @@ package com.ssb.simplitend.caregiverdashboard; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.lifecycle.ViewModelProvider; - -import android.animation.ObjectAnimator; +import android.content.res.ColorStateList; import android.os.Bundle; -import android.os.Handler; -import android.view.MotionEvent; +import android.view.Menu; import android.view.View; -import android.view.ViewTreeObserver; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.content.res.AppCompatResources; +import androidx.core.content.res.ResourcesCompat; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; + import com.ssb.simplitend.R; +import com.ssb.simplitend.caregiverdashboard.fragments.CaregiverChatsFragment; +import com.ssb.simplitend.caregiverdashboard.fragments.DashBoardFragment; +import com.ssb.simplitend.caregiverdashboard.fragments.MyPatientFragment; import com.ssb.simplitend.caregiverdashboard.mvvm.CaregiverMainViewModel; -import com.ssb.simplitend.databinding.CaregiverDashboardBinding; -import com.yarolegovich.slidingrootnav.SlidingRootNav; +import com.ssb.simplitend.customsviews.HomeBottomNav; +import com.ssb.simplitend.customsviews.MenuItem; +import com.ssb.simplitend.databinding.CaregiverDashboardActivityBinding; +import com.ssb.simplitend.databinding.CaregiverDashboardMenuBinding; import com.yarolegovich.slidingrootnav.SlidingRootNavBuilder; import com.yarolegovich.slidingrootnav.callback.DragStateListener; -import com.yarolegovich.slidingrootnav.util.DrawerListenerAdapter; public class CaregiverDashActivity extends AppCompatActivity implements - DragStateListener{ + DragStateListener, + HomeBottomNav.OnBottomNavItemSelectListener { // view binding - protected CaregiverDashboardBinding binding; + protected CaregiverDashboardActivityBinding binding; + private CaregiverDashboardMenuBinding menuBinding; protected CaregiverMainViewModel viewModel; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = CaregiverDashboardBinding.inflate(getLayoutInflater()); + binding = CaregiverDashboardActivityBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - binding.btn.setOnClickListener(view -> { - ObjectAnimator objAnim = ObjectAnimator.ofFloat(view, "translationX", -100f); - objAnim.setDuration(100); - objAnim.start(); - }); - initViews(); + clickEvents(); + } private void initViews() { @@ -50,16 +51,50 @@ public class CaregiverDashActivity extends AppCompatActivity implements // viewmodel viewModel = new ViewModelProvider(this).get(CaregiverMainViewModel.class); + // inflating menu view + menuBinding = CaregiverDashboardMenuBinding.inflate(getLayoutInflater()); // sliding navigation bar viewModel.slidingRootNav = null; viewModel.slidingRootNav = new SlidingRootNavBuilder(this) - .withMenuLayout(R.layout.caregiver_dashboard_menu) + .withMenuView(menuBinding.getRoot()) .addDragStateListener(this) .withToolbarMenuToggle(binding.toolbar) + .withRootViewScale(0.8f) + .withDragDistance(250) .inject(); + + binding.bottomNav.setItemSelectListener(this); + + // initializing dashboard fragment + replaceFragment(new DashBoardFragment()); } + + private void clickEvents() { + + // menu click events + menuBinding.close.setOnClickListener(v -> { + if (viewModel.slidingRootNav.isMenuOpened()){ + viewModel.slidingRootNav.closeMenu(true); + } + }); + + // content click events + binding.tint.setOnClickListener(v -> { + if (viewModel.slidingRootNav.isMenuOpened()){ + viewModel.slidingRootNav.closeMenu(true); + binding.tint.setVisibility(View.GONE); + } + }); + } + + private void replaceFragment(Fragment fragment){ + getSupportFragmentManager().beginTransaction() + .replace(R.id.fcv_cg_home, fragment) + .commitAllowingStateLoss(); + } + // slide bar drag callbacks @Override public void onDragStart() { @@ -70,8 +105,35 @@ public class CaregiverDashActivity extends AppCompatActivity implements public void onDragEnd(boolean isMenuOpened) { if (isMenuOpened){ binding.getRoot().setRadius(30); + binding.tint.setVisibility(View.VISIBLE); }else{ binding.getRoot().setRadius(0); + binding.tint.setVisibility(View.GONE); + } + } + + @Override + public void onBottomNavItemSelected(MenuItem selectedItem) { + if (selectedItem == MenuItem.DASHBOARD){ + replaceFragment(new DashBoardFragment()); + + // setting up toolbar accordingly + binding.toolbar.setNavigationIcon(AppCompatResources.getDrawable(this, R.drawable.ic_menu)); + binding.toolbar.setNavigationIconTint(getResources().getColor(R.color.black)); + binding.toolbar.setTitle("Welcome Aditya"); + + }else if (selectedItem == MenuItem.MY_PATIENT){ + replaceFragment(new MyPatientFragment()); + + // setting up toolbar accordingly + binding.toolbar.setTitle(null); + binding.toolbar.setNavigationIcon(AppCompatResources.getDrawable(this, R.drawable.ic_menu)); + binding.toolbar.setNavigationIconTint(getResources().getColor(R.color.white)); + }else if (selectedItem == MenuItem.CHATS){ + replaceFragment(new CaregiverChatsFragment()); + binding.toolbar.setNavigationIcon(AppCompatResources.getDrawable(this, R.drawable.ic_menu)); + binding.toolbar.setNavigationIconTint(getResources().getColor(R.color.black)); + binding.toolbar.setTitle("Chats"); } } } \ No newline at end of file diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CaregiverChatsFragment.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CaregiverChatsFragment.java new file mode 100644 index 0000000..f13b067 --- /dev/null +++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/CaregiverChatsFragment.java @@ -0,0 +1,30 @@ +package com.ssb.simplitend.caregiverdashboard.fragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.ssb.simplitend.databinding.CaregiverChatsFragmentBinding; + +public class CaregiverChatsFragment extends Fragment { + + // view binding + protected CaregiverChatsFragmentBinding binding; + + public CaregiverChatsFragment(){ + // required empty + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + binding = CaregiverChatsFragmentBinding.inflate(inflater, container, false); + + return binding.getRoot(); + } +} diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/DashBoardFragment.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/DashBoardFragment.java new file mode 100644 index 0000000..7b2e4bf --- /dev/null +++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/DashBoardFragment.java @@ -0,0 +1,30 @@ +package com.ssb.simplitend.caregiverdashboard.fragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.ssb.simplitend.databinding.CaregiverDashFragmentBinding; + +public class DashBoardFragment extends Fragment { + + // view binding + protected CaregiverDashFragmentBinding binding; + + public DashBoardFragment(){ + // required empty + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + binding = CaregiverDashFragmentBinding.inflate(inflater, container, false); + + return binding.getRoot(); + } +} diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java new file mode 100644 index 0000000..aae7c61 --- /dev/null +++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java @@ -0,0 +1,31 @@ +package com.ssb.simplitend.caregiverdashboard.fragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.ssb.simplitend.databinding.CaregiverDashFragmentBinding; +import com.ssb.simplitend.databinding.MyPatientFragmentBinding; + +public class MyPatientFragment extends Fragment { + + // view binding + protected MyPatientFragmentBinding binding; + + public MyPatientFragment(){ + // required empty + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + binding = MyPatientFragmentBinding.inflate(inflater, container, false); + + return binding.getRoot(); + } +} diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java index 942bc86..65c2b29 100644 --- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java +++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/mvvm/CaregiverMainViewModel.java @@ -2,6 +2,7 @@ package com.ssb.simplitend.caregiverdashboard.mvvm; import androidx.lifecycle.ViewModel; +import com.google.android.material.appbar.MaterialToolbar; import com.yarolegovich.slidingrootnav.SlidingRootNav; public class CaregiverMainViewModel extends ViewModel { diff --git a/app/src/main/java/com/ssb/simplitend/customsviews/HomeBottomNav.java b/app/src/main/java/com/ssb/simplitend/customsviews/HomeBottomNav.java index 44516a5..f2a6a60 100644 --- a/app/src/main/java/com/ssb/simplitend/customsviews/HomeBottomNav.java +++ b/app/src/main/java/com/ssb/simplitend/customsviews/HomeBottomNav.java @@ -4,14 +4,26 @@ import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; +import android.widget.LinearLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.daimajia.androidanimations.library.Techniques; +import com.daimajia.androidanimations.library.YoYo; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.ssb.simplitend.R; public class HomeBottomNav extends FrameLayout { + // views + private FloatingActionButton dashBtnBig, patientBig, chatsBig; + private LinearLayout dashSmall, patientSmall, chatsSmall; + + // fields + private MenuItem selected_item = MenuItem.DASHBOARD; + + private OnBottomNavItemSelectListener itemSelectListener; // constructors public HomeBottomNav(@NonNull Context context) { @@ -31,6 +43,135 @@ public class HomeBottomNav extends FrameLayout { private void initViews(){ View view = inflate(getContext(), R.layout.home_bottom_nav, this); + + dashBtnBig = view.findViewById(R.id.dadh_big); + dashSmall = view.findViewById(R.id.dash_small); + + patientBig = view.findViewById(R.id.patient_big); + patientSmall = view.findViewById(R.id.patient_small); + + chatsBig = view.findViewById(R.id.chat_big); + chatsSmall = view.findViewById(R.id.chats_small); + + clickEvents(); + } + + private void clickEvents() { + dashSmall.setOnClickListener(v -> { + selectMenuItem(MenuItem.DASHBOARD); + if (itemSelectListener != null) { + itemSelectListener.onBottomNavItemSelected(MenuItem.DASHBOARD); + } + }); + + chatsSmall.setOnClickListener(v -> { + selectMenuItem(MenuItem.CHATS); + if (itemSelectListener != null) { + itemSelectListener.onBottomNavItemSelected(MenuItem.CHATS); + } + }); + + patientSmall.setOnClickListener(v -> { + selectMenuItem(MenuItem.MY_PATIENT); + if (itemSelectListener != null) { + itemSelectListener.onBottomNavItemSelected(MenuItem.MY_PATIENT); + } + }); + } + + public void setItemSelectListener(OnBottomNavItemSelectListener itemSelectListener) { + this.itemSelectListener = itemSelectListener; + } + + private void selectMenuItem(MenuItem menuitem){ + + clearItemSelection(this.selected_item); + + this.selected_item = menuitem; + + FloatingActionButton selectedBig = null; + LinearLayout selectedSmall = null; + + switch (menuitem){ + case DASHBOARD: + selectedBig = dashBtnBig; + selectedSmall = dashSmall; + break; + case CHATS: + selectedBig = chatsBig; + selectedSmall = chatsSmall; + break; + case MY_PATIENT: + selectedBig = patientBig; + selectedSmall = patientSmall; + break; + } + + final FloatingActionButton final_selectedBig = selectedBig; + final LinearLayout final_selectedSmall = selectedSmall; + + if (final_selectedBig != null && final_selectedSmall != null){ + + YoYo.with(Techniques.SlideOutUp) + .duration(100) + .onEnd(animator -> { + final_selectedBig.setVisibility(VISIBLE); + final_selectedSmall.setVisibility(GONE); + + YoYo.with(Techniques.SlideInUp) + .duration(100) + .playOn(final_selectedBig); + }) + .playOn(final_selectedSmall); + + } + + } + + private void clearItemSelection(MenuItem selected_item) { + FloatingActionButton selectedBig = null; + LinearLayout selectedSmall = null; + + switch (selected_item){ + case DASHBOARD: + selectedBig = dashBtnBig; + selectedSmall = dashSmall; + break; + case CHATS: + selectedBig = chatsBig; + selectedSmall = chatsSmall; + break; + case MY_PATIENT: + selectedBig = patientBig; + selectedSmall = patientSmall; + break; + } + + final FloatingActionButton final_selectedBig = selectedBig; + final LinearLayout final_selectedSmall = selectedSmall; + + if (final_selectedBig != null && final_selectedSmall != null){ + + YoYo.with(Techniques.SlideOutDown) + .duration(100) + .onEnd(animator -> { + final_selectedBig.setVisibility(GONE); + final_selectedSmall.setVisibility(VISIBLE); + + YoYo.with(Techniques.SlideInDown) + .duration(100) + .playOn(final_selectedSmall); + }) + .playOn(final_selectedBig); + + } + + } + + // callback interfaces + @FunctionalInterface + public interface OnBottomNavItemSelectListener{ + void onBottomNavItemSelected(MenuItem selectedItem); } } diff --git a/app/src/main/java/com/ssb/simplitend/customsviews/MenuItem.java b/app/src/main/java/com/ssb/simplitend/customsviews/MenuItem.java new file mode 100644 index 0000000..7dbfa42 --- /dev/null +++ b/app/src/main/java/com/ssb/simplitend/customsviews/MenuItem.java @@ -0,0 +1,7 @@ +package com.ssb.simplitend.customsviews; + +public enum MenuItem { + MY_PATIENT, + DASHBOARD, + CHATS +} diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/DashBoardActivityCP.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/DashBoardActivity.java similarity index 72% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/DashBoardActivityCP.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/DashBoardActivity.java index a5c507e..ebc1ead 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/DashBoardActivityCP.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/DashBoardActivity.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard; +package com.ssb.simplitend.patient_dashboard; import androidx.appcompat.app.AppCompatActivity; @@ -6,7 +6,7 @@ import android.os.Bundle; import com.ssb.simplitend.R; -public class DashBoardActivityCP extends AppCompatActivity { +public class DashBoardActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatFragment.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatFragment.java similarity index 91% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatFragment.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatFragment.java index a787619..3b1f69a 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatFragment.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard.chats; +package com.ssb.simplitend.patient_dashboard.chats; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,10 +12,10 @@ import androidx.fragment.app.Fragment; import androidx.navigation.Navigation; import com.ssb.simplitend.R; -import com.ssb.simplitend.careperson_dashboard.chats.mvvm.Author; -import com.ssb.simplitend.careperson_dashboard.chats.mvvm.ChatItem; -import com.ssb.simplitend.careperson_dashboard.chats.mvvm.Message; -import com.ssb.simplitend.careperson_dashboard.chats.mvvm.Receiver; +import com.ssb.simplitend.patient_dashboard.chats.mvvm.Author; +import com.ssb.simplitend.patient_dashboard.chats.mvvm.ChatItem; +import com.ssb.simplitend.patient_dashboard.chats.mvvm.Message; +import com.ssb.simplitend.patient_dashboard.chats.mvvm.Receiver; import com.ssb.simplitend.databinding.ChatFragmentBinding; import com.stfalcon.chatkit.messages.MessagesListAdapter; diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListAdapter.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatListAdapter.java similarity index 95% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListAdapter.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatListAdapter.java index 02e7042..bc0a0f9 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListAdapter.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatListAdapter.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard.chats; +package com.ssb.simplitend.patient_dashboard.chats; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -8,7 +8,7 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; -import com.ssb.simplitend.careperson_dashboard.chats.mvvm.ChatItem; +import com.ssb.simplitend.patient_dashboard.chats.mvvm.ChatItem; import com.ssb.simplitend.databinding.ChatCardViewholderBinding; public class ChatListAdapter extends ListAdapter { diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListFragment.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatListFragment.java similarity index 88% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListFragment.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatListFragment.java index cf17104..8c9180f 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/ChatListFragment.java @@ -1,6 +1,6 @@ -package com.ssb.simplitend.careperson_dashboard.chats; +package com.ssb.simplitend.patient_dashboard.chats; -import static com.ssb.simplitend.careperson_dashboard.chats.ChatFragment.CHAT_ITEM_KEY; +import static com.ssb.simplitend.patient_dashboard.chats.ChatFragment.CHAT_ITEM_KEY; import android.os.Bundle; import android.view.LayoutInflater; @@ -16,8 +16,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.ssb.simplitend.R; import com.ssb.simplitend.apputils.AppUtil; -import com.ssb.simplitend.careperson_dashboard.chats.mvvm.ChatItem; -import com.ssb.simplitend.careperson_dashboard.chats.mvvm.ChatListViewModel; +import com.ssb.simplitend.patient_dashboard.chats.mvvm.ChatItem; +import com.ssb.simplitend.patient_dashboard.chats.mvvm.ChatListViewModel; import com.ssb.simplitend.databinding.ChatListFragmentBinding; public class ChatListFragment extends Fragment implements ChatListAdapter.OnChatItemClickListener { diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Author.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Author.java similarity index 86% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Author.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Author.java index 6be7fed..ed9a915 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Author.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Author.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard.chats.mvvm; +package com.ssb.simplitend.patient_dashboard.chats.mvvm; import com.ssb.simplitend.R; import com.stfalcon.chatkit.commons.models.IUser; diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatItem.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/ChatItem.java similarity index 86% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatItem.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/ChatItem.java index 29b027d..b385173 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatItem.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/ChatItem.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard.chats.mvvm; +package com.ssb.simplitend.patient_dashboard.chats.mvvm; import java.io.Serializable; diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatListViewModel.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/ChatListViewModel.java similarity index 86% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatListViewModel.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/ChatListViewModel.java index d77ef92..7825cf2 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatListViewModel.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/ChatListViewModel.java @@ -1,8 +1,8 @@ -package com.ssb.simplitend.careperson_dashboard.chats.mvvm; +package com.ssb.simplitend.patient_dashboard.chats.mvvm; import androidx.lifecycle.ViewModel; -import com.ssb.simplitend.careperson_dashboard.chats.ChatListAdapter; +import com.ssb.simplitend.patient_dashboard.chats.ChatListAdapter; import java.util.ArrayList; diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Message.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Message.java similarity index 91% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Message.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Message.java index 8e66feb..681ae82 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Message.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Message.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard.chats.mvvm; +package com.ssb.simplitend.patient_dashboard.chats.mvvm; import com.stfalcon.chatkit.commons.models.IMessage; import com.stfalcon.chatkit.commons.models.IUser; diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Receiver.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Receiver.java similarity index 86% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Receiver.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Receiver.java index ddcadfd..ec65b6f 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/Receiver.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/chats/mvvm/Receiver.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard.chats.mvvm; +package com.ssb.simplitend.patient_dashboard.chats.mvvm; import com.ssb.simplitend.R; import com.stfalcon.chatkit.commons.models.IUser; diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/fragments/PatientDashboardFragment.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java similarity index 94% rename from app/src/main/java/com/ssb/simplitend/careperson_dashboard/fragments/PatientDashboardFragment.java rename to app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java index 40f5711..618699f 100644 --- a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/fragments/PatientDashboardFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java @@ -1,4 +1,4 @@ -package com.ssb.simplitend.careperson_dashboard.fragments; +package com.ssb.simplitend.patient_dashboard.fragments; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java index 6b4ae34..6de7cf0 100644 --- a/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java @@ -16,7 +16,7 @@ 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.patient_dashboard.DashBoardActivity; import com.ssb.simplitend.databinding.ProfileProgressFragmentBinding; import com.ssb.simplitend.welcome.mvvm.models.CallResponse; import com.ssb.simplitend.welcome.mvvm.models.PatientData; @@ -102,7 +102,7 @@ public class ProfileProgressFragment extends Fragment implements ProfileContract ); binding.skipToDashboard.setOnClickListener(v -> { - Intent intent = new Intent(requireActivity(), DashBoardActivityCP.class); + Intent intent = new Intent(requireActivity(), DashBoardActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); requireActivity().finish(); diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/SignInFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/SignInFragment.java index b8a6214..73a6e5c 100644 --- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/SignInFragment.java +++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/SignInFragment.java @@ -18,7 +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.careperson_dashboard.DashBoardActivityCP; +import com.ssb.simplitend.patient_dashboard.DashBoardActivity; import com.ssb.simplitend.databinding.SignInFragmentBinding; import com.ssb.simplitend.welcome.mvvm.WelcomeContracts; import com.ssb.simplitend.welcome.mvvm.WelcomeViewModel; @@ -138,7 +138,7 @@ public class SignInFragment extends Fragment implements WelcomeContracts.Registe Toast.makeText(requireContext(), "Log in successful.", Toast.LENGTH_SHORT).show(); - Intent intent = new Intent(requireActivity(), DashBoardActivityCP.class); + Intent intent = new Intent(requireActivity(), DashBoardActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); requireActivity().finish(); diff --git a/app/src/main/res/drawable/ic_articles.png b/app/src/main/res/drawable/ic_articles.png new file mode 100644 index 0000000000000000000000000000000000000000..f72a092da67763e522f334dbcbe4f2279a101f67 GIT binary patch literal 1059 zcmeAS@N?(olHy`uVBq!ia0vp^0YIF>!3HD+e{B~7QY^(zo*^7SP{WbZ!N9A_WM~S25-i{Z}1qr%_T<|lz_~cJ}1V_`ff1c`Pw=%_N-*DRyC}^^^b!!C6 z6(z2ufWQEQ)>fqq7s1`1Yj?3ffBG%2{NA0jZ{A8v=)HOS``hoj-`~p8^USB4%|3h9 zbJ87$`~7yOas`j>b**oz)Aqf5->%D-@j_GHN5M5thIUHV7dQOqI(w7B?52X~)q3Z9 z>Zg682sDF@J%D2#8@<@3qXBpF-UfYjbawcf4;cw`l@cf?K&bnjO z)dBz8jlN#teBj(*d4s)g?p)qQd&RPtb_iV#V!O!qdY>=DZsn@}qsaw}<|b5`F`hY| zoc^@XVT-pa6I2XJt%*gdPE_;Z>q@QE*x=xlWu`CB7ufJXV&M@QcHvy>!Y%T`k>q>pq z8qUormuGmZbYo>D^NTHC1qC=2b_%lwFnBU8iQyA*n8cttotbrlio>a=4vZ?C6N)Si z#2Ri0^F9eWda@-uu%}hqM!J}lVR>xti?;%93bT7>7Wt}7IG2|A&gJ0&2ZpBnYqOb~ z!-X^$8C4E)FJPF&;;~akqd|o+NRORM!Lwn?=|(0GA%&;+WM=fXo}cuSCps@VakshJ zpShf~dVg+zKleTVnP<$>hqp~=e|y&Lp#y(wh*8V-^9Q`b-YaG@swi^dHS+ASHR_)^ z72|u7bYdRfoRKjvWYh8~%Py?`w&aq@&oy)AyYF?9sW!~Hd^sZBm39-hVe>^ikQ`Q_JZ)}{X{WAqDnA7s1SdZrrnw`q@I q!|Z_XxnDYeUG)#m*)LZ8h`&<#<{s%#z8%0^&*16m=d#Wzp$PyzrpX-u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_chats_outline.png b/app/src/main/res/drawable/ic_chats_outline.png new file mode 100644 index 0000000000000000000000000000000000000000..18f3039815715547d051acf923064c2964a15940 GIT binary patch literal 4301 zcmV;;5HjzHP)yaF{5yy2^{%$h@A0x07ftL}OjKIeTEJonH2rPYfmG&aA z7=e}%h>F0=2rO3lqpRrtt$WV6IXt=tnAh&0YHII+0UF)^=_fFI^VN#lmoHzw7IJ?p z*YD)w=dSTHf1~yP_fh`#tNxEqe(zfMzt1-}H{st`#Fc4Dy_t48-)sVqKgu0Dy+Tm< z2D0})O4siCML^U6%|60~_goBM1RQ9F4j_O7pv>LSIw62ga}zZ8{Idc^LGmYI!nbmT zCT4EFq~-@O-^ulGt=eZ6zz9%oh3S8h>rSrD_gE@OVsv4uew6E8fOAz^XHvijP|zlT z-d_*oE|bw$MyyoBJ_^IOW*Q0He%CtJH+Y z@8$jjKv_cAs{R++=T0sh_Mr`J^G?=;c3gF90vKWJUsbCNVa8_#$#+W*QPq?I9IoFF zS*YBDKSwCO+6;0PU@El={s`eH8f8^Y)=gSqsMa~jy>F&4v12fGFkpmfJ0a*Fa(N>l z@)g*17`N)CT8At(ew(MEVK7mvdsqemMi|A@g}>ryguCBff*tQKS~V@^hFX}X!H-pi z-)_JNbN+_l9bCaj!9UqM?pbA5;SGFYoovCdHq7!{Yv;N9xd0;!L93u$tPMZq?h?$8 zb-@~09i+b}s#*wj_?poLtV|%h@Nnu7um9aQSbjJq1+NWv#H4A-z<_LV-e*9 z&8wwGlS#m+I{jG~cxzzd1{MR89NHQU{c?$#ItLh%a+ZxwRAf=PTQhLL0h*7(*KZ6% zPTD037)^Zxm{QxoQsPkL{|^2x&YyV(7>6m^%+LU^bhikf_wqAE+gw|mX^H{HvJm#F ze7!^)TOq^AZxzt6?V+^i=11Z4o5_hwO!x#aT1@+=fw*thT5UC~ZL%)PZ$MKjB`hXt z>H~)Ozf^f$oL!wv!Xr#%bb=RS{vQFOz6;tVmvi|bnq@Zv->!N{V~&O}`!qMBLcmyj zmlvDg(q3fxumXmhX@@IqMF94lpHi^hpTKX`eB8cy(h6XpXYz+^)UZwR{H{v`g-I$QBt* z0AEAIbdm@6t6*THfMJtDTzGD?&h4|S#w|jW+w!)g(1~uSA!GDY7x^I zoZngNcL0Ws%WUjUwR=&6_&8gefCC1zG^;!S%t82&+YQ#tGuKFf&CzHz5`?JVqg-gQ z!MpUd`iryJ`C%vdnHmf`00%WS)g7(3I!H$=i6oWvCbY#g3ordsw)_pP-z*ITB3Ko2%Tol&v zk3;ycETD1hDPcIX-8X35jy#HnJWOMN=1YzTGG}owwuOg7`T&@0hPReD8K0-ob4KTT znKOG(PM<m&VlQR$!IOWrE3`MdTN_s zRVun??y}lS`i6Ay+V-fE9MJ^$Cdb&590Aw8^u<&?YkeW*K;Y>+P{U+PHLU^ap|Kbx z)et9)4b$A&aL@`a^-sbR4aquJ#C*J!^&A=i=E*}=!=nT(i;j|bI+J;r8fHXPYg8LV z1p6TK-X)lc<_WiABqNo`{K+~@#NUd7OZxTaPijNYlN&g^nC)C`@89zOzsuEWU>*Sc zsOI5)jDAa|cW|*Q0t9UTlSG=DjsBagvXMv6e6g-)hu9+k_#{ldO$jk#z7PO(@IalL z^x=MJ4b5fKN`8cnKFR-)Kl~=L4kASOFgUwy0XTr!OUGR9VK76~nMHl~a|#H7zwdg? zhvs5r7BNfQhk#)kPbdOKxM540qpni~i2MsWp_ehCH*C=et=Gr(YhrDlF*-irubn(M zTKZb5)m33*M1|+*LIAufB%5GkfQSakjhi%a;Y|u~m|Qyc(cLyi4rVWddy#F_7RQhVHw(yVCLYtiN4{vBoLQ-fuGA4 z@Dg(E{RJ?X>fFvpSoFBnL;-duf8)yeTRGNZUWp#f<~0Ni6Z2ZtRAW%IjCt^D2Z3k( z24^=Jt!jP&y7leAu@j$f>z~S-$#|)bO z+ZzrtQR!`uMZzytuw$%C^Hil5PrAwv0dPF|9201UydMTFM7hAE!p30orHrY9wQOH4 zW~pO5Q81zetUgW=G_f~OHBW|Jihx_M!cy;8=tJq&r@r*^CWddC%1{$^G=e5t zCrchzkii)^S1w>d_%S>I#bV)5=3d%;Dm2m;)U0x?c_p059H2qA_^PLn$Q)p9)ijk< z*ajLSs*Mp*H(C=@6eG<6nrEBSvIn9Z#jp)D1<)uj`y0hlcd;d5Z^YrCZVuT#0dDaG zoiVA@nWsVZi9st~(M`g`J0UlhMGsd~wg1S&7NcyRXqh5l)b1VRvy{;5XkFd+7>TvX3YGvgXqjBH_Iwz?1(;y)gZymuX}Aq-L&(GIII~`s=lwC zrl%W{QwMzO?$Ip82|F6{GWXShQP5zw@liZ}O=qGOzwJ{P$-2;{Ub7R5d-UvWEwQ($VI=txyYjG zdmQmOo<5=Fne zsTot4562aNoI!HQ0O|9=U>VwEdc%ojQnX9Xq#y{M(psQk)@YVoPe>vfBh(VmL+b!? zG5(16K`c4EGTy7EVYN&M2&{Woz3b`vBXF|GL?w^H)rcxO<|RZgLz!j0&rlZNMNMtL zM#Z3Atn|nF0Tf=jb*LF+yEo1OksS|V?l^7TewhBWBWf3-5`fZ~jw+dJy$j!oY%dxL zMqTX2E(^1afyz0_+RP-$qiG2*t?qeFH31HNJ z_^A;y0SX%B)M&i(Fa{gFs=Ya_cw-2qndsRoP@p{aFFmR>h#7-+mI(`0aT;mMPem@NRamqAO3x;|iLiFgco z2Iw?Z&|5$0Q;%m1Ql6D?S^(xw7HiGD%vy(WXv5~;Auu%{a`S1V$cq6=?U`TK0x)b* zz`o@&u1!PZ(kctgvS>v7nO9=BSFx?q!w>c4EN_vBzACL6Fc7OmP`&MgW|WA>!=Qd& z%{c&s(!S%11C7xP!LsDH$}|Ctg638}F;9Fhy0UACm_nRggij-DCjUep%F>c1xfx(A zR4l1aCW#j#^Vv7PEom(U6U+nbIq#j^*v33p3mDak2l=#~r9x}s1Rhre7HUI#xvU%B zA7p)4iDbKKzzhHlw~%1uDO~I}2sOFhz0gIlT)l=-!0_~;H9SXs0SiwqOkNCd1_A{( zn830DCQ!V>Y>#>B?(C}FF#I%^snRSqPVMUfG?>A%0j9@Yrz6~#4S=JxFzVL;_b1gf z0ku5uP60w^-bV=C=63ZyOhf=Yr7+RE^)u8uN5CT&n~p}+JdWH-xYWVty*I!_o-I}J zfQB>IwGFdHgwIhnftgV5np4oHg40(L@>c`8@8J ztDSfQ%s>vRsRA@yo}}Nv8KbwIO_W>!IA=1O?eEzD(?EQxbqL4j01qY#^Tgb#Ruvg- zCaD2PQbVZb*~$M2jrqKltF-rKM2gNs6P80ub=x#dH4DoFD2TdDY+rEv9n%uFll;O( zp|gp(6Tmc)b(2BLEZcev<$!<<(6k8Yo4kB-1I$oKPIzCV1Y(n&gBxHb6nxE8>R994 z4mD9t9N!HvHBy}TUiF1AQA3i4O&s41FcS;C#dKPs1~{(7VGGB11567E&M=17kPc20 zRqgn0fSEzqt)?7cqN+2#8(>;VZ^m&PChAq~sfP_PGYY!p)J7AvnWUCXU;9`E6V>E} vNt=dQJ4zz-Yoc$j4)G`X + + + diff --git a/app/src/main/res/drawable/ic_contact_us.png b/app/src/main/res/drawable/ic_contact_us.png new file mode 100644 index 0000000000000000000000000000000000000000..d642b49c94e838d9fed793027ce96f34ea347f78 GIT binary patch literal 3867 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_dash_outline.png b/app/src/main/res/drawable/ic_dash_outline.png new file mode 100644 index 0000000000000000000000000000000000000000..7ef9e276cc4278f66bd7723f5172a1d78042d13d GIT binary patch literal 1952 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 + + diff --git a/app/src/main/res/drawable/ic_next.xml b/app/src/main/res/drawable/ic_next.xml new file mode 100644 index 0000000..e7cf886 --- /dev/null +++ b/app/src/main/res/drawable/ic_next.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings.png b/app/src/main/res/drawable/ic_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..cf3c4171135c87bc40eca751adbd3596e04aff3c GIT binary patch literal 3267 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 - - - + + + diff --git a/app/src/main/res/layout/activity_dash_board_cp.xml b/app/src/main/res/layout/activity_dash_board_cp.xml index e30cbe8..0c90ccf 100644 --- a/app/src/main/res/layout/activity_dash_board_cp.xml +++ b/app/src/main/res/layout/activity_dash_board_cp.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/white_bg" - tools:context=".careperson_dashboard.DashBoardActivityCP"> + tools:context=".patient_dashboard.DashBoardActivity"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/caregiver_dash_fragment.xml b/app/src/main/res/layout/caregiver_dash_fragment.xml new file mode 100644 index 0000000..87f9624 --- /dev/null +++ b/app/src/main/res/layout/caregiver_dash_fragment.xml @@ -0,0 +1,26 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/caregiver_dashboard.xml b/app/src/main/res/layout/caregiver_dashboard_activity.xml similarity index 51% rename from app/src/main/res/layout/caregiver_dashboard.xml rename to app/src/main/res/layout/caregiver_dashboard_activity.xml index 857d016..4e49574 100644 --- a/app/src/main/res/layout/caregiver_dashboard.xml +++ b/app/src/main/res/layout/caregiver_dashboard_activity.xml @@ -1,37 +1,20 @@ + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - - + android:src="@color/color_accent" + android:layout_marginBottom="@dimen/bottom_nav_base_height" + /> -