mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-09-20 19:29:47 +00:00
Code Issues Releases Wiki Activity

Fix reload feed button does nothing

Browse Source 
initListeners was being called before the bindings were assigned, and therefore the click listener was never setup
This commit is contained in:
Stypox 2021-01-16 18:38:29 +01:00
parent 098c954ef1
commit d3d05d613d
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View File

@ -32,7 +32,6 @@ import androidx.appcompat.app.AlertDialog
import androidx.core.content.edit import androidx.core.content.edit
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -83,13 +82,13 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
} }
override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) { override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) {
super.onViewCreated(rootView, savedInstanceState) // super.onViewCreated() calls initListeners() which require the binding to be initialized
_feedBinding = FragmentFeedBinding.bind(rootView) _feedBinding = FragmentFeedBinding.bind(rootView)
_errorBinding = feedBinding.errorPanel _errorBinding = feedBinding.errorPanel
super.onViewCreated(rootView, savedInstanceState)
feedBinding.swiperefresh.setOnRefreshListener { reloadContent() }
viewModel = ViewModelProvider(this, FeedViewModel.Factory(requireContext(), groupId)).get(FeedViewModel::class.java) viewModel = ViewModelProvider(this, FeedViewModel.Factory(requireContext(), groupId)).get(FeedViewModel::class.java)
viewModel.stateLiveData.observe(viewLifecycleOwner, Observer { it?.let(::handleResult) }) viewModel.stateLiveData.observe(viewLifecycleOwner) { it?.let(::handleResult) }
} }
override fun onPause() { override fun onPause() {
@ -112,10 +111,8 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
override fun initListeners() { override fun initListeners() {
super.initListeners() super.initListeners()
// Using the non-null property may result in a NullPointerException feedBinding.refreshRootView.setOnClickListener { reloadContent() }
_feedBinding?.refreshRootView?.setOnClickListener { feedBinding.swiperefresh.setOnRefreshListener { reloadContent() }
triggerUpdate()
}
} }
// ///////////////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////////////
@ -317,11 +314,10 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
// ///////////////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////////////
override fun doInitialLoadLogic() {} override fun doInitialLoadLogic() {}
override fun reloadContent() = triggerUpdate()
override fun loadMoreItems() {} override fun loadMoreItems() {}
override fun hasMoreItems() = false override fun hasMoreItems() = false
private fun triggerUpdate() { override fun reloadContent() {
getActivity()?.startService( getActivity()?.startService(
Intent(requireContext(), FeedLoadService::class.java).apply { Intent(requireContext(), FeedLoadService::class.java).apply {
putExtra(FeedLoadService.EXTRA_GROUP_ID, groupId) putExtra(FeedLoadService.EXTRA_GROUP_ID, groupId)

2
app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerSubscriptionItem.kt
View File

@ -46,6 +46,6 @@ data class PickerSubscriptionItem(
fun updateSelected(containerView: View, isSelected: Boolean) { fun updateSelected(containerView: View, isSelected: Boolean) {
this.isSelected = isSelected this.isSelected = isSelected
PickerSubscriptionItemBinding.bind(containerView).selectedHighlight PickerSubscriptionItemBinding.bind(containerView).selectedHighlight
.animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA) .animate(isSelected, 150, AnimationType.LIGHT_SCALE_AND_ALPHA)
} }
} }