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

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

refactor: replace search api references with search repository across codebase

parent d5a73620

app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt

+150 −151
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ import foundation.e.apps.data.application.data.Category 
import foundation.e.apps.data.application.data.Home

import foundation.e.apps.data.application.downloadInfo.DownloadInfoApi

import foundation.e.apps.data.application.home.HomeApi

import foundation.e.apps.data.application.search.GplaySearchResult

import foundation.e.apps.data.application.search.SearchApi

import foundation.e.apps.data.application.search.SearchRepository

import foundation.e.apps.data.application.utils.CategoryType

import foundation.e.apps.data.install.models.AppInstall

import foundation.e.apps.data.application.search.SearchResult
@@ -44,7 +43,7 @@ import javax.inject.Singleton 


@Singleton

class ApplicationRepository @Inject constructor(

    private val searchAPIImpl: SearchApi,

    private val searchRepositoryImpl: SearchRepository,

    private val homeApi: HomeApi,

    private val categoryApi: CategoryApi,

    private val appsApi: AppsApi,
@@ -56,7 +55,7 @@ class ApplicationRepository @Inject constructor( 
    }



    fun getSelectedAppTypes(): List<String> {

        return searchAPIImpl.getSelectedAppTypes()

        return searchRepositoryImpl.getSelectedAppTypes()

    }



    suspend fun getApplicationDetails(
@@ -113,13 +112,13 @@ class ApplicationRepository @Inject constructor( 
    suspend fun getCleanApkSearchResults(

        query: String

    ): SearchResult {

        return searchAPIImpl.getCleanApkSearchResults(query)

        return searchRepositoryImpl.getCleanApkSearchResults(query)

    }



    suspend fun getGplaySearchResults(

        query: String

    ): SearchResult {

        return searchAPIImpl.getGplaySearchResult(query)

        return searchRepositoryImpl.getGplaySearchResult(query)

    }



    suspend fun getAppsListBasedOnCategory(

app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import androidx.lifecycle.liveData 
import foundation.e.apps.data.ResultSupreme

import foundation.e.apps.data.Stores

import foundation.e.apps.data.application.data.Home

import foundation.e.apps.data.application.search.SearchApi

import foundation.e.apps.data.application.search.SearchRepository

import foundation.e.apps.data.enums.ResultStatus

import foundation.e.apps.data.enums.Source

import foundation.e.apps.data.handleNetworkResult
@@ -78,8 +78,8 @@ class HomeApiImpl @Inject constructor( 
        setHomeErrorMessage(result.getResultStatus(), source)

        priorList.sortBy {

            when (it.source) {

                SearchApi.APP_TYPE_OPEN -> AppSourceWeight.OPEN_SOURCE.ordinal

                SearchApi.APP_TYPE_PWA -> AppSourceWeight.PWA.ordinal

                SearchRepository.APP_TYPE_OPEN -> AppSourceWeight.OPEN_SOURCE.ordinal

                SearchRepository.APP_TYPE_PWA -> AppSourceWeight.PWA.ordinal

                else -> AppSourceWeight.GPLAY.ordinal

            }

        }

app/src/main/java/foundation/e/apps/data/application/search/SearchApi.kt→app/src/main/java/foundation/e/apps/data/application/search/SearchRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ typealias GplaySearchResult = ResultSupreme<Pair<List<Application>, Set<SearchBu 


typealias SearchResult = ResultSupreme<Pair<List<Application>, Boolean>>



interface SearchApi {

interface SearchRepository {

    companion object {

        const val APP_TYPE_ANY = "any"

        const val APP_TYPE_OPEN = "open"

app/src/main/java/foundation/e/apps/data/application/search/SearchApiImpl.kt→app/src/main/java/foundation/e/apps/data/application/search/SearchRepositoryImpl.kt

+362 −363
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
package foundation.e.apps.data.application.search



import android.content.Context

import com.aurora.gplayapi.SearchSuggestEntry

import com.aurora.gplayapi.data.models.SearchBundle

import dagger.hilt.android.qualifiers.ApplicationContext

import foundation.e.apps.data.AppSourcesContainer
@@ -28,9 +27,9 @@ import foundation.e.apps.data.Stores 
import foundation.e.apps.data.application.ApplicationDataManager

import foundation.e.apps.data.application.apps.AppsApi

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

import foundation.e.apps.data.application.search.SearchApi.Companion.APP_TYPE_ANY

import foundation.e.apps.data.application.search.SearchApi.Companion.APP_TYPE_OPEN

import foundation.e.apps.data.application.search.SearchApi.Companion.APP_TYPE_PWA

import foundation.e.apps.data.application.search.SearchRepository.Companion.APP_TYPE_ANY

import foundation.e.apps.data.application.search.SearchRepository.Companion.APP_TYPE_OPEN

import foundation.e.apps.data.application.search.SearchRepository.Companion.APP_TYPE_PWA

import foundation.e.apps.data.enums.ResultStatus

import foundation.e.apps.data.enums.Source

import foundation.e.apps.data.handleNetworkResult
@@ -41,12 +40,12 @@ import javax.inject.Inject 
import javax.inject.Singleton



@Singleton

class SearchApiImpl @Inject constructor(

class SearchRepositoryImpl @Inject constructor(

    private val appsApi: AppsApi,

    private val appSources: AppSourcesContainer,

    private val stores: Stores,

    private val applicationDataManager: ApplicationDataManager

) : SearchApi {

) : SearchRepository {



    @Inject

    @ApplicationContext

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

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ package foundation.e.apps.data.cleanapk.repositories 


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

import foundation.e.apps.data.application.data.Home

import foundation.e.apps.data.application.search.SearchApi

import foundation.e.apps.data.application.search.SearchRepository

import foundation.e.apps.data.application.search.SearchSuggestion

import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher

import foundation.e.apps.data.cleanapk.CleanApkRetrofit

import foundation.e.apps.data.cleanapk.data.categories.Categories
@@ -51,7 +52,7 @@ class CleanApkAppsRepository @Inject constructor( 


        listHome.forEach { (title, apps) ->

            apps.forEach { app -> app.source = Source.OPEN_SOURCE }

            list.add(Home(title, apps, SearchApi.APP_TYPE_OPEN))

            list.add(Home(title, apps, SearchRepository.APP_TYPE_OPEN))

        }



        return list