From bce564959e74b4d96cfd83ac93f12a2a31dc4879 Mon Sep 17 00:00:00 2001 From: jacquargia Date: Fri, 6 Mar 2026 09:37:47 +0100 Subject: [PATCH] refac:4025: Move Status entity to domain.install package. --- .../components/SearchResultsContentTest.kt | 2 +- .../foundation/e/apps/AppLoungeApplication.kt | 2 +- .../application/ApplicationDataManager.kt | 2 +- .../data/application/ApplicationRepository.kt | 2 +- .../e/apps/data/application/apps/AppsApi.kt | 2 +- .../apps/data/application/apps/AppsApiImpl.kt | 2 +- .../apps/data/application/data/Application.kt | 2 +- .../foundation/e/apps/data/enums/Status.kt | 42 ------------------- .../gitlab/SystemAppsUpdatesRepository.kt | 2 +- .../e/apps/data/install/AppManager.kt | 2 +- .../e/apps/data/install/AppManagerImpl.kt | 2 +- .../e/apps/data/install/AppManagerWrapper.kt | 2 +- .../install/download/DownloadManagerUtils.kt | 2 +- .../e/apps/data/install/models/AppInstall.kt | 2 +- .../install/pkg/AppLoungePackageManager.kt | 2 +- .../e/apps/data/install/pkg/PkgManagerBR.kt | 2 +- .../e/apps/data/install/pkg/PwaManager.kt | 2 +- .../receiver/PwaPlayerStatusReceiver.kt | 2 +- .../workmanager/AppInstallProcessor.kt | 2 +- .../receivers/DumpAppInstallStatusReceiver.kt | 2 +- .../e/apps/data/updates/UpdatesManagerImpl.kt | 2 +- .../domain/application/ApplicationDomain.kt | 2 +- .../e/apps/domain/install/Status.kt | 24 +++++++++++ .../ui/application/ApplicationFragment.kt | 2 +- .../ui/application/ApplicationViewModel.kt | 2 +- .../ApplicationListFragment.kt | 2 +- .../ApplicationListRVAdapter.kt | 2 +- .../ui/compose/state/InstallButtonState.kt | 2 +- .../compose/state/InstallButtonStateInput.kt | 2 +- .../compose/state/InstallButtonStateMapper.kt | 2 +- .../foundation/e/apps/ui/home/HomeFragment.kt | 2 +- .../apps/ui/home/model/HomeChildRVAdapter.kt | 2 +- .../e/apps/ui/search/SearchFragment.kt | 2 +- .../e/apps/ui/search/v2/SearchFragmentV2.kt | 2 +- .../e/apps/ui/search/v2/SearchViewModelV2.kt | 2 +- .../e/apps/ui/updates/UpdatesFragment.kt | 2 +- .../e/apps/ui/updates/UpdatesViewModel.kt | 2 +- .../e/apps/ui/utils/MaterialButtonUtils.kt | 2 +- .../e/apps/UpdateManagerImptTest.kt | 2 +- .../foundation/e/apps/apps/AppsApiTest.kt | 2 +- .../application/ApplicationDataManagerTest.kt | 2 +- .../ApplicationRepositoryHomeTest.kt | 2 +- .../mapper/ApplicationDomainMapperTest.kt | 2 +- .../install/AppManagerWrapperProgressTest.kt | 2 +- .../data/install/models/AppInstallTest.kt | 2 +- .../pkg/AppLoungePackageManagerTest.kt | 2 +- .../data/install/updates/UpdatesWorkerTest.kt | 2 +- .../domain/ValidateAppAgeLimitUseCaseTest.kt | 2 +- .../exodus/PrivacyScoreRepositoryImplTest.kt | 2 +- .../e/apps/fused/SearchRepositoryImplTest.kt | 2 +- .../fusedManager/AppManagerWrapperTest.kt | 2 +- .../e/apps/fusedManager/FakeAppManager.kt | 2 +- .../e/apps/home/HomeViewModelTest.kt | 2 +- .../AppInstallProcessorTest.kt | 2 +- .../installProcessor/FakeAppInstallDAO.kt | 2 +- .../installProcessor/FakeAppManagerWrapper.kt | 2 +- .../state/InstallButtonStateMapperTest.kt | 2 +- .../state/InstallStatusReconcilerTest.kt | 2 +- .../ui/search/v2/SearchViewModelV2Test.kt | 2 +- 59 files changed, 81 insertions(+), 99 deletions(-) delete mode 100644 app/src/main/java/foundation/e/apps/data/enums/Status.kt create mode 100644 app/src/main/java/foundation/e/apps/domain/install/Status.kt diff --git a/app/src/androidTest/java/foundation/e/apps/ui/compose/components/SearchResultsContentTest.kt b/app/src/androidTest/java/foundation/e/apps/ui/compose/components/SearchResultsContentTest.kt index 5362d4036..515770b5c 100644 --- a/app/src/androidTest/java/foundation/e/apps/ui/compose/components/SearchResultsContentTest.kt +++ b/app/src/androidTest/java/foundation/e/apps/ui/compose/components/SearchResultsContentTest.kt @@ -47,7 +47,7 @@ import foundation.e.apps.R import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.application.data.Ratings import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.compose.state.ButtonLabel import foundation.e.apps.ui.compose.state.InstallButtonAction import foundation.e.apps.ui.compose.state.InstallButtonState diff --git a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt index 98b7056d4..f91bbcc7f 100644 --- a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt +++ b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt @@ -29,7 +29,6 @@ import dagger.hilt.android.HiltAndroidApp import foundation.e.apps.data.Constants.TAG_APP_INSTALL_STATE import foundation.e.apps.data.Constants.TAG_AUTHDATA_DUMP import foundation.e.apps.data.di.qualifiers.IoCoroutineScope -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.AppInstallDAO import foundation.e.apps.data.install.pkg.AppLoungePackageManager import foundation.e.apps.data.install.pkg.PkgManagerBR @@ -38,6 +37,7 @@ import foundation.e.apps.data.install.workmanager.InstallWorkManager import foundation.e.apps.data.preference.AppLoungeDataStore import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.data.system.CustomUncaughtExceptionHandler +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.setup.tos.TOS_VERSION import foundation.e.lib.telemetry.Telemetry import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt index 8dbdf763d..e1bcbba95 100644 --- a/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt +++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt @@ -24,9 +24,9 @@ import foundation.e.apps.data.application.data.Home import foundation.e.apps.data.application.utils.AppVisibilityResolver import foundation.e.apps.data.enums.FilterLevel import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.pkg.AppLoungePackageManager import foundation.e.apps.data.install.pkg.PwaManager +import foundation.e.apps.domain.install.Status import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt b/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt index 96ebe5f78..bc02d0f9e 100644 --- a/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt @@ -32,9 +32,9 @@ 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.handleNetworkResult import foundation.e.apps.data.install.models.AppInstall +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/data/application/apps/AppsApi.kt b/app/src/main/java/foundation/e/apps/data/application/apps/AppsApi.kt index 6505821ff..4153ceab0 100644 --- a/app/src/main/java/foundation/e/apps/data/application/apps/AppsApi.kt +++ b/app/src/main/java/foundation/e/apps/data/application/apps/AppsApi.kt @@ -22,7 +22,7 @@ import foundation.e.apps.data.application.data.Application 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.domain.install.Status interface AppsApi { diff --git a/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt index 2be57a1cc..63e51197a 100644 --- a/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/application/apps/AppsApiImpl.kt @@ -24,10 +24,10 @@ import foundation.e.apps.data.application.data.Application 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.enums.isUnFiltered import foundation.e.apps.data.handleNetworkResult import foundation.e.apps.data.playstore.PlayStoreRepository +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.applicationlist.ApplicationDiffUtil import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/data/application/data/Application.kt b/app/src/main/java/foundation/e/apps/data/application/data/Application.kt index df1330645..1d67694c9 100644 --- a/app/src/main/java/foundation/e/apps/data/application/data/Application.kt +++ b/app/src/main/java/foundation/e/apps/data/application/data/Application.kt @@ -26,10 +26,10 @@ import com.google.gson.annotations.SerializedName import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.enums.FilterLevel 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.Type.NATIVE import foundation.e.apps.data.enums.Type.PWA +import foundation.e.apps.domain.install.Status data class Application( val _id: String = String(), diff --git a/app/src/main/java/foundation/e/apps/data/enums/Status.kt b/app/src/main/java/foundation/e/apps/data/enums/Status.kt deleted file mode 100644 index 0e4406298..000000000 --- a/app/src/main/java/foundation/e/apps/data/enums/Status.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright ECORP SAS 2022 - * Apps Quickly and easily install Android apps onto your device! - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package foundation.e.apps.data.enums - -enum class Status { - INSTALLED, - UPDATABLE, - INSTALLING, - DOWNLOADING, - DOWNLOADED, - UNAVAILABLE, - QUEUED, - BLOCKED, - INSTALLATION_ISSUE, - AWAITING, - PURCHASE_NEEDED; - - companion object { - val downloadStatuses = setOf( - QUEUED, - AWAITING, - DOWNLOADING, - DOWNLOADED - ) - } -} diff --git a/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt b/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt index 20d757c79..9b621bf16 100644 --- a/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt @@ -24,7 +24,6 @@ import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.application.ApplicationDataManager import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.gitlab.UpdatableSystemAppsApi.EndPoint import foundation.e.apps.data.gitlab.models.OsReleaseType import foundation.e.apps.data.gitlab.models.SystemAppInfo @@ -33,6 +32,7 @@ import foundation.e.apps.data.gitlab.models.toApplication import foundation.e.apps.data.handleNetworkResult import foundation.e.apps.data.install.pkg.AppLoungePackageManager import foundation.e.apps.data.system.SystemInfoProvider +import foundation.e.apps.domain.install.Status import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/install/AppManager.kt b/app/src/main/java/foundation/e/apps/data/install/AppManager.kt index 2b7a6fa86..0d2649971 100644 --- a/app/src/main/java/foundation/e/apps/data/install/AppManager.kt +++ b/app/src/main/java/foundation/e/apps/data/install/AppManager.kt @@ -19,8 +19,8 @@ package foundation.e.apps.data.install import androidx.lifecycle.LiveData -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.models.AppInstall +import foundation.e.apps.domain.install.Status import java.io.File interface AppManager { diff --git a/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt index 803c36e3b..d49783eac 100644 --- a/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/install/AppManagerImpl.kt @@ -28,7 +28,6 @@ import androidx.core.net.toUri import androidx.lifecycle.LiveData import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.Type import foundation.e.apps.data.install.download.data.DownloadProgressLD import foundation.e.apps.data.install.models.AppInstall @@ -37,6 +36,7 @@ import foundation.e.apps.data.install.pkg.PwaManager import foundation.e.apps.data.parentalcontrol.ContentRatingDao import foundation.e.apps.data.parentalcontrol.ContentRatingEntity import foundation.e.apps.data.preference.AppLoungePreference +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt b/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt index 54b801429..dc9f40dc1 100644 --- a/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt +++ b/app/src/main/java/foundation/e/apps/data/install/AppManagerWrapper.kt @@ -23,11 +23,11 @@ import androidx.lifecycle.LiveData import foundation.e.apps.OpenForTesting import foundation.e.apps.data.Constants.MIN_VALID_RATING import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.fdroid.FDroidRepository import foundation.e.apps.data.install.download.data.DownloadProgress import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.install.workmanager.InstallWorkManager +import foundation.e.apps.domain.install.Status import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/install/download/DownloadManagerUtils.kt b/app/src/main/java/foundation/e/apps/data/install/download/DownloadManagerUtils.kt index be7358f41..d0eb1b901 100644 --- a/app/src/main/java/foundation/e/apps/data/install/download/DownloadManagerUtils.kt +++ b/app/src/main/java/foundation/e/apps/data/install/download/DownloadManagerUtils.kt @@ -24,12 +24,12 @@ import foundation.e.apps.R import foundation.e.apps.data.DownloadManager import foundation.e.apps.data.di.qualifiers.IoCoroutineScope import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.event.AppEvent import foundation.e.apps.data.event.EventBus import foundation.e.apps.data.install.AppManagerWrapper import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.install.notification.StorageNotificationManager +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.delay diff --git a/app/src/main/java/foundation/e/apps/data/install/models/AppInstall.kt b/app/src/main/java/foundation/e/apps/data/install/models/AppInstall.kt index 01c5828a7..68b1a3310 100644 --- a/app/src/main/java/foundation/e/apps/data/install/models/AppInstall.kt +++ b/app/src/main/java/foundation/e/apps/data/install/models/AppInstall.kt @@ -7,8 +7,8 @@ import com.aurora.gplayapi.data.models.ContentRating import com.aurora.gplayapi.data.models.PlayFile import foundation.e.apps.data.cleanapk.CleanApkRetrofit 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.domain.install.Status @Entity(tableName = "FusedDownload") data class AppInstall( diff --git a/app/src/main/java/foundation/e/apps/data/install/pkg/AppLoungePackageManager.kt b/app/src/main/java/foundation/e/apps/data/install/pkg/AppLoungePackageManager.kt index ba909b51d..cc34b5d2e 100644 --- a/app/src/main/java/foundation/e/apps/data/install/pkg/AppLoungePackageManager.kt +++ b/app/src/main/java/foundation/e/apps/data/install/pkg/AppLoungePackageManager.kt @@ -33,9 +33,9 @@ import androidx.core.content.pm.PackageInfoCompat import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.OpenForTesting 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.install.models.AppInstall +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.DelicateCoroutinesApi import timber.log.Timber import java.io.File diff --git a/app/src/main/java/foundation/e/apps/data/install/pkg/PkgManagerBR.kt b/app/src/main/java/foundation/e/apps/data/install/pkg/PkgManagerBR.kt index 8c85381fd..5a83fe5a1 100644 --- a/app/src/main/java/foundation/e/apps/data/install/pkg/PkgManagerBR.kt +++ b/app/src/main/java/foundation/e/apps/data/install/pkg/PkgManagerBR.kt @@ -24,9 +24,9 @@ import android.content.Intent import android.content.pm.PackageInstaller import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.di.qualifiers.IoCoroutineScope -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.install.AppManagerWrapper +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/src/main/java/foundation/e/apps/data/install/pkg/PwaManager.kt b/app/src/main/java/foundation/e/apps/data/install/pkg/PwaManager.kt index af585c792..33abda10b 100644 --- a/app/src/main/java/foundation/e/apps/data/install/pkg/PwaManager.kt +++ b/app/src/main/java/foundation/e/apps/data/install/pkg/PwaManager.kt @@ -14,9 +14,9 @@ import androidx.core.net.toUri import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.OpenForTesting import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.AppInstallRepository import foundation.e.apps.data.install.models.AppInstall +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.delay import timber.log.Timber import java.io.ByteArrayOutputStream diff --git a/app/src/main/java/foundation/e/apps/data/install/receiver/PwaPlayerStatusReceiver.kt b/app/src/main/java/foundation/e/apps/data/install/receiver/PwaPlayerStatusReceiver.kt index a453de0ad..efb7f6877 100644 --- a/app/src/main/java/foundation/e/apps/data/install/receiver/PwaPlayerStatusReceiver.kt +++ b/app/src/main/java/foundation/e/apps/data/install/receiver/PwaPlayerStatusReceiver.kt @@ -22,8 +22,8 @@ import android.content.Context import android.content.Intent import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.di.qualifiers.IoCoroutineScope -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.AppInstallRepository +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/src/main/java/foundation/e/apps/data/install/workmanager/AppInstallProcessor.kt b/app/src/main/java/foundation/e/apps/data/install/workmanager/AppInstallProcessor.kt index 0e968c35b..31b125af4 100644 --- a/app/src/main/java/foundation/e/apps/data/install/workmanager/AppInstallProcessor.kt +++ b/app/src/main/java/foundation/e/apps/data/install/workmanager/AppInstallProcessor.kt @@ -29,7 +29,6 @@ import foundation.e.apps.data.application.UpdatesDao import foundation.e.apps.data.application.data.Application 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.enums.Type import foundation.e.apps.data.enums.User import foundation.e.apps.data.event.AppEvent @@ -47,6 +46,7 @@ import foundation.e.apps.data.system.StorageComputer import foundation.e.apps.data.system.isNetworkAvailable import foundation.e.apps.data.utils.getFormattedString import foundation.e.apps.domain.ValidateAppAgeLimitUseCase +import foundation.e.apps.domain.install.Status import foundation.e.apps.domain.model.ContentRatingValidity import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.DelicateCoroutinesApi diff --git a/app/src/main/java/foundation/e/apps/data/receivers/DumpAppInstallStatusReceiver.kt b/app/src/main/java/foundation/e/apps/data/receivers/DumpAppInstallStatusReceiver.kt index fec38c309..282d22e5a 100644 --- a/app/src/main/java/foundation/e/apps/data/receivers/DumpAppInstallStatusReceiver.kt +++ b/app/src/main/java/foundation/e/apps/data/receivers/DumpAppInstallStatusReceiver.kt @@ -28,11 +28,11 @@ import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.Constants import foundation.e.apps.data.DownloadManager -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.AppInstallRepository import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.system.NetworkStatusManager import foundation.e.apps.data.system.StorageComputer +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch import timber.log.Timber 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 17fe245b4..07996081e 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 @@ -27,7 +27,6 @@ import foundation.e.apps.data.blockedApps.BlockedAppRepository import foundation.e.apps.data.cleanapk.ApkSignatureManager 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.enums.isUnFiltered import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fdroid.FDroidRepository @@ -35,6 +34,7 @@ import foundation.e.apps.data.gitlab.SystemAppsUpdatesRepository import foundation.e.apps.data.handleNetworkResult import foundation.e.apps.data.install.pkg.AppLoungePackageManager import foundation.e.apps.data.preference.AppLoungePreference +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/app/src/main/java/foundation/e/apps/domain/application/ApplicationDomain.kt b/app/src/main/java/foundation/e/apps/domain/application/ApplicationDomain.kt index 0bea64fb4..8b324cf11 100644 --- a/app/src/main/java/foundation/e/apps/domain/application/ApplicationDomain.kt +++ b/app/src/main/java/foundation/e/apps/domain/application/ApplicationDomain.kt @@ -23,8 +23,8 @@ import com.aurora.gplayapi.data.models.ContentRating import foundation.e.apps.data.application.data.Ratings import foundation.e.apps.data.enums.FilterLevel 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.domain.install.Status data class ApplicationDomain( val id: String = String(), diff --git a/app/src/main/java/foundation/e/apps/domain/install/Status.kt b/app/src/main/java/foundation/e/apps/domain/install/Status.kt new file mode 100644 index 000000000..140195584 --- /dev/null +++ b/app/src/main/java/foundation/e/apps/domain/install/Status.kt @@ -0,0 +1,24 @@ +package foundation.e.apps.domain.install + +enum class Status { + INSTALLED, + UPDATABLE, + INSTALLING, + DOWNLOADING, + DOWNLOADED, + UNAVAILABLE, + QUEUED, + BLOCKED, + INSTALLATION_ISSUE, + AWAITING, + PURCHASE_NEEDED; + + companion object { + val downloadStatuses = setOf( + QUEUED, + AWAITING, + DOWNLOADING, + DOWNLOADED + ) + } +} 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 0f1606afa..beba528e1 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 @@ -55,7 +55,6 @@ import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.application.data.shareUri 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.enums.User import foundation.e.apps.data.enums.isInitialized import foundation.e.apps.data.exodus.ExodusUriGenerator @@ -68,6 +67,7 @@ import foundation.e.apps.data.login.state.LoginState import foundation.e.apps.data.utils.isValid import foundation.e.apps.databinding.FragmentApplicationBinding import foundation.e.apps.domain.ValidateAppAgeLimitUseCase.Companion.KEY_ANTI_FEATURES_NSFW +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.MainActivity import foundation.e.apps.ui.MainActivityViewModel 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 d656f87c2..91a6b65ee 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 @@ -30,7 +30,6 @@ import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.application.data.shareUri 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.event.AppEvent import foundation.e.apps.data.event.EventBus import foundation.e.apps.data.install.AppManagerWrapper @@ -40,6 +39,7 @@ import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.login.core.AuthObject import foundation.e.apps.data.parentalcontrol.fdroid.FDroidAntiFeatureRepository import foundation.e.apps.data.playstore.PlayStoreRepository +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.application.ShareButtonVisibilityState.Hidden import foundation.e.apps.ui.application.ShareButtonVisibilityState.Visible import foundation.e.apps.ui.parentFragment.LoadingViewModel 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 d59988a29..43233f43b 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 @@ -34,13 +34,13 @@ import foundation.e.apps.R import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.application.ApplicationInstaller import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.download.data.DownloadProgress import foundation.e.apps.data.install.pkg.AppLoungePackageManager import foundation.e.apps.data.install.pkg.PwaManager import foundation.e.apps.data.login.core.AuthObject import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentApplicationListBinding +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel 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 a803cc483..d7d4de7c3 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 @@ -43,11 +43,11 @@ import foundation.e.apps.R import foundation.e.apps.data.application.ApplicationInstaller import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.User import foundation.e.apps.data.install.pkg.InstallerService import foundation.e.apps.data.login.state.LoginState import foundation.e.apps.databinding.ApplicationListItemBinding +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.ui.PrivacyInfoViewModel diff --git a/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonState.kt b/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonState.kt index ebb456ae5..9276ea0e1 100644 --- a/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonState.kt +++ b/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonState.kt @@ -19,7 +19,7 @@ package foundation.e.apps.ui.compose.state import androidx.annotation.StringRes -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status /* * Central UI contract for the primary action button in search results. diff --git a/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateInput.kt b/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateInput.kt index 4c4f4727d..5868506be 100644 --- a/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateInput.kt +++ b/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateInput.kt @@ -19,9 +19,9 @@ package foundation.e.apps.ui.compose.state import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.User import foundation.e.apps.data.install.pkg.InstallerService +import foundation.e.apps.domain.install.Status data class InstallationFault( val isFaulty: Boolean, diff --git a/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapper.kt b/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapper.kt index a624bfe87..f89084693 100644 --- a/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapper.kt +++ b/app/src/main/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapper.kt @@ -20,8 +20,8 @@ package foundation.e.apps.ui.compose.state import foundation.e.apps.R import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.User +import foundation.e.apps.domain.install.Status /* * Map raw application + contextual signals into a single button state. 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 33acdd009..5af6b3985 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 @@ -28,10 +28,10 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.download.data.DownloadProgress import foundation.e.apps.databinding.FragmentHomeBinding import foundation.e.apps.domain.application.ApplicationDomain +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel 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 3c527119f..a468af8de 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 @@ -32,11 +32,11 @@ import com.facebook.shimmer.ShimmerDrawable import com.google.android.material.button.MaterialButton import com.google.android.material.snackbar.Snackbar import foundation.e.apps.R -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.enums.User import foundation.e.apps.data.login.state.LoginState import foundation.e.apps.databinding.HomeChildListItemBinding import foundation.e.apps.domain.application.ApplicationDomain +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.ui.home.HomeFragmentDirections 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 8082111d7..a3f018223 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,12 +43,12 @@ import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R import foundation.e.apps.data.application.ApplicationInstaller import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.download.data.DownloadProgress import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.install.pkg.PwaManager import foundation.e.apps.data.system.isNetworkAvailable import foundation.e.apps.databinding.FragmentSearchBinding +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel diff --git a/app/src/main/java/foundation/e/apps/ui/search/v2/SearchFragmentV2.kt b/app/src/main/java/foundation/e/apps/ui/search/v2/SearchFragmentV2.kt index c2081b38a..27eb0f4db 100644 --- a/app/src/main/java/foundation/e/apps/ui/search/v2/SearchFragmentV2.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/v2/SearchFragmentV2.kt @@ -38,11 +38,11 @@ import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R import foundation.e.apps.data.application.data.Application -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.enums.isUnFiltered import foundation.e.apps.data.install.download.data.DownloadProgress +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel diff --git a/app/src/main/java/foundation/e/apps/ui/search/v2/SearchViewModelV2.kt b/app/src/main/java/foundation/e/apps/ui/search/v2/SearchViewModelV2.kt index b88910b5a..e2b1ddb74 100644 --- a/app/src/main/java/foundation/e/apps/ui/search/v2/SearchViewModelV2.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/v2/SearchViewModelV2.kt @@ -28,9 +28,9 @@ import foundation.e.apps.data.Stores import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.install.download.data.DownloadProgress import foundation.e.apps.data.preference.AppLoungePreference +import foundation.e.apps.domain.install.Status import foundation.e.apps.domain.search.CleanApkSearchPagingUseCase import foundation.e.apps.domain.search.FetchSearchSuggestionsUseCase import foundation.e.apps.domain.search.PlayStoreSearchPagingUseCase 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 fb22fe857..ddc8634ec 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 @@ -40,7 +40,6 @@ import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.application.ApplicationInstaller import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.enums.ResultStatus -import foundation.e.apps.data.enums.Status import foundation.e.apps.data.event.AppEvent import foundation.e.apps.data.event.EventBus import foundation.e.apps.data.install.download.data.DownloadProgress @@ -52,6 +51,7 @@ import foundation.e.apps.data.login.core.AuthObject import foundation.e.apps.data.login.exceptions.GPlayException import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentUpdatesBinding +import foundation.e.apps.domain.install.Status import foundation.e.apps.ui.AppInfoFetchViewModel import foundation.e.apps.ui.AppProgressViewModel import foundation.e.apps.ui.MainActivityViewModel 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 0b89ff15d..aa7e3caa6 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 @@ -29,7 +29,6 @@ import foundation.e.apps.data.application.ApplicationRepository import foundation.e.apps.data.application.data.Application 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.enums.User import foundation.e.apps.data.login.exceptions.CleanApkException import foundation.e.apps.data.login.exceptions.GPlayException @@ -37,6 +36,7 @@ import foundation.e.apps.data.login.state.LoginState import foundation.e.apps.data.preference.AppLoungeDataStore import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.data.updates.UpdatesManagerRepository +import foundation.e.apps.domain.install.Status import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/ui/utils/MaterialButtonUtils.kt b/app/src/main/java/foundation/e/apps/ui/utils/MaterialButtonUtils.kt index e7bdad247..671a825ed 100644 --- a/app/src/main/java/foundation/e/apps/ui/utils/MaterialButtonUtils.kt +++ b/app/src/main/java/foundation/e/apps/ui/utils/MaterialButtonUtils.kt @@ -20,7 +20,7 @@ package foundation.e.apps.ui.utils import androidx.core.content.ContextCompat import com.google.android.material.button.MaterialButton import foundation.e.apps.R -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.elib.R as eR fun MaterialButton.disableInstallButton(status: Status? = null) { diff --git a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt index f204988f3..aa9f65a09 100644 --- a/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt +++ b/app/src/test/java/foundation/e/apps/UpdateManagerImptTest.kt @@ -26,7 +26,7 @@ import foundation.e.apps.data.blockedApps.BlockedAppRepository 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.domain.install.Status import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fdroid.FDroidRepository import foundation.e.apps.data.gitlab.SystemAppsUpdatesRepository diff --git a/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt b/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt index 78d836962..e8126f6a3 100644 --- a/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt +++ b/app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt @@ -30,7 +30,7 @@ import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.application.utils.AppVisibilityResolver import foundation.e.apps.data.enums.FilterLevel import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.playstore.PlayStoreRepository import foundation.e.apps.data.install.pkg.AppLoungePackageManager import foundation.e.apps.data.install.pkg.PwaManager diff --git a/app/src/test/java/foundation/e/apps/data/application/ApplicationDataManagerTest.kt b/app/src/test/java/foundation/e/apps/data/application/ApplicationDataManagerTest.kt index 3df0b22f5..bd606f46c 100644 --- a/app/src/test/java/foundation/e/apps/data/application/ApplicationDataManagerTest.kt +++ b/app/src/test/java/foundation/e/apps/data/application/ApplicationDataManagerTest.kt @@ -5,7 +5,7 @@ import foundation.e.apps.FakeAppLoungePackageManager import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.enums.FilterLevel import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.install.pkg.PwaManager import foundation.e.apps.data.application.utils.AppVisibilityResolver import io.mockk.coEvery diff --git a/app/src/test/java/foundation/e/apps/data/application/ApplicationRepositoryHomeTest.kt b/app/src/test/java/foundation/e/apps/data/application/ApplicationRepositoryHomeTest.kt index e1ad4b2ac..fe70e8799 100644 --- a/app/src/test/java/foundation/e/apps/data/application/ApplicationRepositoryHomeTest.kt +++ b/app/src/test/java/foundation/e/apps/data/application/ApplicationRepositoryHomeTest.kt @@ -37,7 +37,7 @@ import foundation.e.apps.data.cleanapk.data.download.Download 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.domain.install.Status import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.util.MainCoroutineRule import io.mockk.coEvery diff --git a/app/src/test/java/foundation/e/apps/data/application/mapper/ApplicationDomainMapperTest.kt b/app/src/test/java/foundation/e/apps/data/application/mapper/ApplicationDomainMapperTest.kt index ec0c55990..f71315439 100644 --- a/app/src/test/java/foundation/e/apps/data/application/mapper/ApplicationDomainMapperTest.kt +++ b/app/src/test/java/foundation/e/apps/data/application/mapper/ApplicationDomainMapperTest.kt @@ -19,7 +19,7 @@ package foundation.e.apps.data.application.mapper import com.google.common.truth.Truth.assertThat import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.domain.application.ApplicationDomain import org.junit.Test diff --git a/app/src/test/java/foundation/e/apps/data/install/AppManagerWrapperProgressTest.kt b/app/src/test/java/foundation/e/apps/data/install/AppManagerWrapperProgressTest.kt index 277cb7d3b..1a7c10c63 100644 --- a/app/src/test/java/foundation/e/apps/data/install/AppManagerWrapperProgressTest.kt +++ b/app/src/test/java/foundation/e/apps/data/install/AppManagerWrapperProgressTest.kt @@ -17,7 +17,7 @@ package foundation.e.apps.data.install -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.fdroid.FDroidRepository import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.install.download.data.DownloadProgress diff --git a/app/src/test/java/foundation/e/apps/data/install/models/AppInstallTest.kt b/app/src/test/java/foundation/e/apps/data/install/models/AppInstallTest.kt index 43384b792..b51eeb36f 100644 --- a/app/src/test/java/foundation/e/apps/data/install/models/AppInstallTest.kt +++ b/app/src/test/java/foundation/e/apps/data/install/models/AppInstallTest.kt @@ -3,7 +3,7 @@ package foundation.e.apps.data.install.models import com.google.common.truth.Truth.assertThat import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import org.junit.Test class AppInstallTest { diff --git a/app/src/test/java/foundation/e/apps/data/install/pkg/AppLoungePackageManagerTest.kt b/app/src/test/java/foundation/e/apps/data/install/pkg/AppLoungePackageManagerTest.kt index ed5460fe7..55f743484 100644 --- a/app/src/test/java/foundation/e/apps/data/install/pkg/AppLoungePackageManagerTest.kt +++ b/app/src/test/java/foundation/e/apps/data/install/pkg/AppLoungePackageManagerTest.kt @@ -22,7 +22,7 @@ import android.content.Context import android.content.pm.PackageInfo import android.content.pm.PackageManager import androidx.core.content.pm.PackageInfoCompat -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import kotlin.test.assertEquals import kotlin.test.assertFalse import org.junit.Before diff --git a/app/src/test/java/foundation/e/apps/data/install/updates/UpdatesWorkerTest.kt b/app/src/test/java/foundation/e/apps/data/install/updates/UpdatesWorkerTest.kt index 962863037..fe4c59a79 100644 --- a/app/src/test/java/foundation/e/apps/data/install/updates/UpdatesWorkerTest.kt +++ b/app/src/test/java/foundation/e/apps/data/install/updates/UpdatesWorkerTest.kt @@ -41,7 +41,7 @@ import foundation.e.apps.data.blockedApps.BlockedAppRepository 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.domain.install.Status import foundation.e.apps.data.enums.User import foundation.e.apps.data.gitlab.SystemAppsUpdatesRepository import foundation.e.apps.data.login.core.AuthObject diff --git a/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt b/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt index b42a14e94..2a9163270 100644 --- a/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt +++ b/app/src/test/java/foundation/e/apps/domain/ValidateAppAgeLimitUseCaseTest.kt @@ -9,7 +9,7 @@ import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.blockedApps.BlockedAppRepository 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.domain.install.Status import foundation.e.apps.data.enums.Type import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.parentalcontrol.ContentRatingDao 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 4d108c3dc..372f088de 100644 --- a/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt +++ b/app/src/test/java/foundation/e/apps/exodus/PrivacyScoreRepositoryImplTest.kt @@ -18,7 +18,7 @@ package foundation.e.apps.exodus -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.exodus.repositories.PrivacyScoreRepositoryImpl import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.blockedApps.BlockedAppRepository diff --git a/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt b/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt index 38ef3b5a8..a98178add 100644 --- a/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt +++ b/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt @@ -34,7 +34,7 @@ import foundation.e.apps.data.cleanapk.data.search.Search import foundation.e.apps.data.cleanapk.repositories.CleanApkAppsRepository import foundation.e.apps.data.cleanapk.repositories.CleanApkPwaRepository import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.playstore.PlayStoreRepository import foundation.e.apps.data.preference.AppLoungeDataStore import foundation.e.apps.data.install.pkg.AppLoungePackageManager diff --git a/app/src/test/java/foundation/e/apps/fusedManager/AppManagerWrapperTest.kt b/app/src/test/java/foundation/e/apps/fusedManager/AppManagerWrapperTest.kt index 9cf3b5152..0eb4ec765 100644 --- a/app/src/test/java/foundation/e/apps/fusedManager/AppManagerWrapperTest.kt +++ b/app/src/test/java/foundation/e/apps/fusedManager/AppManagerWrapperTest.kt @@ -20,7 +20,7 @@ package foundation.e.apps.fusedManager import android.app.Application import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.fdroid.FDroidRepository import foundation.e.apps.data.install.AppManagerWrapper import foundation.e.apps.data.install.models.AppInstall diff --git a/app/src/test/java/foundation/e/apps/fusedManager/FakeAppManager.kt b/app/src/test/java/foundation/e/apps/fusedManager/FakeAppManager.kt index c76f28cf5..4e29b3b07 100644 --- a/app/src/test/java/foundation/e/apps/fusedManager/FakeAppManager.kt +++ b/app/src/test/java/foundation/e/apps/fusedManager/FakeAppManager.kt @@ -19,7 +19,7 @@ package foundation.e.apps.fusedManager import androidx.lifecycle.LiveData -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.install.AppInstallDAO import foundation.e.apps.data.install.AppManager import foundation.e.apps.data.install.models.AppInstall diff --git a/app/src/test/java/foundation/e/apps/home/HomeViewModelTest.kt b/app/src/test/java/foundation/e/apps/home/HomeViewModelTest.kt index b3e87a7d4..094ab3f10 100644 --- a/app/src/test/java/foundation/e/apps/home/HomeViewModelTest.kt +++ b/app/src/test/java/foundation/e/apps/home/HomeViewModelTest.kt @@ -19,7 +19,7 @@ package foundation.e.apps.home import foundation.e.apps.data.Stores -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.domain.home.FetchHomeScreenDataUseCase import foundation.e.apps.domain.application.ApplicationDomain import foundation.e.apps.domain.home.HomeSection 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 ade2dc588..256bfd353 100644 --- a/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt +++ b/app/src/test/java/foundation/e/apps/installProcessor/AppInstallProcessorTest.kt @@ -24,7 +24,7 @@ import android.net.Network import android.net.NetworkCapabilities import androidx.arch.core.executor.testing.InstantTaskExecutorRule import foundation.e.apps.data.ResultSupreme -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.fdroid.FDroidRepository import foundation.e.apps.data.application.ApplicationRepository import foundation.e.apps.data.enums.ResultStatus diff --git a/app/src/test/java/foundation/e/apps/installProcessor/FakeAppInstallDAO.kt b/app/src/test/java/foundation/e/apps/installProcessor/FakeAppInstallDAO.kt index 93fc563e2..f73818e31 100644 --- a/app/src/test/java/foundation/e/apps/installProcessor/FakeAppInstallDAO.kt +++ b/app/src/test/java/foundation/e/apps/installProcessor/FakeAppInstallDAO.kt @@ -20,7 +20,7 @@ package foundation.e.apps.installProcessor import androidx.lifecycle.LiveData import androidx.lifecycle.asLiveData -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.install.AppInstallDAO import foundation.e.apps.data.install.models.AppInstall import kotlinx.coroutines.flow.flow diff --git a/app/src/test/java/foundation/e/apps/installProcessor/FakeAppManagerWrapper.kt b/app/src/test/java/foundation/e/apps/installProcessor/FakeAppManagerWrapper.kt index 9a52b1365..028798409 100644 --- a/app/src/test/java/foundation/e/apps/installProcessor/FakeAppManagerWrapper.kt +++ b/app/src/test/java/foundation/e/apps/installProcessor/FakeAppManagerWrapper.kt @@ -18,7 +18,7 @@ package foundation.e.apps.installProcessor -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.fdroid.FDroidRepository import foundation.e.apps.data.install.AppManagerWrapper import foundation.e.apps.data.install.AppManager diff --git a/app/src/test/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapperTest.kt b/app/src/test/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapperTest.kt index 9f3c7c5f1..89453add1 100644 --- a/app/src/test/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapperTest.kt +++ b/app/src/test/java/foundation/e/apps/ui/compose/state/InstallButtonStateMapperTest.kt @@ -21,7 +21,7 @@ package foundation.e.apps.ui.compose.state import foundation.e.apps.R import foundation.e.apps.data.application.data.Application import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.enums.User import foundation.e.apps.data.install.pkg.InstallerService import org.junit.Assert.assertEquals diff --git a/app/src/test/java/foundation/e/apps/ui/compose/state/InstallStatusReconcilerTest.kt b/app/src/test/java/foundation/e/apps/ui/compose/state/InstallStatusReconcilerTest.kt index ed3a261a3..0cc086972 100644 --- a/app/src/test/java/foundation/e/apps/ui/compose/state/InstallStatusReconcilerTest.kt +++ b/app/src/test/java/foundation/e/apps/ui/compose/state/InstallStatusReconcilerTest.kt @@ -19,7 +19,7 @@ package foundation.e.apps.ui.compose.state import foundation.e.apps.data.application.ApplicationRepository import foundation.e.apps.data.application.data.Application -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.install.AppManagerWrapper import foundation.e.apps.data.install.models.AppInstall import foundation.e.apps.data.install.download.data.DownloadProgress diff --git a/app/src/test/java/foundation/e/apps/ui/search/v2/SearchViewModelV2Test.kt b/app/src/test/java/foundation/e/apps/ui/search/v2/SearchViewModelV2Test.kt index 31b27e398..ce3a7e73c 100644 --- a/app/src/test/java/foundation/e/apps/ui/search/v2/SearchViewModelV2Test.kt +++ b/app/src/test/java/foundation/e/apps/ui/search/v2/SearchViewModelV2Test.kt @@ -28,7 +28,7 @@ import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.cleanapk.repositories.CleanApkAppsRepository import foundation.e.apps.data.cleanapk.repositories.CleanApkPwaRepository import foundation.e.apps.data.enums.Source -import foundation.e.apps.data.enums.Status +import foundation.e.apps.domain.install.Status import foundation.e.apps.data.playstore.PlayStoreRepository import foundation.e.apps.data.preference.AppLoungePreference import foundation.e.apps.data.search.CleanApkSearchParams -- GitLab