mirror of
https://github.com/rebelonion/Dantotsu.git
synced 2026-01-11 17:36:16 +00:00
fix: activity crash
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user