kopia lustrzana https://github.com/rt-bishop/Look4Sat
Fixed select all logic in Entries adapter
rodzic
44910389e3
commit
3722ec3b05
|
@ -27,6 +27,5 @@ class SatPass(
|
|||
val tle: TLE,
|
||||
val predictor: PassPredictor,
|
||||
val pass: SatPassTime,
|
||||
var progress: Int = 0,
|
||||
var active: Boolean = false
|
||||
var progress: Int = 0
|
||||
)
|
||||
|
|
|
@ -47,8 +47,8 @@ class EntriesAdapter : RecyclerView.Adapter<EntriesAdapter.SatItemHolder>(),
|
|||
}
|
||||
|
||||
fun selectAllItems() {
|
||||
currentItems.forEach { it.isSelected = shouldSearchAll }
|
||||
shouldSearchAll = shouldSearchAll.not()
|
||||
currentItems.forEach { it.isSelected = it.isSelected.not() }
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
|
@ -64,6 +64,7 @@ class EntriesAdapter : RecyclerView.Adapter<EntriesAdapter.SatItemHolder>(),
|
|||
}
|
||||
|
||||
private fun filterItems(list: List<SatItem>, query: String): List<SatItem> {
|
||||
shouldSearchAll = true
|
||||
if (query.isEmpty()) return list
|
||||
return try {
|
||||
filterByCatNum(list, query.toInt())
|
||||
|
|
|
@ -64,7 +64,6 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false)
|
|||
if (satPass.progress < 100) {
|
||||
val timeStart = satPass.pass.startTime.time
|
||||
if (timeNow > timeStart) {
|
||||
satPass.active = true
|
||||
val timeEnd = satPass.pass.endTime.time
|
||||
val index = satPassList.indexOf(satPass)
|
||||
val deltaNow = timeNow.minus(timeStart).toFloat()
|
||||
|
|
|
@ -48,7 +48,7 @@ class TransAdapter(context: Context, private val satPass: SatPass) :
|
|||
}
|
||||
|
||||
fun tickTransmitters() {
|
||||
if (!satPass.tle.isDeepspace and satPass.active) {
|
||||
if (!satPass.tle.isDeepspace) {
|
||||
val iterator = transmittersList.listIterator()
|
||||
while (iterator.hasNext()) {
|
||||
val trans = iterator.next()
|
||||
|
@ -78,7 +78,7 @@ class TransAdapter(context: Context, private val satPass: SatPass) :
|
|||
fun bind(satTrans: SatTrans) {
|
||||
binding.description.text = satTrans.description
|
||||
|
||||
if (satPass.tle.isDeepspace or !satPass.active) setRegularFreq(satTrans)
|
||||
if (satPass.tle.isDeepspace) setRegularFreq(satTrans)
|
||||
else setDopplerFreq(satTrans)
|
||||
|
||||
if (satTrans.mode != null) binding.mode.text = String.format(mode, satTrans.mode)
|
||||
|
|
Ładowanie…
Reference in New Issue