Fix imports

Author: Simon Schubert

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/MainActivity.kt

@@ -110,7 +110,7 @@ fun LinuxApp() {
             TextFieldValue(text = "", selection = TextRange(0)),
         )
     }
-    val showSearch = remember { mutableStateof(false) }
+    val showSearch = remember { mutableStateOf(false) }
     val onNavigate: (String) -> Unit = remember(navController) { { route -> navController.navigate(route) } }
 
     Scaffold(

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/basicgroups/BasicGroupsScreen.kt

@@ -60,7 +60,7 @@ fun BasicGroupsScreen(
         ) { basicGroup ->
             BasicGroupColumn(
                 basicGroup = basicGroup,
-                isExpanded = !uiState.collapsedMap.getOrDefault(basicGroup.id, false),
+                isExpanded = !uiState.collapsedMap.getOrDefault(basicGroup.id, true),
                 onToggleCollapse = { viewModel.toggleCollapse(basicGroup.id) },
                 onNavigate = onNavigate,
             )

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/basicgroups/BasicGroupsUiState.kt

@@ -8,5 +8,5 @@ import kotlinx.collections.immutable.persistentMapOf
 
 data class BasicGroupsUiState(
     val basicGroups: ImmutableList<BasicGroup> = persistentListOf(),
-    val collapsedMap: ImmutableMap<Long, Boolean> = persistentMapOf()
+    val collapsedMap: ImmutableMap<Long, Boolean> = persistentMapOf(),
 )

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/basicgroups/BasicGroupsViewModel.kt

@@ -33,13 +33,12 @@ class BasicGroupsViewModel(categoryId: Long) : ViewModel() {
         _uiState.value = BasicGroupsUiState(basicGroups = groups)
     }
 
-    fun isGroupCollapsed(id: Long): Boolean =
-        _uiState.value.collapsedMap.getOrDefault(id, false)
+    fun isGroupCollapsed(id: Long): Boolean = _uiState.value.collapsedMap.getOrDefault(id, true)
 
     fun toggleCollapse(id: Long) {
         _uiState.update { currentState ->
             val newMap = currentState.collapsedMap.toMutableMap()
-            newMap[id] = !currentState.collapsedMap.getOrDefault(id, false)
+            newMap[id] = !currentState.collapsedMap.getOrDefault(id, true)
             currentState.copy(collapsedMap = newMap.toPersistentMap())
         }
     }

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/commandlist/CommandListScreen.kt

@@ -15,6 +15,7 @@ import androidx.compose.material.ListItem
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -93,7 +94,7 @@ fun CommandListItem(
         modifier = Modifier.clickable(
             onClick = remember(command.id, command.name, onNavigate) {
                 { onNavigate("command?commandId=${command.id}&commandName=${command.name}") }
-            }
+            },
         ),
     )
 }

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/search/SearchUiState.kt

@@ -10,5 +10,5 @@ import kotlinx.collections.immutable.persistentMapOf
 data class SearchUiState(
     val filteredCommands: ImmutableList<Command> = persistentListOf(),
     val filteredBasicGroups: ImmutableList<BasicGroup> = persistentListOf(),
-    val collapsedMap: ImmutableMap<Long, Boolean> = persistentMapOf()
+    val collapsedMap: ImmutableMap<Long, Boolean> = persistentMapOf(),
 )

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/search/SearchViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.linuxcommandlibrary.shared.databaseHelper
 import com.linuxcommandlibrary.shared.sortedSearch
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toPersistentMap
 import kotlinx.coroutines.Dispatchers
@@ -20,8 +21,7 @@ class SearchViewModel : ViewModel() {
     private val _uiState = MutableStateFlow(SearchUiState())
     val uiState = _uiState.asStateFlow()
 
-    fun isGroupCollapsed(id: Long): Boolean =
-        _uiState.value.collapsedMap.getOrDefault(id, false)
+    fun isGroupCollapsed(id: Long): Boolean = _uiState.value.collapsedMap.getOrDefault(id, false)
 
     fun toggleCollapse(id: Long) {
         _uiState.update { currentState ->
@@ -38,7 +38,7 @@ class SearchViewModel : ViewModel() {
             _uiState.update {
                 it.copy(
                     filteredCommands = persistentListOf(),
-                    filteredBasicGroups = persistentListOf()
+                    filteredBasicGroups = persistentListOf(),
                 )
             }
             return
@@ -55,7 +55,7 @@ class SearchViewModel : ViewModel() {
                 _uiState.update { currentState ->
                     currentState.copy(
                         filteredCommands = commands.toImmutableList(),
-                        filteredBasicGroups = basicGroups.toImmutableList()
+                        filteredBasicGroups = basicGroups.toImmutableList(),
                     )
                 }
             } catch (ignore: CancellationException) {

android/src/test/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/basicgroups/BasicGroupsViewModelTest.kt

@@ -4,10 +4,8 @@ import app.cash.turbine.test
 import com.linuxcommandlibrary.shared.databaseHelper
 import databases.BasicGroup
 import io.mockk.every
-import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.unmockkObject
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -43,7 +41,7 @@ class BasicGroupsViewModelTest {
         val categoryId = 1L
         val mockGroups = listOf(
             BasicGroup(1L, "Group 1", categoryId, 0, "icon1"),
-            BasicGroup(2L, "Group 2", categoryId, 0, "icon2")
+            BasicGroup(2L, "Group 2", categoryId, 0, "icon2"),
         )
         every { databaseHelper.getBasicGroupsByQuery(categoryId) } returns mockGroups
 

android/src/test/java/com/inspiredandroid/linuxcommandbibliotheca/ui/screens/search/SearchViewModelTest.kt

@@ -5,12 +5,8 @@ import com.linuxcommandlibrary.shared.databaseHelper
 import databases.BasicGroup
 import databases.Command
 import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.unmockkObject
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
@@ -104,7 +100,6 @@ class SearchViewModelTest {
         assertTrue(latestState.filteredBasicGroups.isEmpty())
     }
 
-
     @Test
     fun `search cancels previous search`() = runTest {
         val searchText1 = "search1"