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

Show merchants and tellers suggestions in MerchantsFragment's SearchView if they are enabled in the popup window.

Browse source
This commit is contained in:
Severiano Jaramillo 2019-01-29 10:44:08 -06:00
parent 732d48796b
commit 5fc5db88c2
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt
View file

@ -127,7 +127,7 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
}
private fun setupPopupWindow() {
val popupView = layoutInflater?.inflate(R.layout.popup_menu_merchants, null)
val popupView = layoutInflater?.inflate(R.layout.popup_menu_merchants, null, false)
val switchMerchants = popupView?.findViewById<SwitchCompat>(R.id.switchMerchants)
switchMerchants?.isChecked = showMerchantsMarkers
@ -199,28 +199,35 @@ class MerchantsFragment : Fragment(), OnMapReadyCallback, SearchView.OnSuggestio
mDisposables.add(Observable.zip(merchantsObs, tellerObs,
BiFunction<List<Merchant>, List<Teller>, List<MapObject>> { t1, t2 ->
val mapObjects = ArrayList<MapObject>()
for (merchant in t1) {
val mapObject = MapObject(
merchant._id,
merchant.lat,
merchant.lon,
merchant.name,
merchant.address,
1
)
mapObjects.add(mapObject)
// Show merchant suggestions only if merchants are enabled
if (showMerchantsMarkers) {
for (merchant in t1) {
val mapObject = MapObject(
merchant._id,
merchant.lat,
merchant.lon,
merchant.name,
merchant.address,
1
)
mapObjects.add(mapObject)
}
}
for (teller in t2) {
val mapObject = MapObject(
teller._id,
teller.lat,
teller.lon,
teller.gt_name,
teller.address,
0
)
mapObjects.add(mapObject)
// Show teller suggestions only if tellers are enabled
if (showTellerMarkers) {
for (teller in t2) {
val mapObject = MapObject(
teller._id,
teller.lat,
teller.lon,
teller.gt_name,
teller.address,
0
)
mapObjects.add(mapObject)
}
}
mapObjects