Merge pull request #591 from namehillsoftware/bugfix/file-details-from-search-screen

[Bugfix] Viewing File Details from Search Screen

Author: davidvedvick

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ annotation = "1.9.1"
 assertjCore = "3.27.6"
 commonsCodec = "1.19.0"
 commonsIo = "2.20.0"
-compose = "1.9.3"
+compose = "1.9.4"
 coreKtx = "1.17.0"
 desugar_jdk_libs = "2.1.5"
 gson = "2.13.2"
@@ -18,7 +18,7 @@ junit = "4.13.2"
 junitJupiterApi = "6.0.0"
 junitKtx = "1.3.0"
 kotlinxCoroutinesRx3 = "1.10.2"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 lazyJ = "0.11.0"
 lifecycle = "2.9.4"
 logbackAndroid = "3.0.0"

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/items/list/ItemListView.kt

@@ -414,8 +414,8 @@ fun ItemListMenu(
 			enabled = isFileControlsEnabled
 		)
 
-		LabelledActiveDownloadsButton(
-			loadedLibraryState = itemListViewModel,
+		LabelledSearchButton(
+			itemListViewModel = itemListViewModel,
 			applicationNavigation = applicationNavigation,
 			modifier = modifier,
 		)
@@ -426,8 +426,8 @@ fun ItemListMenu(
 			modifier = modifier,
 		)
 
-		LabelledSearchButton(
-			itemListViewModel = itemListViewModel,
+		LabelledActiveDownloadsButton(
+			loadedLibraryState = itemListViewModel,
 			applicationNavigation = applicationNavigation,
 			modifier = modifier,
 		)

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/navigation/DestinationGraphNavigation.kt

@@ -71,6 +71,10 @@ class DestinationGraphNavigation(
 		navController.navigate(LibraryScreen(libraryId))
 	}.toPromise()
 
+	override fun viewFileDetails(libraryId: LibraryId, searchQuery: String, positionedFile: PositionedFile) = coroutineScope.launch {
+		navController.navigate(SearchedFileDetailsScreen(libraryId, searchQuery, positionedFile))
+	}.toPromise()
+
 	override fun viewFileDetails(libraryId: LibraryId, item: IItem?, positionedFile: PositionedFile) = coroutineScope.launch {
 		navController.navigate(BrowsedFileDetailsScreen(libraryId, item, positionedFile))
 	}.toPromise()

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/connection/session/initialization/LibrarySelectionNavigation.kt

@@ -36,6 +36,9 @@ class LibrarySelectionNavigation(
 	override fun search(libraryId: LibraryId, filePropertyFilter: FileProperty): Promise<Unit> =
 		selectConnection(libraryId) { inner.search(libraryId, filePropertyFilter) }
 
+	override fun viewFileDetails(libraryId: LibraryId, searchQuery: String, positionedFile: PositionedFile): Promise<Unit> =
+		selectConnection(libraryId) { inner.viewFileDetails(libraryId, searchQuery, positionedFile) }
+
 	override fun viewFileDetails(libraryId: LibraryId, item: IItem?, positionedFile: PositionedFile): Promise<Unit> =
 		selectConnection(libraryId) { inner.viewFileDetails(libraryId, item, positionedFile) }