Skip to content

Commit 9796248

Browse files
MohitMaliDeveloperMohitMaliDeveloper
committed
Introduced similarly spelled suggestions results.
1 parent 44d7b53 commit 9796248

File tree

9 files changed

+165
-12
lines changed

9 files changed

+165
-12
lines changed

‎core/src/main/java/org/kiwix/kiwixmobile/core/main/reader/CoreReaderFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@ abstract class CoreReaderFragment :
18951895

18961896
private fun openSearch(searchString: String?, isOpenedFromTabView: Boolean, isVoice: Boolean) {
18971897
searchString?.let {
1898-
(requireActivity() as CoreMainActivity).openSearch(
1898+
(activity as? CoreMainActivity)?.openSearch(
18991899
it,
19001900
isOpenedFromTabView,
19011901
isVoice

‎core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchFragment.kt‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ class SearchFragment : BaseFragment() {
102102
onLoadMore = { loadMoreSearchResult() },
103103
onKeyboardSubmitButtonClick = {
104104
getSearchListItemForQuery(it)?.let(::onItemClick)
105-
}
105+
},
106+
suggestedSpelledWord = null,
107+
onSuggestedItemClick = { onSuggestedItemClick(it) }
106108
)
107109
)
108110

@@ -247,6 +249,11 @@ class SearchFragment : BaseFragment() {
247249
searchViewModel.searchResults(searchText)
248250
}
249251

252+
private fun onSuggestedItemClick(suggestedText: String) {
253+
searchScreenState.update { copy(suggestedSpelledWord = null) }
254+
onSearchValueChanged(suggestedText)
255+
}
256+
250257
private fun actionMenuItems() = listOfNotNull(
251258
// Check if the `FIND_IN_PAGE` is visible or not.
252259
// If visible then show it in menu.
@@ -304,7 +311,18 @@ class SearchFragment : BaseFragment() {
304311
"Error in getting searched result\nOriginal exception ${ignore.message}"
305312
)
306313
} finally {
307-
searchScreenState.update { copy(isLoading = false) }
314+
val onlyRecentSearches =
315+
searchScreenState.value.searchList.all { it is SearchListItem.RecentSearchListItem }
316+
searchScreenState.update {
317+
copy(
318+
isLoading = false,
319+
suggestedSpelledWord = if (onlyRecentSearches && searchScreenState.value.searchText.isNotEmpty()) {
320+
"Demo"
321+
} else {
322+
null
323+
}
324+
)
325+
}
308326
}
309327
}
310328
}

‎core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchScreen.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ fun SearchScreen(
9999
onValueChange = searchScreenState.onSearchViewValueChange,
100100
onClearClick = searchScreenState.onSearchViewClearClick,
101101
modifier = Modifier,
102-
onKeyboardSubmitButtonClick = searchScreenState.onKeyboardSubmitButtonClick
102+
onKeyboardSubmitButtonClick = searchScreenState.onKeyboardSubmitButtonClick,
103+
suggestionText = searchScreenState.suggestedSpelledWord,
104+
onSuggestedWordClick = searchScreenState.onSuggestedItemClick
103105
)
104106
}
105107
)

‎core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchScreenState.kt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,14 @@ data class SearchScreenState(
6868
/**
6969
* Manages the navigationIcon shown in the toolbar.
7070
*/
71-
val navigationIcon: @Composable() () -> Unit
71+
val navigationIcon: @Composable() () -> Unit,
72+
/**
73+
* Manages the showing of suggested word provided by the libkiwix if no search
74+
* result found for typed value.
75+
*/
76+
val suggestedSpelledWord: String?,
77+
/**
78+
* Manages the click of suggested item by the libkiwix.
79+
*/
80+
val onSuggestedItemClick: (String) -> Unit
7281
)

