agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix crash related to using the wrong RxBinding method with the Transactions SearchView, make some improvements and remove the old code used with the SearchView before using the SearchView's RxBinding method.

Browse source
This commit is contained in:
Severiano Jaramillo 2018-12-24 11:15:25 -06:00
parent a39daaf155
commit e4391dad73
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt
View file

@ -10,20 +10,21 @@ import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.jakewharton.rxbinding3.appcompat.queryTextChanges import com.jakewharton.rxbinding3.appcompat.queryTextChangeEvents
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.adapters.TransfersDetailsAdapter import cy.agorise.bitsybitshareswallet.adapters.TransfersDetailsAdapter
import cy.agorise.bitsybitshareswallet.database.joins.TransferDetail import cy.agorise.bitsybitshareswallet.database.joins.TransferDetail
import cy.agorise.bitsybitshareswallet.utils.BounceTouchListener import cy.agorise.bitsybitshareswallet.utils.BounceTouchListener
import cy.agorise.bitsybitshareswallet.utils.Constants import cy.agorise.bitsybitshareswallet.utils.Constants
import cy.agorise.bitsybitshareswallet.viewmodels.TransferDetailViewModel import cy.agorise.bitsybitshareswallet.viewmodels.TransferDetailViewModel
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable
import kotlinx.android.synthetic.main.fragment_transactions.* import kotlinx.android.synthetic.main.fragment_transactions.*
import java.util.* import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
class TransactionsFragment : Fragment(), SearchView.OnQueryTextListener { class TransactionsFragment : Fragment() {
private lateinit var mTransferDetailViewModel: TransferDetailViewModel private lateinit var mTransferDetailViewModel: TransferDetailViewModel
@ -89,14 +90,15 @@ class TransactionsFragment : Fragment(), SearchView.OnQueryTextListener {
val searchItem = menu.findItem(R.id.menuSearch) val searchItem = menu.findItem(R.id.menuSearch)
val searchView = searchItem.actionView as SearchView val searchView = searchItem.actionView as SearchView
mDisposables.add( mDisposables.add(
searchView.queryTextChanges() searchView.queryTextChangeEvents()
.skipInitialValue() .skipInitialValue()
.debounce(500, TimeUnit.MILLISECONDS) .debounce(500, TimeUnit.MILLISECONDS)
.map { it.toString().toLowerCase() } .map { it.queryText.toString().toLowerCase() }
.subscribe { .observeOn(AndroidSchedulers.mainThread())
filterQuery = it .subscribe {
applyFilterOptions() filterQuery = it
} applyFilterOptions()
}
) )
// Adjust SearchView width to avoid pushing other menu items out of the screen // Adjust SearchView width to avoid pushing other menu items out of the screen
@ -115,14 +117,6 @@ class TransactionsFragment : Fragment(), SearchView.OnQueryTextListener {
return size.x return size.x
} }
override fun onQueryTextChange(query: String): Boolean {
filterQuery = query.toLowerCase()
applyFilterOptions()
return true
}
override fun onQueryTextSubmit(query: String?) = false // Not needed since we are filtering as the user types
/** /**
* Filters the TransferDetail list given the user selected filter options. * Filters the TransferDetail list given the user selected filter options.
* TODO move this to a background thread * TODO move this to a background thread