chore: clean up (0efa39bd) · Commits · e / os / App Lounge

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

+149 −151

Original line number	Diff line number	Diff line
		@@ -19,32 +19,30 @@
		package foundation.e.apps.data.application

		import androidx.lifecycle.LiveData
		import com.aurora.gplayapi.SearchSuggestEntry
		import com.aurora.gplayapi.data.models.AuthData
		import com.aurora.gplayapi.data.models.SearchBundle
		import foundation.e.apps.data.ResultSupreme
		import foundation.e.apps.data.application.apps.AppsApi
		import foundation.e.apps.data.application.category.CategoryApi
		import foundation.e.apps.data.enums.FilterLevel
		import foundation.e.apps.data.enums.ResultStatus
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.enums.Status
		import foundation.e.apps.data.application.data.Application
		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.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
		import foundation.e.apps.data.application.search.SearchSuggestion
		import foundation.e.apps.data.application.utils.CategoryType
		import foundation.e.apps.data.enums.FilterLevel
		import foundation.e.apps.data.enums.ResultStatus
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.enums.Status
		import foundation.e.apps.data.install.models.AppInstall
		import javax.inject.Inject
		import javax.inject.Singleton

		@Singleton
		class ApplicationRepository @Inject constructor(
		private val searchRepositoryImpl: SearchRepository,
		private val searchAPIImpl: SearchRepository,
		private val homeApi: HomeApi,
		private val categoryApi: CategoryApi,
		private val appsApi: AppsApi,
		@@ -56,7 +54,7 @@ class ApplicationRepository @Inject constructor(
		}

		fun getSelectedAppTypes(): List<String> {
		return searchRepositoryImpl.getSelectedAppTypes()
		return searchAPIImpl.getSelectedAppTypes()
		}

		suspend fun getApplicationDetails(
		@@ -107,19 +105,19 @@ class ApplicationRepository @Inject constructor(
		}

		suspend fun getSearchSuggestions(query: String): List<SearchSuggestion> {
		return searchRepositoryImpl.getSearchSuggestions(query)
		return searchAPIImpl.getSearchSuggestions(query)
		}

		suspend fun getCleanApkSearchResults(
		query: String
		): SearchResult {
		return searchRepositoryImpl.getCleanApkSearchResults(query)
		return searchAPIImpl.getCleanApkSearchResults(query)
		}

		suspend fun getGplaySearchResults(
		query: String
		): SearchResult {
		return searchRepositoryImpl.getGplaySearchResult(query)
		return searchAPIImpl.getGplaySearchResult(query)
		}

		suspend fun getAppsListBasedOnCategory(

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

+2 −2

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 SearchRepository {
		interface SearchApi {
		companion object {
		const val APP_TYPE_ANY = "any"
		const val APP_TYPE_OPEN = "open"
		@@ -51,5 +51,5 @@ interface SearchRepository {
		query: String,
		): SearchResult

		suspend fun getSearchSuggestions(query: String): List<SearchSuggestion>
		suspend fun getSearchSuggestions(query: String): List<SearchSuggestEntry>
		}

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

+363 −362

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		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
		@@ -27,9 +28,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.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.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.enums.ResultStatus
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.handleNetworkResult
		@@ -40,12 +41,12 @@ import javax.inject.Inject
		import javax.inject.Singleton

		@Singleton
		class SearchRepositoryImpl @Inject constructor(
		class SearchApiImpl @Inject constructor(
		private val appsApi: AppsApi,
		private val appSources: AppSourcesContainer,
		private val stores: Stores,
		private val applicationDataManager: ApplicationDataManager
		) : SearchRepository {
		) : SearchApi {

		@Inject
		@ApplicationContext
		@@ -279,13 +280,13 @@ class SearchRepositoryImpl @Inject constructor(
		return ResultSupreme.create(result.getResultStatus(), application)
		}

		override suspend fun getSearchSuggestions(query: String): List<SearchSuggestion> {
		var searchSuggestions = listOf<SearchSuggestion>()
		override suspend fun getSearchSuggestions(query: String): List<SearchSuggestEntry> {
		var searchSuggesions = listOf<SearchSuggestEntry>()
		handleNetworkResult {
		searchSuggestions = appSources.gplayRepo.getSearchSuggestions(query)
		searchSuggesions = appSources.gplayRepo.getSearchSuggestions(query)
		}

		return searchSuggestions
		return searchSuggesions
		}

		private suspend fun getCleanAPKSearchResults(