diff --git a/app/src/main/java/org/futo/circles/feature/people/user/UserDialogFragment.kt b/app/src/main/java/org/futo/circles/feature/people/user/UserDialogFragment.kt index fcbd792f1c777798628b6864c96d4eac040e9134..1597779069299a931e96dd6f368a2c712b4f2bc5 100644 --- a/app/src/main/java/org/futo/circles/feature/people/user/UserDialogFragment.kt +++ b/app/src/main/java/org/futo/circles/feature/people/user/UserDialogFragment.kt @@ -20,6 +20,7 @@ import org.futo.circles.core.extensions.setIsVisible import org.futo.circles.core.extensions.showNoInternetConnection import org.futo.circles.core.extensions.showSuccess import org.futo.circles.core.extensions.withConfirmation +import org.futo.circles.core.view.EmptyTabPlaceholderView import org.futo.circles.databinding.DialogFragmentUserBinding import org.futo.circles.extensions.* import org.futo.circles.feature.people.user.list.UsersCirclesAdapter @@ -107,7 +108,6 @@ class UserDialogFragment : BaseFullscreenDialogFragment(DialogFragmentUserBindin viewModel.userLiveData.observeData(this) { setupUserInfo(it) } viewModel.timelineLiveDataLiveData.observeData(this) { usersCirclesAdapter.submitList(it) - binding.tvEmptyCirclesList.setIsVisible(it.isEmpty()) } viewModel.requestFollowLiveData.observeResponse(this, success = { showSuccess(getString(R.string.request_sent)) }) @@ -134,8 +134,14 @@ class UserDialogFragment : BaseFullscreenDialogFragment(DialogFragmentUserBindin tvUserId.text = user.userId tvUserName.text = user.notEmptyDisplayName() ivUser.loadUserProfileIcon(user.avatarUrl, user.userId) - tvEmptyCirclesList.text = - getString(R.string.not_following_any_circles_format, user.notEmptyDisplayName()) + rvCircles.setEmptyView(EmptyTabPlaceholderView(requireContext()).apply { + setText( + getString( + R.string.not_following_any_circles_format, + user.notEmptyDisplayName() + ) + ) + }) } } diff --git a/app/src/main/res/layout/dialog_fragment_user.xml b/app/src/main/res/layout/dialog_fragment_user.xml index e8bdad9e386ed44924998dd9b620c5f2016f62a0..4de5e4250447602beb1c9090832d4ef128ee4f0f 100644 --- a/app/src/main/res/layout/dialog_fragment_user.xml +++ b/app/src/main/res/layout/dialog_fragment_user.xml @@ -82,7 +82,7 @@ app:layout_constraintTop_toBottomOf="@id/tvUserId" /> - <androidx.recyclerview.widget.RecyclerView + <org.futo.circles.core.view.LoadingRecyclerView android:id="@+id/rvCircles" android:layout_width="0dp" android:layout_height="0dp" @@ -92,19 +92,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/divider" /> - <TextView - android:id="@+id/tvEmptyCirclesList" - style="@style/title2" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginHorizontal="8dp" - android:gravity="center" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/divider" - tools:text="Not following any circles for user" - tools:visibility="visible" /> - </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file