From 0320897ac1da24bf1038e163024c97451c0d5f79 Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Mon, 30 Oct 2023 15:18:25 +0100 Subject: [PATCH] Rename fused package to application package --- .../{fused => application}/ApplicationApi.kt | 10 +++++----- .../ApplicationApiImpl.kt | 20 +++++++++---------- .../ApplicationInstaller.kt | 4 ++-- .../ApplicationRepository.kt | 10 +++++----- .../data/{fused => application}/UpdatesDao.kt | 4 ++-- .../data/Application.kt | 2 +- .../{fused => application}/data/Category.kt | 2 +- .../data/{fused => application}/data/Home.kt | 2 +- .../{fused => application}/data/Ratings.kt | 2 +- .../utils/CategoryUtils.kt | 2 +- .../data/cleanapk/data/app/Application.kt | 2 +- .../e/apps/data/cleanapk/data/home/Home.kt | 2 +- .../apps/data/cleanapk/data/search/Search.kt | 2 +- .../AppPrivacyInfoRepositoryImpl.kt | 2 +- .../repositories/IAppPrivacyInfoRepository.kt | 2 +- .../repositories/PrivacyScoreRepository.kt | 2 +- .../PrivacyScoreRepositoryImpl.kt | 2 +- .../data/faultyApps/FaultyAppRepository.kt | 2 +- .../e/apps/data/fdroid/FdroidRepository.kt | 2 +- .../e/apps/data/fdroid/IFdroidRepository.kt | 2 +- .../fusedDownload/FusedManagerRepository.kt | 2 +- .../data/playstore/PlayStoreRepository.kt | 2 +- .../data/playstore/PlayStoreRepositoryImpl.kt | 2 +- .../e/apps/data/updates/UpdatesManagerImpl.kt | 6 +++--- .../data/updates/UpdatesManagerRepository.kt | 4 ++-- .../foundation/e/apps/di/RepositoryModule.kt | 4 ++-- .../e/apps/install/pkg/InstallerService.kt | 2 +- .../e/apps/install/pkg/PWAManagerModule.kt | 2 +- .../e/apps/install/pkg/PkgManagerModule.kt | 2 +- .../splitinstall/SplitInstallBinder.kt | 2 +- .../splitinstall/SplitInstallService.kt | 2 +- .../e/apps/install/updates/UpdatesWorker.kt | 2 +- .../workmanager/AppInstallProcessor.kt | 6 +++--- .../e/apps/ui/AppInfoFetchViewModel.kt | 2 +- .../e/apps/ui/AppProgressViewModel.kt | 2 +- .../e/apps/ui/MainActivityViewModel.kt | 4 ++-- .../e/apps/ui/PrivacyInfoViewModel.kt | 2 +- .../ui/application/ApplicationFragment.kt | 2 +- .../ui/application/ApplicationViewModel.kt | 4 ++-- .../ui/applicationlist/ApplicationDiffUtil.kt | 2 +- .../ApplicationListFragment.kt | 4 ++-- .../ApplicationListRVAdapter.kt | 4 ++-- .../ApplicationListViewModel.kt | 4 ++-- .../e/apps/ui/categories/AppsFragment.kt | 2 +- .../apps/ui/categories/CategoriesViewModel.kt | 6 +++--- .../e/apps/ui/categories/GamesFragment.kt | 2 +- .../ui/categories/model/CategoriesDiffUtil.kt | 2 +- .../categories/model/CategoriesRVAdapter.kt | 2 +- .../foundation/e/apps/ui/home/HomeFragment.kt | 6 +++--- .../e/apps/ui/home/HomeViewModel.kt | 6 +++--- .../e/apps/ui/home/model/FusedHomeDiffUtil.kt | 2 +- .../home/model/HomeChildFusedAppDiffUtil.kt | 2 +- .../apps/ui/home/model/HomeChildRVAdapter.kt | 4 ++-- .../apps/ui/home/model/HomeParentRVAdapter.kt | 6 +++--- .../e/apps/ui/search/SearchFragment.kt | 4 ++-- .../e/apps/ui/search/SearchViewModel.kt | 6 +++--- .../e/apps/ui/settings/SettingsFragment.kt | 2 +- .../e/apps/ui/updates/UpdatesFragment.kt | 4 ++-- .../e/apps/ui/updates/UpdatesViewModel.kt | 4 ++-- .../foundation/e/apps/FakePkgManagerModule.kt | 2 +- .../e/apps/UpdateManagerImptTest.kt | 6 +++--- .../AppPrivacyInfoRepositoryImplTest.kt | 2 +- .../exodus/PrivacyScoreRepositoryImplTest.kt | 2 +- .../e/apps/fused/ApplicationApiImplTest.kt | 8 ++++---- .../fused/ApplicationApiRepositoryTest.kt | 4 ++-- .../AppInstallProcessorTest.kt | 2 +- 66 files changed, 116 insertions(+), 116 deletions(-) rename app/src/main/java/foundation/e/apps/data/{fused => application}/ApplicationApi.kt (95%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/ApplicationApiImpl.kt (96%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/ApplicationInstaller.kt (87%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/ApplicationRepository.kt (92%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/UpdatesDao.kt (94%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/data/Application.kt (96%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/data/Category.kt (93%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/data/Home.kt (92%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/data/Ratings.kt (92%) rename app/src/main/java/foundation/e/apps/data/{fused => application}/utils/CategoryUtils.kt (96%) diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApi.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationApi.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationApi.kt rename to app/src/main/java/foundation/e/apps/data/application/ApplicationApi.kt index 713687803..0c821f28d 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApi.kt +++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationApi.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.data.fused +package foundation.e.apps.data.application import androidx.lifecycle.LiveData import com.aurora.gplayapi.SearchSuggestEntry @@ -11,10 +11,10 @@ import foundation.e.apps.data.enums.FilterLevel import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.data.Application -import foundation.e.apps.data.fused.data.Category -import foundation.e.apps.data.fused.data.Home -import foundation.e.apps.data.fused.utils.CategoryType +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.utils.CategoryType import foundation.e.apps.data.fusedDownload.models.FusedDownload import retrofit2.Response diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationApiImpl.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationApiImpl.kt rename to app/src/main/java/foundation/e/apps/data/application/ApplicationApiImpl.kt index 4e6afa0dd..21d36bc31 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationApiImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationApiImpl.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused +package foundation.e.apps.data.application import android.content.Context import android.text.format.Formatter @@ -48,15 +48,15 @@ import foundation.e.apps.data.enums.Source import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.Type import foundation.e.apps.data.enums.isUnFiltered -import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_ANY -import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_OPEN -import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_PWA -import foundation.e.apps.data.fused.data.Application -import foundation.e.apps.data.fused.data.Category -import foundation.e.apps.data.fused.data.Home -import foundation.e.apps.data.fused.data.Ratings -import foundation.e.apps.data.fused.utils.CategoryType -import foundation.e.apps.data.fused.utils.CategoryUtils +import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_ANY +import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_OPEN +import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_PWA +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.data.Ratings +import foundation.e.apps.data.application.utils.CategoryType +import foundation.e.apps.data.application.utils.CategoryUtils import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.data.playstore.PlayStoreRepository import foundation.e.apps.data.handleNetworkResult diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationInstaller.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationInstaller.kt similarity index 87% rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationInstaller.kt rename to app/src/main/java/foundation/e/apps/data/application/ApplicationInstaller.kt index cb3cb1c7e..29b10ee66 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationInstaller.kt +++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationInstaller.kt @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused +package foundation.e.apps.data.application -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application interface ApplicationInstaller { diff --git a/app/src/main/java/foundation/e/apps/data/fused/ApplicationRepository.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/data/fused/ApplicationRepository.kt rename to app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt index 41c037416..e0b876a63 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/ApplicationRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused +package foundation.e.apps.data.application import androidx.lifecycle.LiveData import com.aurora.gplayapi.SearchSuggestEntry @@ -28,10 +28,10 @@ import foundation.e.apps.data.enums.Origin 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.fused.data.Application -import foundation.e.apps.data.fused.data.Category -import foundation.e.apps.data.fused.data.Home -import foundation.e.apps.data.fused.utils.CategoryType +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.utils.CategoryType import foundation.e.apps.data.fusedDownload.models.FusedDownload import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt b/app/src/main/java/foundation/e/apps/data/application/UpdatesDao.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt rename to app/src/main/java/foundation/e/apps/data/application/UpdatesDao.kt index b21cefbc3..e460f1a5d 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt +++ b/app/src/main/java/foundation/e/apps/data/application/UpdatesDao.kt @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused +package foundation.e.apps.data.application -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.models.FusedDownload object UpdatesDao { diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Application.kt b/app/src/main/java/foundation/e/apps/data/application/data/Application.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/data/fused/data/Application.kt rename to app/src/main/java/foundation/e/apps/data/application/data/Application.kt index 48a86c073..d8a544060 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/data/Application.kt +++ b/app/src/main/java/foundation/e/apps/data/application/data/Application.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused.data +package foundation.e.apps.data.application.data import com.aurora.gplayapi.Constants.Restriction import foundation.e.apps.data.enums.FilterLevel diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Category.kt b/app/src/main/java/foundation/e/apps/data/application/data/Category.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/data/fused/data/Category.kt rename to app/src/main/java/foundation/e/apps/data/application/data/Category.kt index 3beb69d40..85d4d5ab2 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/data/Category.kt +++ b/app/src/main/java/foundation/e/apps/data/application/data/Category.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused.data +package foundation.e.apps.data.application.data import foundation.e.apps.data.enums.AppTag import java.util.UUID diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Home.kt b/app/src/main/java/foundation/e/apps/data/application/data/Home.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/data/fused/data/Home.kt rename to app/src/main/java/foundation/e/apps/data/application/data/Home.kt index 8585a07a5..0dbe525f9 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/data/Home.kt +++ b/app/src/main/java/foundation/e/apps/data/application/data/Home.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused.data +package foundation.e.apps.data.application.data data class Home( val title: String = String(), diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt b/app/src/main/java/foundation/e/apps/data/application/data/Ratings.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt rename to app/src/main/java/foundation/e/apps/data/application/data/Ratings.kt index 29f5bc87a..a8db122e7 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt +++ b/app/src/main/java/foundation/e/apps/data/application/data/Ratings.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused.data +package foundation.e.apps.data.application.data data class Ratings( val privacyScore: Double = -1.0, diff --git a/app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt b/app/src/main/java/foundation/e/apps/data/application/utils/CategoryUtils.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt rename to app/src/main/java/foundation/e/apps/data/application/utils/CategoryUtils.kt index 5e31be48b..03960b9e4 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt +++ b/app/src/main/java/foundation/e/apps/data/application/utils/CategoryUtils.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.fused.utils +package foundation.e.apps.data.application.utils import foundation.e.apps.R diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt index f314b03f3..906d9b2d0 100644 --- a/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt @@ -18,7 +18,7 @@ package foundation.e.apps.data.cleanapk.data.app -import foundation.e.apps.data.fused.data.Application as AppLoungeApplication +import foundation.e.apps.data.application.data.Application as AppLoungeApplication data class Application( val app: AppLoungeApplication = AppLoungeApplication(), diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt index 4a0f30cfa..8e50e09c3 100644 --- a/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt @@ -19,7 +19,7 @@ package foundation.e.apps.data.cleanapk.data.home import foundation.e.apps.data.enums.Origin -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application data class Home( val top_updated_apps: List = emptyList(), diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt index c8e37b215..41d0b4362 100644 --- a/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt @@ -18,7 +18,7 @@ package foundation.e.apps.data.cleanapk.data.search -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application data class Search( val apps: List = emptyList(), diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt index 935a040ef..d3ba72548 100644 --- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt @@ -25,7 +25,7 @@ import foundation.e.apps.data.exodus.Report import foundation.e.apps.data.exodus.Tracker import foundation.e.apps.data.exodus.TrackerDao import foundation.e.apps.data.exodus.models.AppPrivacyInfo -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.getResult import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL import foundation.e.apps.utils.getFormattedString diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt index d03f23f12..564512d9d 100644 --- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt @@ -2,7 +2,7 @@ package foundation.e.apps.data.exodus.repositories import foundation.e.apps.data.Result import foundation.e.apps.data.exodus.models.AppPrivacyInfo -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application interface IAppPrivacyInfoRepository { suspend fun getAppPrivacyInfo(application: Application, appHandle: String): Result diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt index 11549bcf8..58b466b74 100644 --- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepository.kt @@ -18,7 +18,7 @@ package foundation.e.apps.data.exodus.repositories -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application interface PrivacyScoreRepository { diff --git a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt index b92c127ea..91d0e3f12 100644 --- a/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt @@ -18,7 +18,7 @@ package foundation.e.apps.data.exodus.repositories -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.di.CommonUtilsModule import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt index ae330067c..337965d66 100644 --- a/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt @@ -21,7 +21,7 @@ package foundation.e.apps.data.faultyApps import foundation.e.apps.OpenForTesting -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt index cc34e1af3..978b36e05 100644 --- a/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt @@ -5,7 +5,7 @@ import foundation.e.apps.data.cleanapk.ApkSignatureManager import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.fdroid.models.BuildInfo import foundation.e.apps.data.fdroid.models.FdroidEntity -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt b/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt index ba6a215f9..51bdaefab 100644 --- a/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt @@ -20,7 +20,7 @@ package foundation.e.apps.data.fdroid import android.content.Context import foundation.e.apps.data.fdroid.models.FdroidEntity -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application interface IFdroidRepository { /** diff --git a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt index 10470199c..5134c117d 100644 --- a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.LiveData import foundation.e.apps.OpenForTesting import foundation.e.apps.data.enums.Status import foundation.e.apps.data.fdroid.FdroidRepository -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.install.workmanager.InstallWorkManager diff --git a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt index 5f82c8e53..50480c04e 100644 --- a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt @@ -24,7 +24,7 @@ import com.aurora.gplayapi.data.models.Category import com.aurora.gplayapi.data.models.File import com.aurora.gplayapi.data.models.SearchBundle import foundation.e.apps.data.StoreRepository -import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.application.utils.CategoryType interface PlayStoreRepository : StoreRepository { suspend fun getSearchResult(query: String, subBundle: MutableSet?): Pair, MutableSet> diff --git a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt index 96c35cf8d..63a467e92 100644 --- a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepositoryImpl.kt @@ -35,7 +35,7 @@ import com.aurora.gplayapi.helpers.SearchHelper import com.aurora.gplayapi.helpers.TopChartsHelper import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.application.utils.CategoryType import foundation.e.apps.data.playstore.utils.GPlayHttpClient import foundation.e.apps.data.login.AuthenticatorRepository import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt index f2c5eb397..5367ffe3d 100644 --- a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt @@ -30,9 +30,9 @@ import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.isUnFiltered import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fdroid.FdroidRepository -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.ApplicationApi.Companion.APP_TYPE_ANY -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.ApplicationApi.Companion.APP_TYPE_ANY +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.preference.PreferenceManagerModule import foundation.e.apps.install.pkg.PkgManagerModule import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt index 0d9aa3d1d..7e030148c 100644 --- a/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt @@ -20,8 +20,8 @@ package foundation.e.apps.data.updates import com.aurora.gplayapi.data.models.AuthData import foundation.e.apps.data.enums.ResultStatus -import foundation.e.apps.data.fused.UpdatesDao -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.UpdatesDao +import foundation.e.apps.data.application.data.Application import javax.inject.Inject class UpdatesManagerRepository @Inject constructor( diff --git a/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt b/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt index 5b95d9485..a09e75eed 100644 --- a/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt +++ b/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt @@ -10,8 +10,8 @@ import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepository import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepositoryImpl import foundation.e.apps.data.fdroid.FdroidRepository import foundation.e.apps.data.fdroid.IFdroidRepository -import foundation.e.apps.data.fused.ApplicationApi -import foundation.e.apps.data.fused.ApplicationApiImpl +import foundation.e.apps.data.application.ApplicationApi +import foundation.e.apps.data.application.ApplicationApiImpl import foundation.e.apps.data.fusedDownload.FusedManagerImpl import foundation.e.apps.data.fusedDownload.IFusedManager import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt index d898c4e7a..eaaafb3e6 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt @@ -24,7 +24,7 @@ import android.content.pm.PackageInstaller import android.os.IBinder import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.faultyApps.FaultyAppRepository -import foundation.e.apps.data.fused.UpdatesDao +import foundation.e.apps.data.application.UpdatesDao import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt index 83d92bb72..f71649f52 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt @@ -13,7 +13,7 @@ import androidx.core.graphics.drawable.IconCompat import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.OpenForTesting import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.FusedDownloadRepository import foundation.e.apps.data.fusedDownload.models.FusedDownload import kotlinx.coroutines.delay diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt index 46a456351..21956d6f6 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt @@ -34,7 +34,7 @@ import foundation.e.apps.OpenForTesting import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.Type -import foundation.e.apps.data.fused.ApplicationApi +import foundation.e.apps.data.application.ApplicationApi import foundation.e.apps.data.fusedDownload.models.FusedDownload import kotlinx.coroutines.DelicateCoroutinesApi import timber.log.Timber diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt index 67224f565..fcd7528b2 100644 --- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt +++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt @@ -23,7 +23,7 @@ import androidx.core.content.pm.PackageInfoCompat import com.aurora.gplayapi.data.models.AuthData import foundation.e.apps.ISplitInstallService import foundation.e.apps.data.DownloadManager -import foundation.e.apps.data.fused.ApplicationRepository +import foundation.e.apps.data.application.ApplicationRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt index a6e30289a..133509242 100644 --- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt +++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt @@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.DownloadManager -import foundation.e.apps.data.fused.ApplicationRepository +import foundation.e.apps.data.application.ApplicationRepository import foundation.e.apps.data.preference.DataStoreModule import foundation.e.splitinstall.ISplitInstallService import foundation.e.splitinstall.SplitInstall diff --git a/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt index 5147c2549..68807788a 100644 --- a/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt @@ -19,7 +19,7 @@ import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.blockedApps.BlockedAppRepository import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.User -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.login.AuthenticatorRepository import foundation.e.apps.data.preference.DataStoreManager import foundation.e.apps.data.updates.UpdatesManagerRepository diff --git a/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt index ece6ec721..3ccd311a6 100644 --- a/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt +++ b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt @@ -26,9 +26,9 @@ import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.Type -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.UpdatesDao -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.UpdatesDao +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.FusedDownloadRepository import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.data.fusedDownload.models.FusedDownload diff --git a/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt index 48840a8a6..a4fd28790 100644 --- a/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt @@ -7,7 +7,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.data.blockedApps.BlockedAppRepository import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fdroid.FdroidRepository -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.playstore.PlayStoreRepository import javax.inject.Inject import javax.inject.Named diff --git a/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt b/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt index 05f0625ea..28ecaa2bd 100644 --- a/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt @@ -20,7 +20,7 @@ package foundation.e.apps.ui import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.install.download.data.DownloadProgressLD diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt index 38fc2b93c..d110ba5c7 100644 --- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt @@ -41,8 +41,8 @@ import foundation.e.apps.data.ecloud.EcloudRepository import foundation.e.apps.data.enums.User import foundation.e.apps.data.enums.isInitialized import foundation.e.apps.data.enums.isUnFiltered -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.data.preference.DataStoreModule diff --git a/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt b/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt index 043112c39..46c07546d 100644 --- a/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt @@ -10,7 +10,7 @@ import foundation.e.apps.data.Result import foundation.e.apps.data.exodus.models.AppPrivacyInfo import foundation.e.apps.data.exodus.repositories.IAppPrivacyInfoRepository import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepository -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt index fa4b56a1c..bacd5077f 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt @@ -53,7 +53,7 @@ import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.User import foundation.e.apps.data.enums.isInitialized -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentApplicationBinding diff --git a/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt index 29c4cc658..c893fb260 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt @@ -27,8 +27,8 @@ import foundation.e.apps.R import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.data.login.AuthObject diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt index 320d9e010..bd887d938 100644 --- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt @@ -18,7 +18,7 @@ package foundation.e.apps.ui.applicationlist import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL class ApplicationDiffUtil : DiffUtil.ItemCallback() { diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt index e840e1182..f1c18aa09 100644 --- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt @@ -33,8 +33,8 @@ import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.ApplicationInstaller -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationInstaller +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentApplicationListBinding diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt index cc51a5c53..f9c0c72ce 100644 --- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt @@ -39,8 +39,8 @@ import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.User -import foundation.e.apps.data.fused.ApplicationInstaller -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationInstaller +import foundation.e.apps.data.application.data.Application import foundation.e.apps.databinding.ApplicationListItemBinding import foundation.e.apps.install.pkg.InstallerService import foundation.e.apps.ui.AppInfoFetchViewModel diff --git a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt index 4cada5c55..bf4272a17 100644 --- a/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt @@ -25,8 +25,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.CleanApkException import foundation.e.apps.data.login.exceptions.GPlayException diff --git a/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt index af0383c0d..fadb8dd12 100644 --- a/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt @@ -26,7 +26,7 @@ import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R -import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.application.utils.CategoryType import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentAppsBinding diff --git a/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt index 4d7a43068..cb777869c 100644 --- a/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt @@ -23,9 +23,9 @@ import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.data.enums.ResultStatus -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.data.Category -import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.data.Category +import foundation.e.apps.data.application.utils.CategoryType import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.CleanApkException import foundation.e.apps.data.login.exceptions.GPlayException diff --git a/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt index 8f8f11fdb..dbbf2ad7a 100644 --- a/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt @@ -26,7 +26,7 @@ import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R -import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.application.utils.CategoryType import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentGamesBinding diff --git a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt index b00228a1d..c2e5e6d56 100644 --- a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt @@ -19,7 +19,7 @@ package foundation.e.apps.ui.categories.model import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.data.fused.data.Category +import foundation.e.apps.data.application.data.Category class CategoriesDiffUtil( private val oldList: List, diff --git a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt index 220b74f8e..3890be7c1 100644 --- a/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt @@ -25,7 +25,7 @@ import androidx.navigation.findNavController import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import coil.load -import foundation.e.apps.data.fused.data.Category +import foundation.e.apps.data.application.data.Category import foundation.e.apps.databinding.CategoriesListItemBinding import foundation.e.apps.ui.categories.CategoriesFragmentDirections diff --git a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt index 7c081c6db..3d0314d99 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt @@ -31,9 +31,9 @@ import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.ApplicationInstaller -import foundation.e.apps.data.fused.data.Application -import foundation.e.apps.data.fused.data.Home +import foundation.e.apps.data.application.ApplicationInstaller +import foundation.e.apps.data.application.data.Application +import foundation.e.apps.data.application.data.Home import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayException import foundation.e.apps.data.login.exceptions.GPlayLoginException diff --git a/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt index d8a6ca4a4..517513c03 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt @@ -24,9 +24,9 @@ import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.data.ResultSupreme -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.data.Application -import foundation.e.apps.data.fused.data.Home +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.data.Application +import foundation.e.apps.data.application.data.Home import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.CleanApkException import foundation.e.apps.data.login.exceptions.GPlayException diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt index 2ca4d87b2..8e05f40ad 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt @@ -18,7 +18,7 @@ package foundation.e.apps.ui.home.model import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.data.fused.data.Home +import foundation.e.apps.data.application.data.Home class FusedHomeDiffUtil : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: Home, newItem: Home): Boolean { diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt index a590c04aa..8f2be23a6 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt @@ -18,7 +18,7 @@ package foundation.e.apps.ui.home.model import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application class HomeChildFusedAppDiffUtil : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: Application, newItem: Application): Boolean { diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt index eaafb99c1..d26563217 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt @@ -36,8 +36,8 @@ import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.User -import foundation.e.apps.data.fused.ApplicationInstaller -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationInstaller +import foundation.e.apps.data.application.data.Application import foundation.e.apps.databinding.HomeChildListItemBinding import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.MainActivityViewModel diff --git a/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt index 41faf14fb..7231e3db3 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt @@ -25,9 +25,9 @@ import androidx.lifecycle.LifecycleOwner import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import foundation.e.apps.data.fused.ApplicationInstaller -import foundation.e.apps.data.fused.data.Application -import foundation.e.apps.data.fused.data.Home +import foundation.e.apps.data.application.ApplicationInstaller +import foundation.e.apps.data.application.data.Application +import foundation.e.apps.data.application.data.Home import foundation.e.apps.databinding.HomeParentListItemBinding import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.MainActivityViewModel diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt index c2debc1ac..4c54fc682 100644 --- a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt @@ -43,8 +43,8 @@ import com.facebook.shimmer.ShimmerFrameLayout import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.ApplicationInstaller -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationInstaller +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt index 41dc94bc8..23186b5b7 100644 --- a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt @@ -26,9 +26,9 @@ import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.SearchBundle import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.data.ResultSupreme -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.GplaySearchResult -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.GplaySearchResult +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.CleanApkException import foundation.e.apps.data.login.exceptions.GPlayException diff --git a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt index d3c507cad..5b54866c6 100644 --- a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt @@ -39,7 +39,7 @@ import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.BuildConfig import foundation.e.apps.R import foundation.e.apps.data.enums.User -import foundation.e.apps.data.fused.UpdatesDao +import foundation.e.apps.data.application.UpdatesDao import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.databinding.CustomPreferenceBinding import foundation.e.apps.install.updates.UpdatesWorkManager diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt index f9d772da4..615da67a6 100644 --- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt @@ -36,8 +36,8 @@ import foundation.e.apps.R import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.ApplicationInstaller -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationInstaller +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.fusedDownload.models.FusedDownload import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.GPlayException diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt index 5b6ed102e..5f0a47a8b 100644 --- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt @@ -25,8 +25,8 @@ import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.exceptions.CleanApkException import foundation.e.apps.data.login.exceptions.GPlayException diff --git a/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt b/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt index 882267e2c..7be3cb29f 100644 --- a/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt +++ b/app/src/test/java/foundation/e/apps/FakePkgManagerModule.kt @@ -20,7 +20,7 @@ package foundation.e.apps import android.content.Context import android.content.pm.ApplicationInfo -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.updates.UpdatesManagerImpl.Companion.PACKAGE_NAME_ANDROID_VENDING import foundation.e.apps.data.updates.UpdatesManagerImpl.Companion.PACKAGE_NAME_F_DROID import foundation.e.apps.install.pkg.PkgManagerModule diff --git a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt index 1fa245f58..d028feafe 100644 --- a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt +++ b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt @@ -27,9 +27,9 @@ import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fdroid.FdroidRepository -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.ApplicationApi -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.ApplicationApi +import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.updates.UpdatesManagerImpl import foundation.e.apps.util.MainCoroutineRule import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt b/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt index 90ffa5bd0..0658e8169 100644 --- a/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt +++ b/app/src/test/java/foundation/e/apps/exodus/AppPrivacyInfoRepositoryImplTest.kt @@ -21,7 +21,7 @@ package foundation.e.apps.exodus import androidx.arch.core.executor.testing.InstantTaskExecutorRule import foundation.e.apps.data.enums.Status import foundation.e.apps.data.exodus.repositories.AppPrivacyInfoRepositoryImpl -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.util.MainCoroutineRule import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest diff --git a/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt b/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt index 82997fb1c..e8b61b401 100644 --- a/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt +++ b/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt @@ -20,7 +20,7 @@ package foundation.e.apps.exodus import foundation.e.apps.data.enums.Status import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepositoryImpl -import foundation.e.apps.data.fused.data.Application +import foundation.e.apps.data.application.data.Application import foundation.e.apps.di.CommonUtilsModule import org.junit.Assert import org.junit.Before diff --git a/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt b/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt index aa58ad778..e636cc92f 100644 --- a/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt +++ b/app/src/test/java/foundation/e/apps/fused/ApplicationApiImplTest.kt @@ -34,10 +34,10 @@ import foundation.e.apps.data.enums.FilterLevel import foundation.e.apps.data.enums.Origin import foundation.e.apps.data.enums.ResultStatus import foundation.e.apps.data.enums.Status -import foundation.e.apps.data.fused.ApplicationApiImpl -import foundation.e.apps.data.fused.data.Application -import foundation.e.apps.data.fused.data.Home -import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.application.ApplicationApiImpl +import foundation.e.apps.data.application.data.Application +import foundation.e.apps.data.application.data.Home +import foundation.e.apps.data.application.utils.CategoryType import foundation.e.apps.data.playstore.PlayStoreRepository import foundation.e.apps.install.pkg.PWAManagerModule import foundation.e.apps.install.pkg.PkgManagerModule diff --git a/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt b/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt index 406c9dd12..bde38b217 100644 --- a/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt +++ b/app/src/test/java/foundation/e/apps/fused/ApplicationApiRepositoryTest.kt @@ -17,8 +17,8 @@ package foundation.e.apps.fused -import foundation.e.apps.data.fused.ApplicationRepository -import foundation.e.apps.data.fused.ApplicationApiImpl +import foundation.e.apps.data.application.ApplicationRepository +import foundation.e.apps.data.application.ApplicationApiImpl import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test diff --git a/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt b/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt index 5741dfe41..3bff045e9 100644 --- a/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt +++ b/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt @@ -23,7 +23,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.aurora.gplayapi.data.models.AuthData import foundation.e.apps.data.enums.Status import foundation.e.apps.data.fdroid.FdroidRepository -import foundation.e.apps.data.fused.ApplicationRepository +import foundation.e.apps.data.application.ApplicationRepository import foundation.e.apps.data.fusedDownload.FusedDownloadRepository import foundation.e.apps.data.fusedDownload.IFusedManager import foundation.e.apps.data.fusedDownload.models.FusedDownload -- GitLab