‎core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchState.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ data class SearchState(
3838
startIndex: Int,
3939
job: Job? = null,
4040
ioDispatcher: CoroutineDispatcher = Dispatchers.IO
41-
): List<SearchListItem.RecentSearchListItem>? {
41+
): List<SearchListItem>? {
4242
if (searchTerm.isEmpty()) return recentResults
4343
return searchResultsWithTerm.searchMutex.withLock {
4444
searchResultsWithTerm.suggestionSearch?.let {
@@ -57,8 +57,8 @@ data class SearchState(
5757
suggestionSearch: SuggestionSearch,
5858
startIndex: Int,
5959
job: Job?
60-
): List<SearchListItem.RecentSearchListItem>? {
61-
val results = mutableListOf<SearchListItem.RecentSearchListItem>()
60+
): List<SearchListItem.ZimSearchResultListItem>? {
61+
val results = mutableListOf<SearchListItem.ZimSearchResultListItem>()
6262

6363
// if the previous job is cancel then do not execute the code
6464
if (job?.isActive == false) return results
@@ -73,7 +73,7 @@ data class SearchState(
7373
if (job?.isActive == false) break
7474
yield()
7575
val entry = searchIterator.next()
76-
results.add(SearchListItem.RecentSearchListItem(entry.title, entry.path))
76+
results.add(SearchListItem.ZimSearchResultListItem(entry.title, entry.path))
7777
}
7878
}.onFailure {
7979
Log.e(

‎core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class SearchViewModel @Inject constructor(
233233
suspend fun loadMoreSearchResults(
234234
startIndex: Int,
235235
existingSearchList: List<SearchListItem>?
236-
): List<SearchListItem.RecentSearchListItem>? {
236+
): List<SearchListItem>? {
237237
val searchResults = state.value.getVisibleResults(startIndex)
238238

239239
return searchResults?.filter { newItem ->

‎core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixSearchView.kt‎

Lines changed: 123 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@
1818

1919
package org.kiwix.kiwixmobile.core.ui.components
2020

21+
import androidx.compose.foundation.background
22+
import androidx.compose.foundation.clickable
2123
import androidx.compose.foundation.isSystemInDarkTheme
24+
import androidx.compose.foundation.layout.Column
25+
import androidx.compose.foundation.layout.Row
26+
import androidx.compose.foundation.layout.fillMaxWidth
27+
import androidx.compose.foundation.layout.heightIn
28+
import androidx.compose.foundation.layout.padding
2229
import androidx.compose.foundation.text.KeyboardActions
2330
import androidx.compose.foundation.text.KeyboardOptions
2431
import androidx.compose.material3.Icon
@@ -29,20 +36,40 @@ import androidx.compose.material3.TextField
2936
import androidx.compose.material3.TextFieldDefaults
3037
import androidx.compose.material3.minimumInteractiveComponentSize
3138
import androidx.compose.runtime.Composable
39+
import androidx.compose.runtime.MutableState
3240
import androidx.compose.runtime.SideEffect
41+
import androidx.compose.runtime.mutableStateOf
42+
import androidx.compose.runtime.remember
43+
import androidx.compose.ui.Alignment
3344
import androidx.compose.ui.Modifier
3445
import androidx.compose.ui.focus.FocusRequester
3546
import androidx.compose.ui.focus.focusRequester
47+
import androidx.compose.ui.geometry.Rect
3648
import androidx.compose.ui.graphics.Color
49+
import androidx.compose.ui.layout.onGloballyPositioned
50+
import androidx.compose.ui.layout.positionInRoot
3751
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
3852
import androidx.compose.ui.platform.testTag
3953
import androidx.compose.ui.res.painterResource
4054
import androidx.compose.ui.res.stringResource
55+
import androidx.compose.ui.text.AnnotatedString
56+
import androidx.compose.ui.text.SpanStyle
4157
import androidx.compose.ui.text.TextStyle
58+
import androidx.compose.ui.text.buildAnnotatedString
59+
import androidx.compose.ui.text.font.FontWeight
4260
import androidx.compose.ui.text.input.ImeAction
4361
import androidx.compose.ui.text.style.TextOverflow.Companion.Ellipsis
62+
import androidx.compose.ui.text.withStyle
63+
import androidx.compose.ui.unit.IntOffset
64+
import androidx.compose.ui.unit.toSize
65+
import androidx.compose.ui.window.Popup
4466
import org.kiwix.kiwixmobile.core.R
67+
import org.kiwix.kiwixmobile.core.downloader.downloadManager.ZERO
4568
import org.kiwix.kiwixmobile.core.utils.ComposeDimens
69+
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.EIGHT_DP
70+
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.MINIMUM_HEIGHT_OF_SEARCH_ITEM
71+
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SEARCH_ITEM_TEXT_SIZE
72+
import kotlin.math.roundToInt
4673

4774
@Composable
4875
fun KiwixSearchView(
@@ -51,9 +78,94 @@ fun KiwixSearchView(
5178
placeholder: String = stringResource(R.string.search_label),
5279
searchViewTextFiledTestTag: String = "",
5380
clearButtonTestTag: String = "",
81+
suggestionText: String? = null,
82+
onSuggestedWordClick: (String) -> Unit = {},
5483
onValueChange: (String) -> Unit,
5584
onClearClick: () -> Unit,
5685
onKeyboardSubmitButtonClick: (String) -> Unit = {}
86+
) {
87+
val textFieldBounds = remember { mutableStateOf(Rect.Zero) }
88+
Column {
89+
SearchViewTextFiled(
90+
modifier,
91+
searchViewTextFiledTestTag,
92+
value,
93+
placeholder,
94+
onValueChange,
95+
onClearClick,
96+
clearButtonTestTag,
97+
onKeyboardSubmitButtonClick,
98+
textFieldBounds
99+
)
100+
ShowCorrectWordSuggestion(suggestionText, onSuggestedWordClick, textFieldBounds)
101+
}
102+
}
103+
104+
@Composable
105+
private fun ShowCorrectWordSuggestion(
106+
suggestionText: String?,
107+
onSuggestedWordClick: (String) -> Unit,
108+
textFieldBounds: MutableState<Rect>
109+
) {
110+
if (suggestionText.isNullOrBlank()) return
111+
Popup(
112+
alignment = Alignment.TopStart,
113+
offset = IntOffset(
114+
x = textFieldBounds.value.left.roundToInt(),
115+
y = textFieldBounds.value.bottom.roundToInt()
116+
)
117+
) {
118+
Row(
119+
modifier = Modifier
120+
.fillMaxWidth()
121+
.heightIn(min = MINIMUM_HEIGHT_OF_SEARCH_ITEM)
122+
.background(MaterialTheme.colorScheme.background)
123+
.clickable { onSuggestedWordClick(suggestionText) },
124+
verticalAlignment = Alignment.CenterVertically
125+
) {
126+
Text(
127+
text = getSuggestedHighlightedText(suggestionText),
128+
modifier = Modifier
129+
.padding(horizontal = EIGHT_DP)
130+
.weight(1f),
131+
fontSize = SEARCH_ITEM_TEXT_SIZE
132+
)
133+
Icon(
134+
painter = painterResource(id = R.drawable.ic_open_in_new_24dp),
135+
contentDescription = stringResource(id = R.string.suggested_search_icon_description),
136+
modifier = Modifier.padding(horizontal = EIGHT_DP)
137+
)
138+
}
139+
}
140+
}
141+
142+
@Composable
143+
private fun getSuggestedHighlightedText(suggestionText: String): AnnotatedString {
144+
val rawString = stringResource(R.string.suggest_search_text)
145+
val parts = rawString.split("%s")
146+
val before = parts.getOrNull(ZERO).orEmpty()
147+
val after = parts.getOrNull(ONE).orEmpty()
148+
return buildAnnotatedString {
149+
append(before)
150+
withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
151+
append(suggestionText)
152+
}
153+
append(after)
154+
}
155+
}
156+
157+
@Suppress("LongParameterList", "LongMethod")
158+
@Composable
159+
private fun SearchViewTextFiled(
160+
modifier: Modifier,
161+
searchViewTextFiledTestTag: String,
162+
value: String,
163+
placeholder: String,
164+
onValueChange: (String) -> Unit,
165+
onClearClick: () -> Unit,
166+
clearButtonTestTag: String,
167+
onKeyboardSubmitButtonClick: (String) -> Unit,
168+
textFieldBounds: MutableState<Rect>
57169
) {
58170
val hintColor = if (isSystemInDarkTheme()) {
59171
Color.LightGray
@@ -75,7 +187,17 @@ fun KiwixSearchView(
75187
modifier = modifier
76188
.testTag(searchViewTextFiledTestTag)
77189
.minimumInteractiveComponentSize()
78-
.focusRequester(focusRequester),
190+
.focusRequester(focusRequester)
191+
.onGloballyPositioned { coordinates ->
192+
val position = coordinates.positionInRoot()
193+
val size = coordinates.size.toSize()
194+
textFieldBounds.value = Rect(
195+
position.x,
196+
position.y,
197+
position.x + size.width,
198+
position.y + size.height
199+
)
200+
},
79201
singleLine = true,
80202
value = value,
81203
placeholder = {

‎core/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,8 @@
412412
<string name="downloading_state">Downloading</string>
413413
<string name="download_failed_state">Failed</string>
414414
<string name="searchview_description_clear">Clear query</string>
415+
<string name="suggest_search_text">Do you mean %s?</string>
416+
<string name="suggested_search_icon_description">Tap to use this suggestion and automatically correct your search</string>
415417
<string name="file_system_scan_dialog_title">Scan storage for books?</string>
416418
<string name="file_system_scan_dialog_message">Kiwix will scan your device storage and list the available books here.</string>
417419
</resources>

‎custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class CustomReaderFragment : CoreReaderFragment() {
403403
appSettingsLaunched = false
404404
isWebViewHistoryRestoring = true
405405
coreReaderLifeCycleScope?.launch {
406-
if (zimReaderContainer?.zimFileReader == null) {
406+
if (zimReaderContainer?.zimFileReader == null || zimReaderContainer?.zimReaderSource?.exists() == false) {
407407
openObbOrZim(true)
408408
} else {
409409
manageExternalLaunchAndRestoringViewState()

0 commit comments

Comments
 (0)