Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 5bbf7eed authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

feat: implement pagination for CleanAPK search results 

- Replace static list search with Paging 3 implementation for FOSS and PWA tabs
- Add `CleanApkSearchPagingRepository` and `CleanApkSearchPagingSource`
- Update `SearchViewModelV2` to expose paging flows instead of static lists
- Refactor `SearchResultsContent` and `SearchScreen` to use `LazyPagingItems`
- Add support for preserving scroll position across tabs
- Introduce new UI states: `SearchLoading` (shimmer), `SearchErrorState`, and specific `SearchInitialState`
- Update `CleanApkSearchHelper` to support paginated requests with page/limit parameters
parent 93d74105

app/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ dependencies { 
    implementation(libs.navigation.fragment.ktx)

    implementation(libs.navigation.ui.ktx)

    implementation(libs.activity.ktx)

    implementation(libs.paging.runtime.ktx)



    // Material Design

    implementation(libs.material)
@@ -356,6 +357,7 @@ dependencies { 
    implementation libs.activity.compose

    implementation libs.lifecycle.viewmodel.compose

    implementation libs.runtime.livedata

    implementation libs.paging.compose



    // Android Studio Preview support for Compose

    implementation libs.compose.ui.tooling.preview

app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkSearchHelper.kt

+41 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
package foundation.e.apps.data.cleanapk



import foundation.e.apps.data.application.data.Application

import foundation.e.apps.data.cleanapk.data.search.Search

import foundation.e.apps.data.cleanapk.repositories.NUMBER_OF_ITEMS

import foundation.e.apps.data.cleanapk.repositories.NUMBER_OF_PAGES

import foundation.e.apps.data.enums.Source
@@ -35,15 +36,47 @@ class CleanApkSearchHelper @Inject constructor( 
        appType: String

    ): List<Application> {

        return withContext(Dispatchers.IO) {

            val searchResult = cleanApkRetrofit.searchApps(

                keyword,

                appSource,

                appType,

                NUMBER_OF_ITEMS,

                NUMBER_OF_PAGES

            getSearchResultPage(

                keyword = keyword,

                appSource = appSource,

                appType = appType,

                page = NUMBER_OF_PAGES,

                pageSize = NUMBER_OF_ITEMS

            ).apps

        }

    }



    suspend fun getSearchResultPage(

        keyword: String,

        appSource: String,

        appType: String,

        page: Int,

        pageSize: Int

    ): Search {

        return withContext(Dispatchers.IO) {

            val response = cleanApkRetrofit.searchApps(

                keyword = keyword,

                source = appSource,

                type = appType,

                nres = pageSize,

                page = page

            )

            searchResult.body()?.apps.orEmpty()

                .map { it.apply { source = mapSource(it) } }



            if (!response.isSuccessful) {

                throw IllegalStateException("CleanAPK search failed: HTTP ${response.code()}")

            } else {

                val body = response.body()

                if (body == null) {

                    throw IllegalStateException("CleanAPK search failed: empty body")

                } else {

                    if (!body.success) {

                        throw IllegalStateException("CleanAPK search failed: success=false")

                    } else {

                        body.apps.forEach { app -> app.source = mapSource(app) }

                        body

                    }

                }

            }

        }

    }

app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt

+3 −2
Original line number Diff line number Diff line 
/*

 * Apps  Quickly and easily install Android apps onto your device!

 * Copyright (C) 2021  E FOUNDATION

 * Copyright (C) 2021-2025 e Foundation

 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -14,6 +13,7 @@ 
 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <https://www.gnu.org/licenses/>.

 *

 */



package foundation.e.apps.data.cleanapk.data.search
@@ -23,5 +23,6 @@ import foundation.e.apps.data.application.data.Application 
data class Search(

    val apps: List<Application> = emptyList(),

    val numberOfResults: Int = -1,

    val pages: Int = 0,

    val success: Boolean = false

)

app/src/main/java/foundation/e/apps/data/search/CleanApkSearchPagingRepository.kt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
package foundation.e.apps.data.search



import androidx.paging.Pager

import androidx.paging.PagingConfig

import androidx.paging.PagingData

import foundation.e.apps.data.application.data.Application

import foundation.e.apps.data.cleanapk.CleanApkSearchHelper

import kotlinx.coroutines.flow.Flow

import javax.inject.Inject



class CleanApkSearchPagingRepository @Inject constructor(

    private val cleanApkSearchHelper: CleanApkSearchHelper,

) : SearchPagingRepository {



    override fun cleanApkSearch(params: CleanApkSearchParams): Flow<PagingData<Application>> {

        return Pager(

            config = PagingConfig(

                pageSize = params.pageSize,

                enablePlaceholders = false,

                prefetchDistance = 2

            ),

            pagingSourceFactory = {

                CleanApkSearchPagingSource(

                    cleanApkSearchHelper = cleanApkSearchHelper,

                    params = params

                )

            }

        ).flow

    }

}

app/src/main/java/foundation/e/apps/data/search/CleanApkSearchPagingSource.kt

0 → 100644
+53 −0
Original line number Diff line number Diff line 
package foundation.e.apps.data.search



import androidx.paging.PagingSource

import androidx.paging.PagingState

import foundation.e.apps.data.application.data.Application

import foundation.e.apps.data.cleanapk.CleanApkSearchHelper



private const val INITIAL_PAGE = 1



class CleanApkSearchPagingSource(

    private val cleanApkSearchHelper: CleanApkSearchHelper,

    private val params: CleanApkSearchParams,

) : PagingSource<Int, Application>() {



    override fun getRefreshKey(state: PagingState<Int, Application>): Int? {

        val anchor = state.anchorPosition ?: return null

        val anchorPage = state.closestPageToPosition(anchor) ?: return null

        val prev = anchorPage.prevKey

        val next = anchorPage.nextKey

        return when {

            prev != null -> prev + 1

            next != null -> next - 1

            else -> null

        }

    }



    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Application> {

        return try {

            val page = params.key ?: INITIAL_PAGE

            val response = cleanApkSearchHelper.getSearchResultPage(

                keyword = this.params.keyword,

                appSource = this.params.appSource,

                appType = this.params.appType,

                page = page,

                pageSize = this.params.pageSize,

            )



            val totalPages = response.pages

            val data = response.apps



            val nextKey = if (page < totalPages) page + 1 else null

            val prevKey = if (page > INITIAL_PAGE) page - 1 else null



            LoadResult.Page(

                data = data,

                prevKey = prevKey,

                nextKey = nextKey

            )

        } catch (t: Throwable) {

            LoadResult.Error(t)

        }

    }

}