Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Fixed SelectAllItems button behaviour
Arty Bishopd32e5a5ce35e
diff --git a/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.ktindex 38e30345..14e7d2b1 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/database/SatelliteDao.kt@@ -58,10 +58,17 @@ interface SatelliteDao {// Update@Transaction- suspend fun updateEntriesSelection(catNums: List<Int>, isSelected: Boolean) {+ suspend fun restoreEntriesSelection(catNums: List<Int>, isSelected: Boolean) {clearEntriesSelection()catNums.forEach { catNum ->- updateItemSelection(catNum, true)+ updateItemSelection(catNum, isSelected)+ }+ }++ @Transaction+ suspend fun updateEntriesSelection(catNums: List<Int>, isSelected: Boolean) {+ catNums.forEach { catNum ->+ updateItemSelection(catNum, isSelected)}}diff --git a/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt b/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.ktindex eb3672ce..dfa5034d 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/repository/SatelliteRepo.kt@@ -139,7 +139,7 @@ class SatelliteRepo @Inject constructor(private suspend fun insertEntriesAndRestoreSelection(entries: List<SatEntry>) {val selectedCatNums = satelliteDao.getSelectedCatNums()satelliteDao.insertEntries(entries)- satelliteDao.updateEntriesSelection(selectedCatNums, true)+ satelliteDao.restoreEntriesSelection(selectedCatNums, true)}// Update@@ -148,10 +148,6 @@ class SatelliteRepo @Inject constructor(satelliteDao.updateEntriesSelection(catNums, isSelected)}- suspend fun updateItemSelection(catNum: Int, isSelected: Boolean) {- satelliteDao.updateItemSelection(catNum, isSelected)- }-// Deletesuspend fun deleteAllData() {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.ktindex 2e689d4c..32ce1a12 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@@ -28,96 +28,94 @@ import java.util.*class EntriesAdapter : RecyclerView.Adapter<EntriesAdapter.SatItemHolder>() {- private var allItems = listOf<SatItem>()- private var selectAll = true- private lateinit var entriesClickListener: EntriesClickListener+ private val diffCallback = object : DiffUtil.ItemCallback<SatItem>() {+ override fun areItemsTheSame(oldItem: SatItem, newItem: SatItem): Boolean {+ return oldItem.catNum == newItem.catNum+ }- fun submitAllItems(items: List<SatItem>) {- allItems = items- listDiffer.submitList(items)+ override fun areContentsTheSame(oldItem: SatItem, newItem: SatItem): Boolean {+ return oldItem.isSelected == newItem.isSelected+ }}+ private val listDiffer = AsyncListDiffer(this, diffCallback)+ private var allItems = emptyList<SatItem>()+ private var shouldSelectAll = true+ private lateinit var entriesClickListener: EntriesClickListener- private fun submitCurrentItems(items: List<SatItem>) {- listDiffer.submitList(items)+ interface EntriesClickListener {+ fun updateSelection(catNums: List<Int>, isSelected: Boolean)}fun setEntriesClickListener(listener: EntriesClickListener) {entriesClickListener = listener}+ fun submitAllItems(items: List<SatItem>) {+ allItems = items+ listDiffer.submitList(items)+ }++ fun selectAllItems() {+ val catNums = listDiffer.currentList.map { it.catNum }+ entriesClickListener.updateSelection(catNums, shouldSelectAll)+ shouldSelectAll = !shouldSelectAll+ }+fun filterItems(query: String) {- selectAll = trueif (query.isEmpty()) {submitCurrentItems(allItems)} else {try {- val catNum = query.toInt()- submitCurrentItems(filterByCatNum(allItems, catNum))+ filterByCatNum(query.toInt())} catch (e: NumberFormatException) {- submitCurrentItems(filterByName(allItems, query))+ filterByName(query)}}+ shouldSelectAll = true}- private fun filterByCatNum(list: List<SatItem>, catNum: Int): List<SatItem> {- return list.filter { it.catNum == catNum }- }-- private fun filterByName(list: List<SatItem>, query: String): List<SatItem> {- val defaultLocale = Locale.getDefault()- val searchQuery = query.toLowerCase(defaultLocale)- return list.filter { satItem ->- val lowerCaseItem = satItem.name.toLowerCase(defaultLocale)- lowerCaseItem.contains(searchQuery)- }- }-- fun selectAllItems() {-// currentItems.forEach { it.isSelected = selectAll }-// selectAll = selectAll.not()-// notifyDataSetChanged()--// val catNums = listDiffer.currentList.map { it.catNum }-// entriesClickListener.onSelectAllClick(catNums, selectAll)-// selectAll = selectAll.not()+ private fun submitCurrentItems(items: List<SatItem>) {+ listDiffer.submitList(items)}- interface EntriesClickListener {- fun onItemClick(catNum: Int, isSelected: Boolean)- fun onSelectAllClick(catNums: List<Int>, isSelected: Boolean)+ private fun filterByCatNum(catNum: Int) {+ submitCurrentItems(allItems.filter { it.catNum == catNum })}- private val diffCallback = object : DiffUtil.ItemCallback<SatItem>() {- override fun areItemsTheSame(oldItem: SatItem, newItem: SatItem): Boolean {- return oldItem.catNum == newItem.catNum- }-- override fun areContentsTheSame(oldItem: SatItem, newItem: SatItem): Boolean {- return oldItem.isSelected == newItem.isSelected+ private fun filterByName(query: String) {+ val searchQuery = query.toLowerCase(Locale.getDefault())+ val filteredItems = allItems.filter { satItem ->+ val lowerCaseItem = satItem.name.toLowerCase(Locale.getDefault())+ lowerCaseItem.contains(searchQuery)}+ submitCurrentItems(filteredItems)}- private val listDiffer = AsyncListDiffer(this, diffCallback)-override fun getItemCount(): Int = listDiffer.currentList.sizeoverride fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SatItemHolder {- val inflater = LayoutInflater.from(parent.context)- return SatItemHolder(ItemSatEntryBinding.inflate(inflater, parent, false))+ return SatItemHolder.from(parent)}override fun onBindViewHolder(holder: SatItemHolder, position: Int) {- holder.bind(listDiffer.currentList[position])+ holder.bind(listDiffer.currentList[position], entriesClickListener)}- inner class SatItemHolder(private val binding: ItemSatEntryBinding) :+ class SatItemHolder private constructor(private val binding: ItemSatEntryBinding) :RecyclerView.ViewHolder(binding.root) {- fun bind(item: SatItem) {- binding.satEntryCheckbox.text = item.name- binding.satEntryCheckbox.isChecked = item.isSelected+ fun bind(item: SatItem, clickListener: EntriesClickListener) {+ binding.satItemCheckbox.text = item.name+ binding.satItemCheckbox.isChecked = item.isSelecteditemView.setOnClickListener {- entriesClickListener.onItemClick(item.catNum, !item.isSelected)+ clickListener.updateSelection(listOf(item.catNum), item.isSelected.not())+ }+ }++ companion object {+ fun from(parent: ViewGroup): SatItemHolder {+ val inflater = LayoutInflater.from(parent.context)+ return SatItemHolder(ItemSatEntryBinding.inflate(inflater, parent, false))}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.ktindex e63edd07..6f7ac96c 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt@@ -18,6 +18,7 @@package com.rtbishop.look4sat.ui.entriesScreenimport android.os.Bundle+import android.text.Editableimport android.view.Viewimport androidx.activity.result.contract.ActivityResultContractsimport androidx.core.widget.addTextChangedListener@@ -45,21 +46,20 @@ class EntriesFragment : Fragment(R.layout.fragment_entries), EntriesAdapter.EntrregisterForActivityResult(ActivityResultContracts.GetContent()) { uri ->uri?.let { viewModel.importSatDataFromFile(uri) }}+ private val entriesAdapter = EntriesAdapter().apply {+ setEntriesClickListener(this@EntriesFragment)+ }private var binding: FragmentEntriesBinding? = null- private var entriesAdapter: EntriesAdapter? = nulloverride fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)binding = FragmentEntriesBinding.bind(view)setupComponents()- setupObservers()+ observeSatelliteData()observeSourcesResult()}private fun setupComponents() {- entriesAdapter = EntriesAdapter().apply {- setEntriesClickListener(this@EntriesFragment)- }binding?.apply {entriesRecycler.apply {setHasFixedSize(true)@@ -70,23 +70,20 @@ class EntriesFragment : Fragment(R.layout.fragment_entries), EntriesAdapter.Entr}importWeb.setOnClickListener { showImportFromWebDialog() }importFile.setOnClickListener { filePicker.launch("*/*") }- selectAll.setOnClickListener { entriesAdapter?.selectAllItems() }- searchBar.addTextChangedListener {- entriesAdapter?.filterItems(it.toString())- binding?.entriesRecycler?.scrollToPosition(0)- }+ selectAll.setOnClickListener { entriesAdapter.selectAllItems() }+ searchBar.addTextChangedListener { query -> filterByQuery(query) }searchBar.clearFocus()}}- private fun setupObservers() {+ private fun observeSatelliteData() {viewModel.satData.observe(viewLifecycleOwner, { result ->when (result) {is Result.Success -> {if (result.data.isEmpty()) {setEmpty()} else {- entriesAdapter?.submitAllItems(result.data)+ entriesAdapter.submitAllItems(result.data)setLoaded()}}@@ -131,20 +128,20 @@ class EntriesFragment : Fragment(R.layout.fragment_entries), EntriesAdapter.Entr}}- private fun showImportFromWebDialog() {- findNavController().navigate(R.id.nav_dialog_sources)+ private fun filterByQuery(it: Editable?) {+ entriesAdapter.filterItems(it.toString())+ binding?.entriesRecycler?.scrollToPosition(0)}- override fun onItemClick(catNum: Int, isSelected: Boolean) {- viewModel.updateItemSelection(catNum, isSelected)+ private fun showImportFromWebDialog() {+ findNavController().navigate(R.id.nav_dialog_sources)}- override fun onSelectAllClick(catNums: List<Int>, isSelected: Boolean) {+ override fun updateSelection(catNums: List<Int>, isSelected: Boolean) {viewModel.updateEntriesSelection(catNums, isSelected)}override fun onDestroyView() {- entriesAdapter = nullbinding = nullsuper.onDestroyView()}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.ktindex 71d028f5..8ddff484 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt@@ -76,14 +76,7 @@ class EntriesViewModel @Inject constructor(fun updateEntriesSelection(items: List<Int>, isSelected: Boolean) {viewModelScope.launch {-// val selectedEntries = items.filter { it.isSelected }.map { it.catNum }-// satelliteRepo.updateEntriesSelection(selectedEntries, isSelected)- }- }-- fun updateItemSelection(catNum: Int, isSelected: Boolean) {- viewModelScope.launch {- satelliteRepo.updateItemSelection(catNum, isSelected)+ satelliteRepo.updateEntriesSelection(items, isSelected)}}}\ No newline at end of filediff --git a/app/src/main/res/layout/item_sat_entry.xml b/app/src/main/res/layout/item_sat_entry.xmlindex fbbae115..ae952a40 100644--- a/app/src/main/res/layout/item_sat_entry.xml+++ b/app/src/main/res/layout/item_sat_entry.xml@@ -1,6 +1,6 @@<?xml version="1.0" encoding="utf-8"?><com.google.android.material.checkbox.MaterialCheckBox xmlns:android="http://schemas.android.com/apk/res/android"- android:id="@+id/sat_entry_checkbox"+ android:id="@+id/sat_item_checkbox"android:layout_width="match_parent"android:layout_height="32dp"android:background="@null"