Migrated SearchFragment -> Search Composable by atharvyadav22 · Pull Request #4703 · kiwix/kiwix-android

atharvyadav22 · 2026-02-18T15:11:29Z

Fixes: #4616 - Migrated Search Fragment to Pure Composable with basic test functionality.

Fixes: #4662 - Search keyword travel was broke due to Fragment lifecycle error and intent action issue.
It now works Within app and also outside the app

Fixes #4722

WhatsApp.Video.2026-02-18.at.9.09.27.PM.1.mp4

Fixes: #4702 - Voice to Search was broken due to Regression and Fragment changes.

WhatsApp.Video.2026-02-18.at.9.09.27.PM.mp4

Fixes: #4722 - Fixed Keyboard not closing when back button press on search screen.

WhatsApp.Video.2026-02-26.at.9.51.05.PM.mp4

atharvyadav22 · 2026-02-18T15:13:50Z

@MohitMaliFtechiz @gouri-panda
For this commit please review only the code files and provide feedback for the changes. Later i'll add Test cases.
Sorry for the delay caused as this migration was little big and keeping every logic was difficult.
Also i have deleted my earlier PR as it was bit messy Apologies for it.

MohitMaliFtechiz

What is this SEARCH text here? It is making the UI very odd. If you are talking about the voice feature of search. It should not be like this. There should be a mic icon instead of this text. It's confusing the user here.

The second issue is when we open any item in the reader by clicking the searched item. Then again, open the searchScreen, that item is not showing(in the previous code that shows). But, if I searched for anything and removed the query from searchBox then those items show that we have opened in a previous search.

app/src/main/java/org/kiwix/kiwixmobile/ui/KiwixNavGraph.kt

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

core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.kt

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

core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchContainer.kt

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

MohitMaliFtechiz · 2026-02-23T08:01:39Z

@atharvyadav22 Please rebase this PR as well with the review changes.

atharvyadav22 · 2026-02-23T08:11:19Z

@atharvyadav22 Please rebase this PR as well with the review changes.

I'll also add that test coverage here should i reference this PR? or only work for migration and create new issue for it.

MohitMaliFtechiz · 2026-02-23T09:28:58Z

@atharvyadav22 One ticket/PR per thing. First we should atleast achive the existing fucntionality and than we should add testing. Migration is a different thing, and code coverage is different. Doing both together can introduce regressions here.

MohitMaliFtechiz · 2026-02-23T11:53:09Z

@atharvyadav22 Mark all your PRs along with this one, as draft, on which work is currently in progress.

atharvyadav22 · 2026-02-26T16:13:35Z

@MohitMaliFtechiz @kelson42
Done with all the changes

Could you verify if there are any more functionalities other than these? as we have seen migration have caused us an trouble with many functionality.

Debounce search
Search suggestions
Recent search
Voice search
Find in page
Pagination
Kiwix Search Feature
Delete dialogs, Toasts

atharvyadav22 · 2026-02-26T16:14:06Z

@MohitMaliFtechiz we have Fragment Tests too what do with them now ?

codecov · 2026-02-26T17:01:51Z

Codecov Report

❌ Patch coverage is 69.76744% with 78 lines in your changes missing coverage. Please review.
✅ Project coverage is 60.63%. Comparing base (0298e5f) to head (6069634).

Files with missing lines	Patch %	Lines
...wixmobile/core/search/viewmodel/SearchViewModel.kt	67.28%	23 Missing and 12 partials ⚠️
...kiwix/kiwixmobile/core/search/SearchScreenRoute.kt	72.09%	7 Missing and 5 partials ⚠️
.../org/kiwix/kiwixmobile/core/search/SearchScreen.kt	66.66%	5 Missing and 2 partials ⚠️
.../kiwixmobile/core/ui/components/KiwixSearchView.kt	86.53%	2 Missing and 5 partials ⚠️
...kiwixmobile/core/main/reader/CoreReaderFragment.kt	20.00%	3 Missing and 1 partial ⚠️
...ile/core/search/viewmodel/SearchResultGenerator.kt	66.66%	0 Missing and 2 partials ⚠️
.../search/viewmodel/effects/ProcessActivityResult.kt	0.00%	2 Missing ⚠️
...search/viewmodel/effects/ShowDeleteSearchDialog.kt	0.00%	2 Missing ⚠️
.../core/search/viewmodel/effects/StartSpeechInput.kt	0.00%	2 Missing ⚠️
...ain/java/org/kiwix/kiwixmobile/ui/KiwixNavGraph.kt	87.50%	1 Missing ⚠️
... and 4 more

