From 3722ec3b053a4700afb1b60aa7a30565e956f4a5 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sun, 7 Mar 2021 11:35:34 +0000
Subject: [PATCH] Fixed select all logic in Entries adapter

---
 app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt       | 3 +--
 .../com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt  | 3 ++-
 .../com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt    | 1 -
 .../java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt b/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt
index b1f146c1..ec564690 100644
--- a/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt
@@ -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
 )
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt
index 4e1430f5..bb67c6a4 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesAdapter.kt
@@ -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())
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt
index 408ff130..63efc54c 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt
@@ -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()
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt
index 23034cd6..8355db96 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/polarScreen/TransAdapter.kt
@@ -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)