From 03b84ff9c30eb5bf5b024bda0f51ebd15bcecd5d Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Sat, 8 Apr 2023 21:03:00 +0200
Subject: [PATCH] Submodules are now also filtered

---
 .../sidepanel/SubmodulesViewModel.kt           | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/sidepanel/SubmodulesViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/sidepanel/SubmodulesViewModel.kt
index e37cc89..c4778c6 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/sidepanel/SubmodulesViewModel.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/sidepanel/SubmodulesViewModel.kt
@@ -27,24 +27,16 @@ class SubmodulesViewModel @AssistedInject constructor(
 ) : SidePanelChildViewModel(true) {
 
     private val _submodules = MutableStateFlow<List<Pair<String, SubmoduleStatus>>>(listOf())
-    val submodules: StateFlow<SubmodulesState> = _submodules.combine(isExpanded) { submodules, isExpanded ->
-        SubmodulesState(submodules, isExpanded)
-    }.stateIn(
-        scope = tabScope,
-        started = SharingStarted.Eagerly,
-        initialValue = SubmodulesState(emptyList(), isExpanded.value)
-    )
-
-    val submodulesState: StateFlow<SubmodulesState> =
+    val submodules: StateFlow<SubmodulesState> =
         combine(_submodules, isExpanded, filter) { submodules, isExpanded, filter ->
             SubmodulesState(
                 submodules = submodules.filter { it.first.lowercaseContains(filter) },
-                isExpanded
+                isExpanded = isExpanded
             )
         }.stateIn(
-            tabScope,
-            SharingStarted.Eagerly,
-            SubmodulesState(emptyList(), isExpanded.value)
+            scope = tabScope,
+            started = SharingStarted.Eagerly,
+            initialValue = SubmodulesState(emptyList(), isExpanded.value)
         )
 
     init {