❌ Your patch check has failed because the patch coverage (69.76%) is below the target coverage (70.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #4703      +/-   ##
============================================
+ Coverage     60.62%   60.63%   +0.01%     
+ Complexity     1667     1635      -32     
============================================
  Files           333      333              
  Lines         16037    15987      -50     
  Branches       2224     2228       +4     
============================================
- Hits           9722     9694      -28     
+ Misses         4843     4816      -27     
- Partials       1472     1477       +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

MohitMaliFtechiz · 2026-02-27T06:57:08Z

@MohitMaliFtechiz we have Fragment Tests too what do with them now ?

They are not for testing the fragment. They are for testing the functionality of that screen. We should rename the test cases, as now we have composables, not fragments.

MohitMaliFtechiz · 2026-02-27T07:03:50Z

@MohitMaliFtechiz @kelson42 Done with all the changes

Could you verify if there are any more functionalities other than these? as we have seen migration have caused us an trouble with many functionality.

Debounce search

Search suggestions

Recent search

Voice search

Find in page

Pagination

Kiwix Search Feature

Delete dialogs, Toasts

There is one more functionality where we can directly search from browsers as well via the Search Kiwix option menu.

atharvyadav22 · 2026-02-27T07:53:51Z

Yes i have already covered that too mentioned it in description as it was also an Issue it now works for both within and and outside the app

atharvyadav22 · 2026-02-27T07:55:20Z

@MohitMaliFtechiz we have Fragment Tests too what do with them now ?

They are not for testing the fragment. They are for testing the functionality of that screen. We should rename the test cases, as now we have composables, not fragments.

Okay now it should be aligned with SearchScreenRoutes right? so should i raise an another PR for it as you said tests are different
Or should i continue with other migration then after migrations these cases like we can reference in coverage PR

MohitMaliFtechiz · 2026-02-27T09:23:58Z

@atharvyadav22 Renaming the test cases should happen here. Since we are migrating to composables, related to that should be improved here.

atharvyadav22 · 2026-02-28T16:11:00Z

@atharvyadav22 Renaming the test cases should happen here. Since we are migrating to composables, related to that should be improved here.

I thought we should add tests too got confused.

MohitMaliFtechiz · 2026-03-02T07:06:53Z

I thought we should add tests too got confused.

@atharvyadav22 If you have found something that needs to be improved in testing for the current migration screen. Then you can add test cases for that in your current PR. @harshsomankar123-tech did this in his PRs. You can take reference from his PRs. But no unrelated changes should be made in PRs.

MohitMaliFtechiz · 2026-03-05T09:29:47Z

@atharvyadav22 Thank you for making the changes. I will review this shortly :)

MohitMaliFtechiz

@atharvyadav22, I don't understand why we are always changing the UI behaviour when this PR is just for removing the fragment and migrating it to pure composables.

Here FIND_IN_PAGE option is not visible when there is no word typed. We already have a ticket for this #1782. But this type of UI change made the review harder(needs more testing/caring, and they have no effect. It only takes a long time to merge any PR).

core/src/main/java/org/kiwix/kiwixmobile/core/search/SearchScreenRoute.kt

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

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

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

atharvyadav22 · 2026-03-12T16:27:36Z

@MohitMaliFtechiz
I know you would ask about changing To BasicTextField but for dragging cursor it is the only solution as officially by Android purely compose issue.
Only fix available on the internet is https://stackoverflow.com/questions/79482530/compose-basictextfield-drag-cursor-text-doesnt-scroll

Also i found one more issue about that cursor going back to start position on recomposition so i have fixed that too.

Hope i could solve all the reviews please have a look about the changes.
Thanks.

atharvyadav22 · 2026-03-27T13:09:01Z

Once finalize ill mark this for review

MohitMaliFtechiz · 2026-03-27T13:42:14Z

@atharvyadav22 Thank you for the update. I will have a look at this one.

Also #4782 please take a look on this as this Stabilize our CI for that dispatcher module i spent 6 hours debugging broken CI 🥲. it would definately speed our migration.

Sure, thank you for debugging and fixing that :).

