From 1ad6e7685d1814ab98918dda7c1589ad1b1cf7cb Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Wed, 27 Mar 2024 07:46:52 -0400 Subject: [PATCH] fix: clean up a sloppy fix --- .../dantotsu/profile/activity/FeedFragment.kt | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) 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 cd11a3d3..40c96829 100644 --- a/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt +++ b/app/src/main/java/ani/dantotsu/profile/activity/FeedFragment.kt @@ -50,22 +50,21 @@ class FeedFragment : Fragment() { super.onViewCreated(view, savedInstanceState) activity = requireActivity() - - - binding.listRecyclerView.adapter = adapter - binding.listRecyclerView.layoutManager = - LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) - binding.listProgressBar.visibility = ViewGroup.VISIBLE userId = arguments?.getInt("userId", -1) 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) - } + val navBar = if (userId != null) + (activity as ProfileActivity).navBar + else + (activity as FeedActivity).navBar + binding.listRecyclerView.setBaseline(navBar) + + binding.listRecyclerView.adapter = adapter + binding.listRecyclerView.layoutManager = + LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + binding.listProgressBar.visibility = ViewGroup.VISIBLE } @SuppressLint("ClickableViewAccessibility") @@ -73,11 +72,11 @@ class FeedFragment : Fragment() { super.onResume() if (this::binding.isInitialized) { binding.root.requestLayout() - if (userId != null) { - binding.listRecyclerView.setBaseline((activity as ProfileActivity).navBar) - }else{ - binding.listRecyclerView.setBaseline((activity as FeedActivity).navBar) - } + val navBar = if (userId != null) + (activity as ProfileActivity).navBar + else + (activity as FeedActivity).navBar + binding.listRecyclerView.setBaseline(navBar) if (!loadedFirstTime) { activity.lifecycleScope.launch(Dispatchers.IO) { val nulledId = if (activityId == -1) null else activityId