Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Fixed satellite entries search behaviour
Arty Bishopf89a46221621
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/EntriesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/EntriesAdapter.ktindex 6b8fe9fd..f6bd113c 100755--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/EntriesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/EntriesAdapter.kt@@ -22,66 +22,42 @@ package com.rtbishop.look4sat.ui.adaptersimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup+import android.widget.SearchViewimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.data.SatEntryimport com.rtbishop.look4sat.databinding.ItemSatEntryBindingimport java.util.*-class EntriesAdapter(private var entries: MutableList<SatEntry> = mutableListOf()) :- RecyclerView.Adapter<EntriesAdapter.SatEntryHolder>() {+class EntriesAdapter : RecyclerView.Adapter<EntriesAdapter.SatEntryHolder>(),+ SearchView.OnQueryTextListener {- private var selectAllToggle = true-- inner class SatEntryHolder(itemView: View, private val binding: ItemSatEntryBinding) :- RecyclerView.ViewHolder(itemView) {-- fun bind(satEntry: SatEntry) {- binding.satEntryCheckbox.text = satEntry.name- binding.satEntryCheckbox.isChecked = satEntry.isSelected- itemView.setOnClickListener {- satEntry.isSelected = binding.satEntryCheckbox.isChecked- }- }- }-- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SatEntryHolder {- val binding = ItemSatEntryBinding- .inflate(LayoutInflater.from(parent.context), parent, false)- return SatEntryHolder(binding.root, binding)- }-- override fun onBindViewHolder(holder: SatEntryHolder, position: Int) {- holder.bind(entries[position])- }-- override fun getItemCount(): Int {- return entries.size- }+ private var shouldSearchAll = true+ private var allEntries = mutableListOf<SatEntry>()+ private var currentEntries = mutableListOf<SatEntry>()fun getEntries(): MutableList<SatEntry> {- return entries+ return allEntries}fun setEntries(list: MutableList<SatEntry>) {- entries = list+ allEntries = list+ currentEntries = listnotifyDataSetChanged()}fun selectAll() {- selectAllToggle = if (selectAllToggle) {- val currentList = getEntries()- currentList.forEach { it.isSelected = true }- setEntries(currentList)+ shouldSearchAll = if (shouldSearchAll) {+ currentEntries.forEach { it.isSelected = true }+ notifyDataSetChanged()false} else {- val currentList = getEntries()- currentList.forEach { it.isSelected = false }- setEntries(currentList)+ currentEntries.forEach { it.isSelected = false }+ notifyDataSetChanged()true}}- fun filterEntries(list: MutableList<SatEntry>, query: String): MutableList<SatEntry> {+ private fun filterEntries(list: MutableList<SatEntry>, query: String): MutableList<SatEntry> {if (query.isEmpty()) return listreturn try {filterByCatNum(list, query.toInt())@@ -91,17 +67,53 @@ class EntriesAdapter(private var entries: MutableList<SatEntry> = mutableListOf(}private fun filterByCatNum(list: MutableList<SatEntry>, catNum: Int): MutableList<SatEntry> {- val filteredList = list.filter { it.catNum == catNum }- return filteredList as MutableList<SatEntry>+ return list.filter { it.catNum == catNum } as MutableList}private fun filterByName(list: MutableList<SatEntry>, query: String): MutableList<SatEntry> {- val searchQuery = query.toLowerCase(Locale.getDefault())+ val defaultLocale = Locale.getDefault()val filteredList = mutableListOf<SatEntry>()+ val searchQuery = query.toLowerCase(defaultLocale)list.forEach {- val entryName = it.name.toLowerCase(Locale.getDefault())+ val entryName = it.name.toLowerCase(defaultLocale)if (entryName.contains(searchQuery)) filteredList.add(it)}return filteredList}++ override fun onQueryTextChange(newText: String): Boolean {+ currentEntries = filterEntries(getEntries(), newText)+ notifyDataSetChanged()+ return false+ }++ override fun onQueryTextSubmit(query: String): Boolean {+ return false+ }++ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SatEntryHolder {+ val binding = ItemSatEntryBinding+ .inflate(LayoutInflater.from(parent.context), parent, false)+ return SatEntryHolder(binding.root, binding)+ }++ override fun onBindViewHolder(holder: SatEntryHolder, position: Int) {+ holder.bind(currentEntries[position])+ }++ override fun getItemCount(): Int {+ return currentEntries.size+ }++ inner class SatEntryHolder(itemView: View, private val binding: ItemSatEntryBinding) :+ RecyclerView.ViewHolder(itemView) {++ fun bind(satEntry: SatEntry) {+ binding.satEntryCheckbox.text = satEntry.name+ binding.satEntryCheckbox.isChecked = satEntry.isSelected+ itemView.setOnClickListener {+ satEntry.isSelected = binding.satEntryCheckbox.isChecked+ }+ }+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.ktindex 5ff39091..6159b35e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt@@ -3,7 +3,6 @@ package com.rtbishop.look4sat.ui.fragmentsimport android.content.Intentimport android.os.Bundleimport android.view.View-import android.widget.SearchViewimport androidx.appcompat.app.AppCompatActivityimport androidx.core.content.res.ResourcesCompatimport androidx.fragment.app.Fragment@@ -22,8 +21,7 @@ import com.rtbishop.look4sat.ui.adapters.EntriesAdapterimport javax.inject.Injectclass EntriesFragment : Fragment(R.layout.fragment_entries),- SourcesDialog.SourcesSubmitListener,- SearchView.OnQueryTextListener {+ SourcesDialog.SourcesSubmitListener {@Injectlateinit var factory: ViewModelFactory@@ -47,7 +45,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries),binding.apply {importWeb.setOnClickListener { showSourcesDialog() }importFile.setOnClickListener { showFileDialog() }- searchBar.setOnQueryTextListener(this@EntriesFragment)+ searchBar.setOnQueryTextListener(entriesAdapter)selectAll.setOnClickListener { entriesAdapter.selectAll() }entriesRecycler.apply {val linearLayoutMgr = LinearLayoutManager(requireContext())@@ -111,14 +109,4 @@ class EntriesFragment : Fragment(R.layout.fragment_entries),viewModel.updateEntriesSelection(catNumList)requireView().findNavController().navigate(R.id.action_entries_to_passes)}-- override fun onQueryTextChange(newText: String): Boolean {- val filteredList = entriesAdapter.filterEntries(entriesAdapter.getEntries(), newText)- entriesAdapter.setEntries(filteredList)- return false- }-- override fun onQueryTextSubmit(query: String): Boolean {- return false- }}\ No newline at end of file