atharvyadav22 · 2026-03-30T07:44:47Z

@MohitMaliFtechiz done with these alongside there was an Coroutine Dispatcher issue done that was affecting test.
also removed that boilerplate code for test flow and used kotlin recommended pattern.

Ci failing for emulator issue

MohitMaliFtechiz

@atharvyadav22 There are still some test are failing.

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

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

core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchStateTest.kt

core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt

atharvyadav22 · 2026-04-05T17:26:51Z

@MohitMaliFtechiz
Done with the changes.

MohitMaliFtechiz

@atharvyadav22 The unit coverage is never completed. It is stuck on the ZimSearchResultGeneratorTest.

Use this version of the test it will pass.

internal class ZimSearchResultGeneratorTest {
  @RegisterExtension
  private val mainDispatcherRule = MainDispatcherRule()
  private val zimFileReader: ZimFileReader = mockk()

  private val zimSearchResultGenerator: ZimSearchResultGenerator =
    ZimSearchResultGenerator(mainDispatcherRule.dispatcher)

  @Test
  internal fun `empty search term returns empty list`() = runTest {
    assertThat(zimSearchResultGenerator.generateSearchResults("", zimFileReader))
      .isEqualTo(null)
  }

  @Test
  internal fun `suggestion results are distinct`() = runTest {
    val searchTerm = "a"
    val suggestionSearchWrapper: SuggestionSearchWrapper = mockk()
    every { zimFileReader.searchSuggestions(searchTerm) } returns suggestionSearchWrapper
    assertThat(zimSearchResultGenerator.generateSearchResults(searchTerm, zimFileReader))
      .isEqualTo(suggestionSearchWrapper)
    verify {
      zimFileReader.searchSuggestions(searchTerm)
    }
  }
}

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

core/src/test/java/org/kiwix/kiwixmobile/core/settings/viewmodel/CoreSettingsViewModelTest.kt

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

MohitMaliFtechiz · 2026-04-06T09:59:24Z

core/src/main/java/org/kiwix/kiwixmobile/core/utils/effects/CloseKeyboard.kt

+import org.kiwix.kiwixmobile.core.base.SideEffect
+import org.kiwix.kiwixmobile.core.extensions.closeKeyboard
+
+object CloseKeyboard : SideEffect<Unit> {


We should add a test case for this as well. Like we have added the test cases for side effects.

Why do we not test this sideEffect separately? As I have said, we should test this side effect like we are testing other side effects.

An example of what I was asking is SaveSearchToRecents and SaveSearchToRecentsTest. You should take a reference from there.

I saw your test. But what your test is doing. When the CloseKeyboard action is triggered. It calls the CloseKeyboard side effect, and that's it. What about the CloseKeyboard side-effect functionality? We are not verifying its functionality. Like we are doing for SaveSearchToRecents. That's why i have given you the reference of that side-effect.

Okay i got your point you are saying i should make New file for This CloseKeyboard right? just like SaveSearchToRecentsTest
Also any more side effects i should add?

Okay i got your point you are saying i should make New file for This CloseKeyboard right?

Yes. It could be CloseKeyboardTest.

Also any more side effects i should add?

Which side effects are used in this search functionality, check them. I guess most of the tests are already written; if not, add for that. Do not include the test for other side-effects which are not related to this functionality(not used in SearchViewModel).

Okay i checked that there are two cases for null and one for focus that closeKeyBoard uses View scope so ill mock that

core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt

MohitMaliFtechiz · 2026-04-06T10:06:45Z

core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt

+        cancelAndIgnoreRemainingEvents()
+      }
+    }
+


We have not tested the main click functionality, such as onItemClick, onItemLongClick, and onNewTabIconClick. These are the major UI functionalities; please test them.

They were already covered in inner class ActionMapper

It is ActionMapping. How do you think testing the OnItemClick sideEffect also test the same when the user clicks in the UI? the sideEffect only tests the action, which triggers after the onItemClick performs its operation, like closing the keyboard and sending the OnItemClick action. We should test both onItemClick and onItemLongClick methods.

See #4703 (comment)

Okie, Actually the function naming function was earlier written code so made no changes i got your point i didn't read that function properly i thought it does the work I'll surely change.

Okie, Actually the function naming function was earlier written code so made no changes

That was written because at that time, click functionalities were inside the fragment, not inside the viewModel. But now we have moved it to the viewModel, so it should be tested properly.

