Skip to content

Commit 882a1d2

Browse files
authored
Merge pull request #504 from kdroidFilter/feat/search-results-cards
feat(search): group results into book cards with stable scrollbars
2 parents 40f5a30 + f458a07 commit 882a1d2

4 files changed

Lines changed: 569 additions & 148 deletions

File tree

SeforimApp/src/commonMain/composeResources/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,8 @@
484484
<string name="search_load_more">טען תוצאות נוספות</string>
485485
<string name="search_result_count">נמצאו %1$d/%2$d תוצאות</string>
486486
<string name="search_result_count_complete">נמצאו %1$d תוצאות</string>
487+
<string name="search_more_in_book">עוד %1$d תוצאות בספר זה</string>
488+
<string name="search_collapse">הסתר</string>
487489
<string name="search_stop">בטל חיפוש</string>
488490
<string name="search_near_selector_label">קרבה</string>
489491
<string name="search_extended_label">חיפוש מורחב (כל הספרים)</string>

SeforimApp/src/jvmMain/kotlin/io/github/kdroidfilter/seforimapp/core/presentation/tabs/TabsContent.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ private fun SearchTabContent(
362362
val selectedTocIds by viewModel.selectedTocIdsFlow.collectAsState()
363363
val tocCounts by viewModel.tocCountsFlow.collectAsState()
364364
val tocTree by viewModel.tocTreeFlow.collectAsState()
365+
val bookCounts by viewModel.bookFacetCountsFlow.collectAsState()
365366

366367
val actions =
367368
remember(viewModel) {
@@ -422,6 +423,8 @@ private fun SearchTabContent(
422423
selectedTocIds = selectedTocIds,
423424
tocCounts = tocCounts,
424425
tocTree = tocTree,
426+
bookCounts = bookCounts,
427+
loadBookHits = viewModel::loadAllHitsForBook,
425428
actions = actions,
426429
)
427430
}

0 commit comments

Comments
 (0)