From bde81ee4e7805499d72b37c467bffabb3afb9bb3 Mon Sep 17 00:00:00 2001 From: Erik Cavazos Date: Sun, 27 Aug 2023 23:21:01 -0600 Subject: [PATCH] WIP --- .../profile/data/remote/UserProfileDto.kt | 2 +- .../profile/ui/ProfileMainFragment.kt | 14 +++++++++ .../main/res/layout/fragment_discussions.xml | 31 +++++++++++++------ 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/isolaatti/profile/data/remote/UserProfileDto.kt b/app/src/main/java/com/isolaatti/profile/data/remote/UserProfileDto.kt index b3cfae9..aa40453 100644 --- a/app/src/main/java/com/isolaatti/profile/data/remote/UserProfileDto.kt +++ b/app/src/main/java/com/isolaatti/profile/data/remote/UserProfileDto.kt @@ -12,6 +12,6 @@ data class UserProfileDto( val followingThisUser: Boolean, val thisUserIsFollowingMe: Boolean, val profileImageId: String?, - val descriptionText: String, + val descriptionText: String?, val descriptionAudioId: String? ) diff --git a/app/src/main/java/com/isolaatti/profile/ui/ProfileMainFragment.kt b/app/src/main/java/com/isolaatti/profile/ui/ProfileMainFragment.kt index 9805d3c..44dfeb9 100644 --- a/app/src/main/java/com/isolaatti/profile/ui/ProfileMainFragment.kt +++ b/app/src/main/java/com/isolaatti/profile/ui/ProfileMainFragment.kt @@ -78,12 +78,18 @@ class ProfileMainFragment : Fragment() { title = profile.name viewBinding.textViewUsername.text = profile.name viewBinding.textViewDescription.text = profile.descriptionText + if(profile.descriptionText.isNullOrBlank()) { + viewBinding.descriptionCard.visibility = View.GONE + } viewBinding.goToFollowersBtn.text = getString( R.string.go_to_followers_btn_text, profile.numberOfFollowers.toString(), profile.numberOfFollowing.toString() ) + + + setupUiForUserType(profile.isUserItself) } private val postsObserver: Observer?, UpdateEvent>?> = Observer { @@ -237,6 +243,14 @@ class ProfileMainFragment : Fragment() { } + private fun setupUiForUserType(isOwnProfile: Boolean) { + if(isOwnProfile) { + viewBinding.followButton.visibility = View.GONE + } else { + viewBinding.newPost.visibility = View.GONE + } + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/res/layout/fragment_discussions.xml b/app/src/main/res/layout/fragment_discussions.xml index 76dedd2..93f5d2f 100644 --- a/app/src/main/res/layout/fragment_discussions.xml +++ b/app/src/main/res/layout/fragment_discussions.xml @@ -57,17 +57,27 @@ app:layout_constraintTop_toBottomOf="@id/text_view_following_state" tools:text="Erik Cavazos" /> - + app:layout_constraintEnd_toEndOf="parent"> + + + app:layout_constraintTop_toBottomOf="@id/description_card"/> @@ -136,8 +146,9 @@ style="@style/Widget.Material3.BottomAppBar" /> + app:icon="@drawable/baseline_add_24" + app:layout_anchor="@id/bottomAppBar" /> \ No newline at end of file