diff --git a/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt b/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt index b910c1e..689681c 100644 --- a/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt @@ -42,7 +42,7 @@ class AdminFragment : Fragment(R.layout.fragment_admin) { putSerializable("user", userDto) putBoolean("isMe", false) } - navigateTo(view, R.id.action_adminFragment_to_profileFragment, bundle) + navigateTo(view, R.id.action_nav_admin_to_nav_user_profile, bundle) } if (state is AdminViewModel.State.Error){ val errorMessage = state.errorMessage diff --git a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt index e3f4027..6ddb60c 100644 --- a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt @@ -53,7 +53,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { showData(getUserDto()!!) binding.backToSearch.visibility = View.VISIBLE binding.backToSearch.setOnClickListener { - navigateTo(view, R.id.action_profileFragment_to_adminFragment) + navigateTo(view, R.id.action_nav_user_profile_to_nav_admin) } Log.d("ProfileFragment", "set login") viewModel.visitListStateFromLogin.collectWithLifecycle(this) { data -> diff --git a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileViewModel.kt b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileViewModel.kt index a0112d9..562ac2d 100644 --- a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileViewModel.kt +++ b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileViewModel.kt @@ -34,7 +34,7 @@ class ProfileViewModel() : ViewModel() { var visitListState = Pager( config = PagingConfig( - pageSize = 20, + pageSize = 3, enablePlaceholders = false, maxSize = 100 ) diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 259a571..aa6fb1c 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -35,6 +35,14 @@ android:id="@+id/action_profileFragment_to_adminFragment" app:destination="@id/nav_admin" /> + + + + android:id="@+id/action_nav_admin_to_nav_user_profile" + app:destination="@id/nav_user_profile" /> \ No newline at end of file