From ff72f9dbdf9b68fe6fb67b38067603f2130b60a0 Mon Sep 17 00:00:00 2001 From: aayush262 Date: Wed, 27 Mar 2024 14:22:04 +0530 Subject: [PATCH] fix: activity crash --- .../ani/dantotsu/profile/activity/FeedActivity.kt | 2 +- .../ani/dantotsu/profile/activity/FeedFragment.kt | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt b/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt index 0b35f047..42ee6973 100644 --- a/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt +++ b/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt @@ -21,7 +21,7 @@ import nl.joery.animatedbottombar.AnimatedBottomBar class FeedActivity : AppCompatActivity() { private lateinit var binding: ActivityFeedBinding private var selected: Int = 0 - private lateinit var navBar: AnimatedBottomBar + lateinit var navBar: AnimatedBottomBar override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt b/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt index f50502f1..cd11a3d3 100644 --- a/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt +++ b/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt @@ -50,7 +50,7 @@ class FeedFragment : Fragment() { super.onViewCreated(view, savedInstanceState) activity = requireActivity() - binding.listRecyclerView.setBaseline((activity as ProfileActivity).navBar) + binding.listRecyclerView.adapter = adapter binding.listRecyclerView.layoutManager = @@ -60,6 +60,12 @@ class FeedFragment : Fragment() { activityId = arguments?.getInt("activityId", -1) ?: -1 if (userId == -1) userId = null global = arguments?.getBoolean("global", false) ?: false + + if (userId != null) { + binding.listRecyclerView.setBaseline((activity as ProfileActivity).navBar) + }else{ + binding.listRecyclerView.setBaseline((activity as FeedActivity).navBar) + } } @SuppressLint("ClickableViewAccessibility") @@ -67,7 +73,11 @@ class FeedFragment : Fragment() { super.onResume() if (this::binding.isInitialized) { binding.root.requestLayout() - binding.listRecyclerView.setBaseline((activity as ProfileActivity).navBar) + if (userId != null) { + binding.listRecyclerView.setBaseline((activity as ProfileActivity).navBar) + }else{ + binding.listRecyclerView.setBaseline((activity as FeedActivity).navBar) + } if (!loadedFirstTime) { activity.lifecycleScope.launch(Dispatchers.IO) { val nulledId = if (activityId == -1) null else activityId