Added multi selection for Satellite types filter dialog

data/src/main/java/com/rtbishop/look4sat/data/repository/SelectionRepo.kt

@@ -21,18 +21,20 @@ class SelectionRepo(
 ) : ISelectionRepo {
 
     private val currentItems = MutableStateFlow<List<SatItem>>(emptyList())
-    private val currentType = MutableStateFlow("All")
+    private val currentTypes = MutableStateFlow(settingsRepo.selectedTypes.value)
     private val currentQuery = MutableStateFlow("")
-    private val itemsWithType = currentType.flatMapLatest { type ->
-        currentItems.map { items -> items.filterByType(type) }
+    private val itemsWithTypes = currentTypes.flatMapLatest { types: List<String> ->
+        currentItems.map { items -> items.filterByTypes(types) }
     }
     private val itemsWithQuery = currentQuery.flatMapLatest { query ->
-        itemsWithType.map { items -> items.filterByQuery(query) }
+        itemsWithTypes.map { items -> items.filterByQuery(query) }
     }
 
-    override fun getCurrentType() = currentType.value
+    override fun getCurrentTypes() = currentTypes.value
 
-    override fun getTypesList() = Sources.satelliteDataUrls.keys.sorted()
+    override fun getTypesList() = Sources.satelliteDataUrls.keys.sorted().toMutableList().apply {
+        removeAt(0)
+    }
 
     override suspend fun getEntriesFlow() = withContext(dispatcher) {
         val selectedIds = settingsRepo.selectedIds.value
@@ -42,8 +44,9 @@ class SelectionRepo(
         return@withContext itemsWithQuery
     }
 
-    override suspend fun setType(type: String) = withContext(dispatcher) {
-        currentType.value = type
+    override suspend fun setTypes(types: List<String>) {
+        currentTypes.value = types
+        settingsRepo.setSelectedTypes(types)
     }
 
     override suspend fun setQuery(query: String) = withContext(dispatcher) {
@@ -65,11 +68,11 @@ class SelectionRepo(
         settingsRepo.setSelectedIds(currentSelection)
     }
 
-    private suspend fun List<SatItem>.filterByType(type: String) = withContext(dispatcher) {
-        if (type == "All") return@withContext this@filterByType
-        val catnums = settingsRepo.getSatelliteTypeIds(type)
-        if (catnums.isEmpty()) return@withContext this@filterByType
-        return@withContext this@filterByType.filter { item -> item.catnum in catnums }
+    private suspend fun List<SatItem>.filterByTypes(types: List<String>) = withContext(dispatcher) {
+        if (types.isEmpty()) return@withContext this@filterByTypes
+        val catnums = settingsRepo.getSatelliteTypesIds(types)
+        if (catnums.isEmpty()) return@withContext this@filterByTypes
+        return@withContext this@filterByTypes.filter { item -> item.catnum in catnums }
     }
 
     private suspend fun List<SatItem>.filterByQuery(query: String) = withContext(dispatcher) {

data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt

@@ -48,6 +48,7 @@ class SettingsRepo(private val manager: LocationManager, private val preferences
     private val keyRotatorPort = "rotatorPort"
     private val keyRotatorState = "rotatorState"
     private val keySelectedIds = "selectedIds"
+    private val keySelectedTypes = "selectedTypes"
     private val keySelectedModes = "selectedModes"
     private val keyStateOfAutoUpdate = "stateOfAutoUpdate"
     private val keyStateOfSensors = "stateOfSensors"
@@ -64,7 +65,9 @@ class SettingsRepo(private val manager: LocationManager, private val preferences
 
     //region # Satellites selection settings
     private val _satelliteSelection = MutableStateFlow(getSelectedIds())
+    private val _typesSelection = MutableStateFlow(getSelectedTypes())
     override val selectedIds: StateFlow<List<Int>> = _satelliteSelection
+    override val selectedTypes: StateFlow<List<String>> = _typesSelection
 
     override fun setSelectedIds(ids: List<Int>) {
         val selectionString = ids.joinToString(separatorComma)
@@ -72,11 +75,23 @@ class SettingsRepo(private val manager: LocationManager, private val preferences
         _satelliteSelection.value = ids
     }
 
+    override fun setSelectedTypes(types: List<String>) {
+        val typesString = types.joinToString(separatorComma)
+        preferences.edit { putString(keySelectedTypes, typesString) }
+        _typesSelection.value = types
+    }
+
     private fun getSelectedIds(): List<Int> {
         val selectionString = preferences.getString(keySelectedIds, null)
         if (selectionString.isNullOrEmpty()) return emptyList()
         return selectionString.split(separatorComma).map { it.toInt() }
     }
+
+    private fun getSelectedTypes(): List<String> {
+        val typesString = preferences.getString(keySelectedTypes, null)
+        if (typesString.isNullOrEmpty()) return emptyList()
+        return typesString.split(separatorComma)
+    }
     //endregion
 
     //region # Passes filter settings
@@ -171,10 +186,18 @@ class SettingsRepo(private val manager: LocationManager, private val preferences
     private val _databaseState = MutableStateFlow(getDatabaseState())
     override val databaseState: StateFlow<DatabaseState> = _databaseState
 
-    override fun getSatelliteTypeIds(type: String): List<Int> {
-        val typesString = preferences.getString("type$type", null)
-        if (typesString.isNullOrBlank()) return emptyList()
-        return typesString.split(separatorComma).map { it.toInt() }
+    override fun getSatelliteTypesIds(types: List<String>): List<Int> {
+        val idsSet = mutableSetOf<Int>()
+        types.forEach { type ->
+            val typeString = preferences.getString("type$type", null)
+            val typeIds = if (typeString.isNullOrBlank()) {
+                emptyList()
+            } else {
+                typeString.split(separatorComma).map { it.toInt() }
+            }
+            idsSet.addAll(typeIds)
+        }
+        return idsSet.toList()
     }
 
     override fun setSatelliteTypeIds(type: String, ids: List<Int>) {