core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt

atharvyadav22 · 2026-04-14T04:15:11Z

@MohitMaliFtechiz
Done with the changes

MohitMaliFtechiz

@atharvyadav22 The commit message should be clean.

MohitMaliFtechiz · 2026-04-14T08:48:16Z

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

+
+  fun onItemLongClick(it: SearchListItem) {
+    closeKeyboard()
+    actions.tryEmit(Action.OnItemLongClick(it))


The OnItemLongClick and OnOpenInNewTabClick can be directly used without Action. Using Action here is redundant; we should remove it.

Yes Strange windows didnt showed this

MohitMaliFtechiz · 2026-04-14T09:02:48Z

core/src/main/java/org/kiwix/kiwixmobile/core/utils/effects/CloseKeyboard.kt

+import org.kiwix.kiwixmobile.core.base.SideEffect
+import org.kiwix.kiwixmobile.core.extensions.closeKeyboard
+
+object CloseKeyboard : SideEffect<Unit> {


Why do we not test this sideEffect separately? As I have said, we should test this side effect like we are testing other side effects.

An example of what I was asking is SaveSearchToRecents and SaveSearchToRecentsTest. You should take a reference from there.

MohitMaliFtechiz · 2026-04-14T09:03:56Z

core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt

    fun `OnItemClick offers Saves and Opens`() =
      runTest {
        val searchListItem = RecentSearchListItem("", "")
        actionResultsInEffects(


It is the ActionMapping class. How do you think testing the effects also tests the UI clicks functionality? There are some logics that are missing to test. Like when onItemClick is performed from UI, it closes the keyboard and emits the OnItemClick click action. The ActionMapping class is testing after that functionality.

MohitMaliFtechiz · 2026-04-14T09:16:17Z

core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt

+        cancelAndIgnoreRemainingEvents()
+      }
+    }
+


It is ActionMapping. How do you think testing the OnItemClick sideEffect also test the same when the user clicks in the UI? the sideEffect only tests the action, which triggers after the onItemClick performs its operation, like closing the keyboard and sending the OnItemClick action. We should test both onItemClick and onItemLongClick methods.

… lifecycle

…` via DI and enhancing the `generateSearchResults` method. * Replaced `Channel` with `MutableSharedFlow` for actions and effects, as it is lifecycle-aware and more Compose-friendly. Refactored related code and test cases accordingly. * Consolidated multiple `StateFlows` into a single UI state to simplify state management and improve maintainability. * Fixed: Loading icon was not showing when searching for results. * Fixed an issue where the loading indicator was not displayed during search. * Fixed a regression where search results were not returned from libkiwix when the search term contained spaces. * Fixed an issue where "load more" was triggered indefinitely even when no additional results were available in the ZIM file for the given search term.

* Fixed an issue where frequent typing/removal triggered multiple unnecessary calls to libkiwix. This now follows the same behavior as the Fragment implementation, using Flow operators that automatically cancel previous running jobs. * Fixed an issue where loadMore was executed on the UI coroutine scope, which could lead to lifecycle and cancellation problems. Introduced a LoadMoreResults action so the ViewModel handles pagination safely. * Improved the loadMore logic for better reliability and consistency. * Added a CloseKeyboard side effect to allow the ViewModel to control keyboard dismissal without additional UI handling. * Removed SearchScreenState. The UI now directly observes uiState from the ViewModel and only sends actions, making the architecture cleaner and more maintainable. * Fixed minor issues and edge cases.

Added Cases for Keyboard and changed requested review comments

atharvyadav22 · 2026-04-14T19:09:12Z

@MohitMaliFtechiz
Done with the changes.

MohitMaliFtechiz self-requested a review February 19, 2026 10:36

MohitMaliFtechiz requested changes Feb 20, 2026

View reviewed changes

atharvyadav22 marked this pull request as draft February 23, 2026 12:13

MohitMaliFtechiz mentioned this pull request Feb 26, 2026

Keyboard remains visible after back navigation from search screen in Reader's. #4722

Open

atharvyadav22 force-pushed the migrate/search branch from 235968a to 08177e5 Compare February 26, 2026 16:06

atharvyadav22 requested a review from MohitMaliFtechiz February 26, 2026 16:14

atharvyadav22 marked this pull request as ready for review February 26, 2026 16:29

atharvyadav22 mentioned this pull request Mar 1, 2026

move search in page to page options button #4731

Open

atharvyadav22 force-pushed the migrate/search branch from f4c42ee to 9c8bb31 Compare March 3, 2026 07:45

atharvyadav22 mentioned this pull request Mar 3, 2026

CI Failure For ZimManageViewModelTest #4737

Closed

MohitMaliFtechiz mentioned this pull request Mar 5, 2026

Notification activation should not block downloads #4743

Open

MohitMaliFtechiz requested changes Mar 6, 2026

View reviewed changes

atharvyadav22 marked this pull request as draft March 9, 2026 07:08

atharvyadav22 marked this pull request as ready for review March 30, 2026 11:41

MohitMaliFtechiz requested changes Apr 1, 2026

View reviewed changes

atharvyadav22 force-pushed the migrate/search branch from 5a00913 to 6285a15 Compare April 5, 2026 10:30

atharvyadav22 requested a review from MohitMaliFtechiz April 5, 2026 17:29

MohitMaliFtechiz requested changes Apr 6, 2026

View reviewed changes

atharvyadav22 force-pushed the migrate/search branch from dbf6508 to 55c3d2e Compare April 12, 2026 11:39

atharvyadav22 requested a review from MohitMaliFtechiz April 13, 2026 05:54

MohitMaliFtechiz requested changes Apr 14, 2026

View reviewed changes

atharvyadav22 and others added 14 commits April 14, 2026 17:30

Migrated SearchFragment -> Search Composable

efaf7b6

Fixed Known issues and fixed searchViewModel test

0610123

Renaming the test cases

1107269

Handled Launched effect and Dispsable effect keys properly aligned to…

75377a9

… lifecycle

Fixed Test Cursor Drag Issue and Minor Coroutine Changes

fcda5f1

Fixed: Search Kiwix was not working within the app.

955f799

Added Test Cases For Search

729ac6e

Removed Unused function

abbdeae

Use MainDispatcher Rule and Fix FIND IN PAGE issue

2c15576

Replaced Chanel with MutableSharedFlow

f594a81

Added Test cases for LoadMore in inner class

f50eb2f

Added Cases for Keyboard and changed requested review comments

Added Test Cases for UIClickEvents and CloseKeyboard

6069634

atharvyadav22 force-pushed the migrate/search branch from 55c3d2e to 6069634 Compare April 14, 2026 12:01

atharvyadav22 requested a review from MohitMaliFtechiz April 14, 2026 19:09

Uh oh!

Conversation

atharvyadav22 commented Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

atharvyadav22 commented Feb 18, 2026

Uh oh!

MohitMaliFtechiz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MohitMaliFtechiz commented Feb 23, 2026

Uh oh!

atharvyadav22 commented Feb 23, 2026

Uh oh!

MohitMaliFtechiz commented Feb 23, 2026

Uh oh!

MohitMaliFtechiz commented Feb 23, 2026

Uh oh!

atharvyadav22 commented Feb 26, 2026

Uh oh!

atharvyadav22 commented Feb 26, 2026

Uh oh!

codecov bot commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

MohitMaliFtechiz commented Feb 27, 2026

Uh oh!

MohitMaliFtechiz commented Feb 27, 2026

Uh oh!

atharvyadav22 commented Feb 27, 2026

Uh oh!

atharvyadav22 commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MohitMaliFtechiz commented Feb 27, 2026

Uh oh!

atharvyadav22 commented Feb 28, 2026

Uh oh!

MohitMaliFtechiz commented Mar 2, 2026

Uh oh!

MohitMaliFtechiz commented Mar 5, 2026

Uh oh!

MohitMaliFtechiz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

atharvyadav22 commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

atharvyadav22 commented Mar 27, 2026

Uh oh!

MohitMaliFtechiz commented Mar 27, 2026

Uh oh!

atharvyadav22 commented Mar 30, 2026

Uh oh!

MohitMaliFtechiz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

atharvyadav22 commented Feb 18, 2026 •

edited

Loading

codecov bot commented Feb 26, 2026 •

edited

Loading

atharvyadav22 commented Feb 27, 2026 •

edited

Loading

atharvyadav22 commented Mar 12, 2026 •

edited

Loading

MohitMaliFtechiz left a comment •

edited

Loading

MohitMaliFtechiz Apr 14, 2026 •

edited

Loading