sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-08-01 11:40:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue with using skills

Browse source
This commit is contained in:
Phillip Thelen 2019-10-14 13:43:20 +02:00
parent 4ead5fce0c
commit d3c07fc254
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
View file

@ -60,7 +60,7 @@ class SkillTasksActivity : BaseActivity() {
else -> fragment.taskType = Task.TYPE_TODO
}
compositeSubscription.add(fragment.taskSelectionEvents.subscribe(Consumer { task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe(Consumer { task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
viewFragmentsDictionary.put(position, fragment)

12
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
View file

@ -18,8 +18,10 @@ import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
import com.habitrpg.android.habitica.ui.fragments.BaseFragment
import com.habitrpg.android.habitica.ui.helpers.bindView
import com.habitrpg.android.habitica.ui.helpers.resetViews
import io.reactivex.BackpressureStrategy
import io.reactivex.Flowable
import io.reactivex.functions.Consumer
import io.reactivex.subjects.PublishSubject
import javax.inject.Inject
import javax.inject.Named
@ -35,8 +37,11 @@ class SkillTasksRecyclerViewFragment : BaseFragment() {
internal var layoutManager: LinearLayoutManager? = null
var taskType: String? = null
val taskSelectionEvents: Flowable<Task>
get() = adapter.getTaskSelectionEvents()
private val taskSelectionEvents = PublishSubject.create<Task>()
fun getTaskSelectionEvents(): Flowable<Task> {
return taskSelectionEvents.toFlowable(BackpressureStrategy.DROP)
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
super.onCreateView(inflater, container, savedInstanceState)
@ -61,6 +66,9 @@ class SkillTasksRecyclerViewFragment : BaseFragment() {
recyclerView?.layoutManager = layoutManager
adapter = SkillTasksRecyclerViewAdapter(null, true)
compositeSubscription.add(adapter.getTaskSelectionEvents().subscribe(Consumer {
taskSelectionEvents.onNext(it)
}, RxErrorHandler.handleEmptyError()))
recyclerView?.adapter = adapter
context?.let {