From 730a800dd0442dc6393116abe9dc25fa568da29c Mon Sep 17 00:00:00 2001 From: hasibprince Date: Fri, 19 May 2023 13:21:37 +0600 Subject: [PATCH 1/2] refactor: package structure --- app/src/main/AndroidManifest.xml | 16 +++---- .../foundation/e/apps/AppLoungeApplication.kt | 10 ++--- .../repositories/IAppPrivacyInfoRepository.kt | 10 ----- .../e/apps/{api => data}/ApiCaller.kt | 2 +- .../apps/{api => data}/BaseStoreRepository.kt | 2 +- .../e/apps/{api => data}/JobResult.kt | 2 +- .../foundation/e/apps/{api => data}/Result.kt | 2 +- .../e/apps/{api => data}/ResultSupreme.kt | 2 +- .../cleanapk/ApkSignatureManager.kt | 2 +- .../cleanapk/ApplicationDeserializer.kt | 4 +- .../cleanapk/CleanAPKRepository.kt | 12 +++--- .../cleanapk/CleanApkAppDetailsRetrofit.kt | 4 +- .../cleanapk/CleanApkAppsRepositoryImpl.kt | 12 +++--- .../cleanapk/CleanApkDownloadInfoFetcher.kt | 4 +- .../cleanapk/CleanApkPWARepository.kt | 8 ++-- .../cleanapk/CleanApkRepository.kt | 9 ++-- .../cleanapk/CleanApkRetrofit.kt | 12 +++--- .../{api => data}/cleanapk/RetrofitModule.kt | 12 +++--- .../cleanapk/blockedApps/AppWarningInfo.kt | 2 +- .../blockedApps/BlockedAppRepository.kt | 6 +-- .../cleanapk/data/app/Application.kt | 4 +- .../cleanapk/data/categories/Categories.kt | 2 +- .../cleanapk/data/download/Download.kt | 2 +- .../cleanapk/data/download/DownloadData.kt | 2 +- .../{api => data}/cleanapk/data/home/Home.kt | 4 +- .../cleanapk/data/home/HomeScreen.kt | 2 +- .../cleanapk/data/search/Search.kt | 4 +- .../{api => data}/database/AppDatabase.kt | 14 +++---- .../database/fusedDownload}/DatabaseModule.kt | 3 +- .../fusedDownload}/DatabaseRepository.kt | 4 +- .../database/fusedDownload}/FusedConverter.kt | 2 +- .../database/fusedDownload}/FusedDatabase.kt | 6 +-- .../database/fusedDownload/FusedDownload.kt | 2 +- .../fusedDownload/FusedDownloadDAO.kt | 2 +- .../ecloud/EcloudApiInterface.kt | 4 +- .../{api => data}/ecloud/EcloudRepository.kt | 4 +- .../ecloud/modules/FaultyToken.kt | 2 +- .../{api => data}/exodus/ExodusTrackerApi.kt | 2 +- .../exodus/TrackerApiResponse.kt | 2 +- .../e/apps/{api => data}/exodus/TrackerDao.kt | 2 +- .../exodus/models/AppPrivacyInfo.kt | 2 +- .../{api => data}/exodus/models/Trackers.kt | 2 +- .../AppPrivacyInfoRepositoryImpl.kt | 20 ++++----- .../repositories/IAppPrivacyInfoRepository.kt | 10 +++++ .../{api => data}/faultyApps/FaultyApp.kt | 2 +- .../{api => data}/faultyApps/FaultyAppDao.kt | 2 +- .../faultyApps/FaultyAppRepository.kt | 4 +- .../fdroid/FdroidApiInterface.kt | 6 +-- .../e/apps/{api => data}/fdroid/FdroidDao.kt | 4 +- .../{api => data}/fdroid/FdroidRepository.kt | 10 ++--- .../fdroid/FdroidWebInterface.kt | 2 +- .../{api => data}/fdroid/IFdroidRepository.kt | 6 +-- .../{api => data}/fdroid/models/BuildInfo.kt | 2 +- .../fdroid/models/FdroidApiModel.kt | 2 +- .../fdroid/models/FdroidEntity.kt | 2 +- .../apps/{api => data}/fused/FusedAPIImpl.kt | 42 +++++++++---------- .../{api => data}/fused/FusedAPIInterface.kt | 4 +- .../{api => data}/fused/FusedAPIRepository.kt | 14 +++---- .../e/apps/{api => data}/fused/UpdatesDao.kt | 6 +-- .../apps/{api => data}/fused/data/FusedApp.kt | 2 +- .../{api => data}/fused/data/FusedCategory.kt | 2 +- .../{api => data}/fused/data/FusedHome.kt | 2 +- .../apps/{api => data}/fused/data/Ratings.kt | 2 +- .../fused/utils/CategoryUtils.kt | 2 +- .../fusedDownload}/FileManager.kt | 2 +- .../fusedDownload}/FusedManagerImpl.kt | 10 ++--- .../fusedDownload}/FusedManagerRepository.kt | 12 +++--- .../fusedDownload}/IFusedManager.kt | 4 +- .../apps/{api => data}/gplay/GPlayAPIImpl.kt | 6 +-- .../{api => data}/gplay/GPlayAPIRepository.kt | 4 +- .../gplay/GplayStoreRepository.kt | 6 +-- .../gplay/GplayStoreRepositoryImpl.kt | 8 ++-- .../{api => data}/gplay/utils/AC2DMTask.kt | 2 +- .../{api => data}/gplay/utils/AC2DMUtil.kt | 2 +- .../gplay/utils/CustomAuthValidator.kt | 2 +- .../gplay/utils/EglExtensionProvider.kt | 2 +- .../gplay/utils/GPlayHttpClient.kt | 4 +- .../utils/NativeDeviceInfoProviderModule.kt | 2 +- .../gplay/utils/NativeGsfVersionProvider.kt | 2 +- .../{ => data}/login/AuthDataValidator.kt | 4 +- .../e/apps/{ => data}/login/AuthObject.kt | 6 +-- .../e/apps/{ => data}/login/LoginCommon.kt | 2 +- .../e/apps/{ => data}/login/LoginDataStore.kt | 2 +- .../{ => data}/login/LoginSourceCleanApk.kt | 4 +- .../apps/{ => data}/login/LoginSourceGPlay.kt | 12 +++--- .../{ => data}/login/LoginSourceInterface.kt | 2 +- .../{ => data}/login/LoginSourceRepository.kt | 4 +- .../e/apps/{ => data}/login/LoginViewModel.kt | 2 +- .../{ => data}/login/api/AnonymousLoginApi.kt | 6 +-- .../{ => data}/login/api/GPlayApiFactory.kt | 6 +-- .../login/api/GPlayLoginInterface.kt | 2 +- .../{ => data}/login/api/GoogleLoginApi.kt | 8 ++-- .../login/api/LoginApiRepository.kt | 6 +-- .../updates}/UpdatesManagerImpl.kt | 16 +++---- .../updates}/UpdatesManagerRepository.kt | 6 +-- .../java/foundation/e/apps/di/DaoModule.kt | 8 ++-- .../java/foundation/e/apps/di/LoginModule.kt | 6 +-- .../e/apps/di/NamedRepositoryModule.kt | 18 ++++---- .../foundation/e/apps/di/RepositoryModule.kt | 12 +++--- .../download}/DownloadManager.kt | 2 +- .../download/DownloadManagerBR.kt | 2 +- .../download/DownloadManagerModule.kt | 2 +- .../download/DownloadManagerUtils.kt | 7 ++-- .../download/data/DownloadProgress.kt | 2 +- .../download/data/DownloadProgressLD.kt | 4 +- .../notification/NotificationManagerModule.kt | 2 +- .../notification/NotificationManagerUtils.kt | 2 +- .../pkg/InstallerService.kt | 8 ++-- .../pkg/PackageInstallerService.kt | 4 +- .../{manager => install}/pkg/PkgManagerBR.kt | 6 +-- .../pkg/PkgManagerModule.kt | 6 +-- .../receiver/PWAPlayerStatusReceiver.kt | 4 +- .../splitinstall/SplitInstallBinder.kt | 6 +-- .../splitinstall/SplitInstallService.kt | 6 +-- .../updates}/UpdatesBroadcastReceiver.kt | 2 +- .../updates}/UpdatesWorkManager.kt | 2 +- .../updates}/UpdatesWorker.kt | 21 +++++----- .../workmanager/AppInstallProcessor.kt | 12 +++--- .../workmanager/InstallAppWorker.kt | 2 +- .../workmanager/InstallWorkManager.kt | 4 +- .../e/apps/{ => ui}/AppInfoFetchViewModel.kt | 12 +++--- .../e/apps/{ => ui}/AppProgressViewModel.kt | 10 ++--- .../e/apps/{ => ui}/MainActivity.kt | 21 +++++----- .../e/apps/{ => ui}/MainActivityViewModel.kt | 17 ++++---- .../e/apps/{ => ui}/PrivacyInfoViewModel.kt | 10 ++--- .../application/ApplicationFragment.kt | 24 +++++------ .../application/ApplicationViewModel.kt | 16 +++---- .../model/ApplicationScreenshotsDiffUtil.kt | 2 +- .../model/ApplicationScreenshotsRVAdapter.kt | 6 +-- .../application/model/DepthPageTransformer.kt | 2 +- .../application/model/ScreenshotRVAdapter.kt | 4 +- .../subFrags/ApplicationDialogFragment.kt | 2 +- .../subFrags/DescriptionFragment.kt | 2 +- .../subFrags/ScreenshotFragment.kt | 6 +-- .../applicationlist/ApplicationDiffUtil.kt | 4 +- .../ApplicationListFragment.kt | 24 +++++------ .../ApplicationListRVAdapter.kt | 20 ++++----- .../ApplicationListViewModel.kt | 10 ++--- .../apps/{ => ui}/categories/AppsFragment.kt | 10 ++--- .../{ => ui}/categories/CategoriesFragment.kt | 4 +- .../categories/CategoriesViewModel.kt | 10 ++--- .../apps/{ => ui}/categories/GamesFragment.kt | 10 ++--- .../categories/model/CategoriesDiffUtil.kt | 4 +- .../categories/model/CategoriesRVAdapter.kt | 6 +-- .../categories/model/CategoriesVPAdapter.kt | 6 +-- .../e/apps/{ => ui}/home/HomeFragment.kt | 26 ++++++------ .../e/apps/{ => ui}/home/HomeViewModel.kt | 12 +++--- .../{ => ui}/home/model/FusedHomeDiffUtil.kt | 4 +- .../home/model/HomeChildFusedAppDiffUtil.kt | 4 +- .../{ => ui}/home/model/HomeChildRVAdapter.kt | 14 +++---- .../home/model/HomeParentRVAdapter.kt | 12 +++--- .../{ => ui}/purchase/AppPurchaseFragment.kt | 4 +- .../e/apps/{ => ui}/search/SearchFragment.kt | 24 +++++------ .../e/apps/{ => ui}/search/SearchViewModel.kt | 10 ++--- .../{ => ui}/settings/LongPressPreference.kt | 2 +- .../settings/RadioButtonPreference.kt | 2 +- .../{ => ui}/settings/SettingsFragment.kt | 12 +++--- .../signin/LocaleChangedBroadcastReceiver.kt | 2 +- .../{ => ui}/setup/signin/SignInFragment.kt | 4 +- .../{ => ui}/setup/signin/SignInViewModel.kt | 2 +- .../signin/google/GoogleSignInFragment.kt | 6 +-- .../e/apps/{ => ui}/setup/tos/TOSFragment.kt | 2 +- .../e/apps/{ => ui}/setup/tos/TOSViewModel.kt | 2 +- .../apps/{ => ui}/updates/UpdatesFragment.kt | 30 ++++++------- .../apps/{ => ui}/updates/UpdatesNotifier.kt | 4 +- .../apps/{ => ui}/updates/UpdatesViewModel.kt | 10 ++--- .../e/apps/utils/eventBus/AppEvent.kt | 2 +- .../e/apps/utils/modules/PWAManagerModule.kt | 6 +-- .../utils/parentFragment/LoadingViewModel.kt | 2 +- .../utils/parentFragment/TimeoutFragment.kt | 8 ++-- app/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/fragment_app_purchase.xml | 2 +- .../main/res/layout/fragment_application.xml | 2 +- .../res/layout/fragment_application_list.xml | 2 +- app/src/main/res/layout/fragment_apps.xml | 2 +- .../main/res/layout/fragment_categories.xml | 2 +- .../main/res/layout/fragment_description.xml | 2 +- app/src/main/res/layout/fragment_games.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 2 +- .../main/res/layout/fragment_screenshot.xml | 2 +- app/src/main/res/layout/fragment_search.xml | 2 +- app/src/main/res/layout/fragment_sign_in.xml | 2 +- app/src/main/res/layout/fragment_updates.xml | 2 +- .../res/navigation/navigation_resource.xml | 26 ++++++------ app/src/main/res/xml/settings_preferences.xml | 2 +- .../foundation/e/apps/FakeFaultyAppDao.kt | 4 +- .../e/apps/FaultyAppRepositoryTest.kt | 6 +-- .../foundation/e/apps/FusedApiImplTest.kt | 20 ++++----- .../e/apps/FusedApiRepositoryTest.kt | 4 +- .../e/apps/UpdateManagerImptTest.kt | 12 +++--- .../AppPrivacyInfoRepositoryImplTest.kt | 4 +- .../e/apps/exodus/FakeExoudsTrackerApi.kt | 8 ++-- .../e/apps/exodus/FakeTrackerDao.kt | 4 +- .../e/apps/fusedManager/FakeFusedManager.kt | 6 +-- .../FusedManagerRepositoryTest.kt | 10 ++--- .../AppInstallProcessorTest.kt | 11 +++-- .../installProcessor/FakeFusedDownloadDAO.kt | 4 +- .../FakeFusedManagerRepository.kt | 8 ++-- 198 files changed, 629 insertions(+), 634 deletions(-) delete mode 100644 app/src/main/java/foundation/e/apps/api/exodus/repositories/IAppPrivacyInfoRepository.kt rename app/src/main/java/foundation/e/apps/{api => data}/ApiCaller.kt (93%) rename app/src/main/java/foundation/e/apps/{api => data}/BaseStoreRepository.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/JobResult.kt (98%) rename app/src/main/java/foundation/e/apps/{api => data}/Result.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/ResultSupreme.kt (99%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/ApkSignatureManager.kt (98%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/ApplicationDeserializer.kt (94%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanAPKRepository.kt (86%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanApkAppDetailsRetrofit.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanApkAppsRepositoryImpl.kt (87%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanApkDownloadInfoFetcher.kt (62%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanApkPWARepository.kt (90%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanApkRepository.kt (80%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanApkRetrofit.kt (87%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/RetrofitModule.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/blockedApps/AppWarningInfo.kt (94%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/blockedApps/BlockedAppRepository.kt (93%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/data/app/Application.kt (87%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/data/categories/Categories.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/data/download/Download.kt (91%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/data/download/DownloadData.kt (91%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/data/home/Home.kt (90%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/data/home/HomeScreen.kt (91%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/data/search/Search.kt (87%) rename app/src/main/java/foundation/e/apps/{api => data}/database/AppDatabase.kt (73%) rename app/src/main/java/foundation/e/apps/{manager/database => data/database/fusedDownload}/DatabaseModule.kt (82%) rename app/src/main/java/foundation/e/apps/{manager/database => data/database/fusedDownload}/DatabaseRepository.kt (86%) rename app/src/main/java/foundation/e/apps/{manager/database => data/database/fusedDownload}/FusedConverter.kt (91%) rename app/src/main/java/foundation/e/apps/{manager/database => data/database/fusedDownload}/FusedDatabase.kt (78%) rename app/src/main/java/foundation/e/apps/{manager => data}/database/fusedDownload/FusedDownload.kt (93%) rename app/src/main/java/foundation/e/apps/{manager => data}/database/fusedDownload/FusedDownloadDAO.kt (91%) rename app/src/main/java/foundation/e/apps/{api => data}/ecloud/EcloudApiInterface.kt (91%) rename app/src/main/java/foundation/e/apps/{api => data}/ecloud/EcloudRepository.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/ecloud/modules/FaultyToken.kt (94%) rename app/src/main/java/foundation/e/apps/{api => data}/exodus/ExodusTrackerApi.kt (93%) rename app/src/main/java/foundation/e/apps/{api => data}/exodus/TrackerApiResponse.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/exodus/TrackerDao.kt (90%) rename app/src/main/java/foundation/e/apps/{api => data}/exodus/models/AppPrivacyInfo.kt (75%) rename app/src/main/java/foundation/e/apps/{api => data}/exodus/models/Trackers.kt (90%) rename app/src/main/java/foundation/e/apps/{api => data}/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt (94%) create mode 100644 app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt rename app/src/main/java/foundation/e/apps/{api => data}/faultyApps/FaultyApp.kt (95%) rename app/src/main/java/foundation/e/apps/{api => data}/faultyApps/FaultyAppDao.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/faultyApps/FaultyAppRepository.kt (94%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/FdroidApiInterface.kt (69%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/FdroidDao.kt (85%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/FdroidRepository.kt (89%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/FdroidWebInterface.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/IFdroidRepository.kt (90%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/models/BuildInfo.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/models/FdroidApiModel.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/fdroid/models/FdroidEntity.kt (91%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/FusedAPIImpl.kt (95%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/FusedAPIInterface.kt (89%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/FusedAPIRepository.kt (95%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/UpdatesDao.kt (91%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/data/FusedApp.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/data/FusedCategory.kt (94%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/data/FusedHome.kt (93%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/data/Ratings.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/utils/CategoryUtils.kt (96%) rename app/src/main/java/foundation/e/apps/{manager/fused => data/fusedDownload}/FileManager.kt (96%) rename app/src/main/java/foundation/e/apps/{manager/fused => data/fusedDownload}/FusedManagerImpl.kt (95%) rename app/src/main/java/foundation/e/apps/{manager/fused => data/fusedDownload}/FusedManagerRepository.kt (92%) rename app/src/main/java/foundation/e/apps/{manager/fused => data/fusedDownload}/IFusedManager.kt (95%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/GPlayAPIImpl.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/GPlayAPIRepository.kt (95%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/GplayStoreRepository.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/GplayStoreRepositoryImpl.kt (98%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/utils/AC2DMTask.kt (98%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/utils/AC2DMUtil.kt (97%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/utils/CustomAuthValidator.kt (97%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/utils/EglExtensionProvider.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/utils/GPlayHttpClient.kt (95%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/utils/NativeDeviceInfoProviderModule.kt (96%) rename app/src/main/java/foundation/e/apps/{api => data}/gplay/utils/NativeGsfVersionProvider.kt (96%) rename app/src/main/java/foundation/e/apps/{ => data}/login/AuthDataValidator.kt (91%) rename app/src/main/java/foundation/e/apps/{ => data}/login/AuthObject.kt (95%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginCommon.kt (98%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginDataStore.kt (99%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginSourceCleanApk.kt (95%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginSourceGPlay.kt (96%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginSourceInterface.kt (96%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginSourceRepository.kt (96%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginViewModel.kt (99%) rename app/src/main/java/foundation/e/apps/{ => data}/login/api/AnonymousLoginApi.kt (94%) rename app/src/main/java/foundation/e/apps/{ => data}/login/api/GPlayApiFactory.kt (89%) rename app/src/main/java/foundation/e/apps/{ => data}/login/api/GPlayLoginInterface.kt (95%) rename app/src/main/java/foundation/e/apps/{ => data}/login/api/GoogleLoginApi.kt (93%) rename app/src/main/java/foundation/e/apps/{ => data}/login/api/LoginApiRepository.kt (97%) rename app/src/main/java/foundation/e/apps/{updates/manager => data/updates}/UpdatesManagerImpl.kt (94%) rename app/src/main/java/foundation/e/apps/{updates/manager => data/updates}/UpdatesManagerRepository.kt (90%) rename app/src/main/java/foundation/e/apps/{api => install/download}/DownloadManager.kt (99%) rename app/src/main/java/foundation/e/apps/{manager => install}/download/DownloadManagerBR.kt (95%) rename app/src/main/java/foundation/e/apps/{manager => install}/download/DownloadManagerModule.kt (94%) rename app/src/main/java/foundation/e/apps/{manager => install}/download/DownloadManagerUtils.kt (95%) rename app/src/main/java/foundation/e/apps/{manager => install}/download/data/DownloadProgress.kt (82%) rename app/src/main/java/foundation/e/apps/{manager => install}/download/data/DownloadProgressLD.kt (95%) rename app/src/main/java/foundation/e/apps/{manager => install}/notification/NotificationManagerModule.kt (95%) rename app/src/main/java/foundation/e/apps/{manager => install}/notification/NotificationManagerUtils.kt (95%) rename app/src/main/java/foundation/e/apps/{manager => install}/pkg/InstallerService.kt (95%) rename app/src/main/java/foundation/e/apps/{manager => install}/pkg/PackageInstallerService.kt (96%) rename app/src/main/java/foundation/e/apps/{manager => install}/pkg/PkgManagerBR.kt (93%) rename app/src/main/java/foundation/e/apps/{manager => install}/pkg/PkgManagerModule.kt (95%) rename app/src/main/java/foundation/e/apps/{ => install}/receiver/PWAPlayerStatusReceiver.kt (95%) rename app/src/main/java/foundation/e/apps/{ => install}/splitinstall/SplitInstallBinder.kt (96%) rename app/src/main/java/foundation/e/apps/{ => install}/splitinstall/SplitInstallService.kt (95%) rename app/src/main/java/foundation/e/apps/{updates/manager => install/updates}/UpdatesBroadcastReceiver.kt (97%) rename app/src/main/java/foundation/e/apps/{updates/manager => install/updates}/UpdatesWorkManager.kt (98%) rename app/src/main/java/foundation/e/apps/{updates/manager => install/updates}/UpdatesWorker.kt (95%) rename app/src/main/java/foundation/e/apps/{manager => install}/workmanager/AppInstallProcessor.kt (96%) rename app/src/main/java/foundation/e/apps/{manager => install}/workmanager/InstallAppWorker.kt (98%) rename app/src/main/java/foundation/e/apps/{manager => install}/workmanager/InstallWorkManager.kt (92%) rename app/src/main/java/foundation/e/apps/{ => ui}/AppInfoFetchViewModel.kt (86%) rename app/src/main/java/foundation/e/apps/{ => ui}/AppProgressViewModel.kt (82%) rename app/src/main/java/foundation/e/apps/{ => ui}/MainActivity.kt (93%) rename app/src/main/java/foundation/e/apps/{ => ui}/MainActivityViewModel.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/PrivacyInfoViewModel.kt (86%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/ApplicationFragment.kt (97%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/ApplicationViewModel.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/model/ApplicationScreenshotsDiffUtil.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/model/ApplicationScreenshotsRVAdapter.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/model/DepthPageTransformer.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/model/ScreenshotRVAdapter.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/subFrags/ApplicationDialogFragment.kt (96%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/subFrags/DescriptionFragment.kt (95%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/subFrags/ScreenshotFragment.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/applicationlist/ApplicationDiffUtil.kt (96%) rename app/src/main/java/foundation/e/apps/{ => ui}/applicationlist/ApplicationListFragment.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/applicationlist/ApplicationListRVAdapter.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/applicationlist/ApplicationListViewModel.kt (93%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/AppsFragment.kt (93%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/CategoriesFragment.kt (95%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/CategoriesViewModel.kt (90%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/GamesFragment.kt (93%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/model/CategoriesDiffUtil.kt (92%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/model/CategoriesRVAdapter.kt (92%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/model/CategoriesVPAdapter.kt (87%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/HomeFragment.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/HomeViewModel.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/model/FusedHomeDiffUtil.kt (92%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/model/HomeChildFusedAppDiffUtil.kt (96%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/model/HomeChildRVAdapter.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/model/HomeParentRVAdapter.kt (90%) rename app/src/main/java/foundation/e/apps/{ => ui}/purchase/AppPurchaseFragment.kt (97%) rename app/src/main/java/foundation/e/apps/{ => ui}/search/SearchFragment.kt (96%) rename app/src/main/java/foundation/e/apps/{ => ui}/search/SearchViewModel.kt (93%) rename app/src/main/java/foundation/e/apps/{ => ui}/settings/LongPressPreference.kt (97%) rename app/src/main/java/foundation/e/apps/{ => ui}/settings/RadioButtonPreference.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/settings/SettingsFragment.kt (97%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/LocaleChangedBroadcastReceiver.kt (98%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/SignInFragment.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/SignInViewModel.kt (93%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/google/GoogleSignInFragment.kt (96%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/tos/TOSFragment.kt (98%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/tos/TOSViewModel.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/updates/UpdatesFragment.kt (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/updates/UpdatesNotifier.kt (98%) rename app/src/main/java/foundation/e/apps/{ => ui}/updates/UpdatesViewModel.kt (92%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 945d35eb9..daa989f11 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,7 +45,7 @@ android:usesCleartextTraffic="true"> @@ -54,10 +54,10 @@ - + @@ -67,13 +67,13 @@ - + - @@ -86,7 +86,7 @@ - + @@ -98,10 +98,10 @@ android:authorities="${applicationId}.androidx-startup" tools:node="remove" /> - + diff --git a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt index 148496069..1fbb78ed1 100644 --- a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt +++ b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt @@ -24,11 +24,11 @@ import androidx.hilt.work.HiltWorkerFactory import androidx.work.Configuration import androidx.work.ExistingPeriodicWorkPolicy import dagger.hilt.android.HiltAndroidApp -import foundation.e.apps.manager.pkg.PkgManagerBR -import foundation.e.apps.manager.pkg.PkgManagerModule -import foundation.e.apps.manager.workmanager.InstallWorkManager -import foundation.e.apps.setup.tos.TOS_VERSION -import foundation.e.apps.updates.manager.UpdatesWorkManager +import foundation.e.apps.install.pkg.PkgManagerBR +import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.workmanager.InstallWorkManager +import foundation.e.apps.ui.setup.tos.TOS_VERSION +import foundation.e.apps.install.updates.UpdatesWorkManager import foundation.e.apps.utils.modules.DataStoreModule import foundation.e.apps.utils.modules.PreferenceManagerModule import foundation.e.lib.telemetry.Telemetry diff --git a/app/src/main/java/foundation/e/apps/api/exodus/repositories/IAppPrivacyInfoRepository.kt b/app/src/main/java/foundation/e/apps/api/exodus/repositories/IAppPrivacyInfoRepository.kt deleted file mode 100644 index f14cb1f23..000000000 --- a/app/src/main/java/foundation/e/apps/api/exodus/repositories/IAppPrivacyInfoRepository.kt +++ /dev/null @@ -1,10 +0,0 @@ -package foundation.e.apps.api.exodus.repositories - -import foundation.e.apps.api.Result -import foundation.e.apps.api.exodus.models.AppPrivacyInfo -import foundation.e.apps.api.fused.data.FusedApp - -interface IAppPrivacyInfoRepository { - suspend fun getAppPrivacyInfo(fusedApp: FusedApp, appHandle: String): Result - fun calculatePrivacyScore(fusedApp: FusedApp): Int -} diff --git a/app/src/main/java/foundation/e/apps/api/ApiCaller.kt b/app/src/main/java/foundation/e/apps/data/ApiCaller.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/api/ApiCaller.kt rename to app/src/main/java/foundation/e/apps/data/ApiCaller.kt index 34e13e55f..6b89bfea4 100644 --- a/app/src/main/java/foundation/e/apps/api/ApiCaller.kt +++ b/app/src/main/java/foundation/e/apps/data/ApiCaller.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api +package foundation.e.apps.data import retrofit2.Response diff --git a/app/src/main/java/foundation/e/apps/api/BaseStoreRepository.kt b/app/src/main/java/foundation/e/apps/data/BaseStoreRepository.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/BaseStoreRepository.kt rename to app/src/main/java/foundation/e/apps/data/BaseStoreRepository.kt index 0173774d6..ab00a888f 100644 --- a/app/src/main/java/foundation/e/apps/api/BaseStoreRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/BaseStoreRepository.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api +package foundation.e.apps.data interface BaseStoreRepository { diff --git a/app/src/main/java/foundation/e/apps/api/JobResult.kt b/app/src/main/java/foundation/e/apps/data/JobResult.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/api/JobResult.kt rename to app/src/main/java/foundation/e/apps/data/JobResult.kt index b632a1366..202093d9a 100644 --- a/app/src/main/java/foundation/e/apps/api/JobResult.kt +++ b/app/src/main/java/foundation/e/apps/data/JobResult.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api +package foundation.e.apps.data import foundation.e.apps.utils.enums.ResultStatus diff --git a/app/src/main/java/foundation/e/apps/api/Result.kt b/app/src/main/java/foundation/e/apps/data/Result.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/Result.kt rename to app/src/main/java/foundation/e/apps/data/Result.kt index 1f955b167..dfb936144 100644 --- a/app/src/main/java/foundation/e/apps/api/Result.kt +++ b/app/src/main/java/foundation/e/apps/data/Result.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api +package foundation.e.apps.data data class Result(val status: Status, val data: T?, val message: String?) { diff --git a/app/src/main/java/foundation/e/apps/api/ResultSupreme.kt b/app/src/main/java/foundation/e/apps/data/ResultSupreme.kt similarity index 99% rename from app/src/main/java/foundation/e/apps/api/ResultSupreme.kt rename to app/src/main/java/foundation/e/apps/data/ResultSupreme.kt index 856674c71..3f2e40041 100644 --- a/app/src/main/java/foundation/e/apps/api/ResultSupreme.kt +++ b/app/src/main/java/foundation/e/apps/data/ResultSupreme.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api +package foundation.e.apps.data import foundation.e.apps.utils.enums.ResultStatus import java.util.concurrent.TimeoutException diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/ApkSignatureManager.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/ApkSignatureManager.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/api/cleanapk/ApkSignatureManager.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/ApkSignatureManager.kt index ea7e58338..9693d5229 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/ApkSignatureManager.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/ApkSignatureManager.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk import android.content.Context import org.bouncycastle.jce.provider.BouncyCastleProvider diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/ApplicationDeserializer.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/ApplicationDeserializer.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/api/cleanapk/ApplicationDeserializer.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/ApplicationDeserializer.kt index 02ac918ba..5d9b3910b 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/ApplicationDeserializer.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/ApplicationDeserializer.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk import com.google.gson.Gson import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializer import com.google.gson.JsonElement -import foundation.e.apps.api.cleanapk.data.app.Application +import foundation.e.apps.data.cleanapk.data.app.Application class ApplicationDeserializer : JsonDeserializer { override fun deserialize( diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanAPKRepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanAPKRepository.kt similarity index 86% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanAPKRepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/CleanAPKRepository.kt index fc77fbb13..b40bcd2ec 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanAPKRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanAPKRepository.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk import foundation.e.apps.OpenForTesting -import foundation.e.apps.api.cleanapk.data.app.Application -import foundation.e.apps.api.cleanapk.data.categories.Categories -import foundation.e.apps.api.cleanapk.data.download.Download -import foundation.e.apps.api.cleanapk.data.home.HomeScreen -import foundation.e.apps.api.cleanapk.data.search.Search +import foundation.e.apps.data.cleanapk.data.app.Application +import foundation.e.apps.data.cleanapk.data.categories.Categories +import foundation.e.apps.data.cleanapk.data.download.Download +import foundation.e.apps.data.cleanapk.data.home.HomeScreen +import foundation.e.apps.data.cleanapk.data.search.Search import retrofit2.Response import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppDetailsRetrofit.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppDetailsRetrofit.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppDetailsRetrofit.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppDetailsRetrofit.kt index 9ab5b6f47..1e62152bc 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppDetailsRetrofit.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppDetailsRetrofit.kt @@ -18,9 +18,9 @@ * */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk -import foundation.e.apps.api.cleanapk.data.app.Application +import foundation.e.apps.data.cleanapk.data.app.Application import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Query diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppsRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppsRepositoryImpl.kt similarity index 87% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppsRepositoryImpl.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppsRepositoryImpl.kt index 1deb2c7e5..42247d4fa 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppsRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppsRepositoryImpl.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk -import foundation.e.apps.api.cleanapk.data.app.Application -import foundation.e.apps.api.cleanapk.data.categories.Categories -import foundation.e.apps.api.cleanapk.data.download.Download -import foundation.e.apps.api.cleanapk.data.home.HomeScreen -import foundation.e.apps.api.cleanapk.data.search.Search +import foundation.e.apps.data.cleanapk.data.app.Application +import foundation.e.apps.data.cleanapk.data.categories.Categories +import foundation.e.apps.data.cleanapk.data.download.Download +import foundation.e.apps.data.cleanapk.data.home.HomeScreen +import foundation.e.apps.data.cleanapk.data.search.Search import retrofit2.Response class CleanApkAppsRepositoryImpl( diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkDownloadInfoFetcher.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkDownloadInfoFetcher.kt similarity index 62% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkDownloadInfoFetcher.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkDownloadInfoFetcher.kt index 90f5b5346..697428d58 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkDownloadInfoFetcher.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkDownloadInfoFetcher.kt @@ -1,6 +1,6 @@ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk -import foundation.e.apps.api.cleanapk.data.download.Download +import foundation.e.apps.data.cleanapk.data.download.Download import retrofit2.Response interface CleanApkDownloadInfoFetcher { diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkPWARepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkPWARepository.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkPWARepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkPWARepository.kt index 5d17d109f..488d6227e 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkPWARepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkPWARepository.kt @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk -import foundation.e.apps.api.cleanapk.data.app.Application -import foundation.e.apps.api.cleanapk.data.categories.Categories -import foundation.e.apps.api.cleanapk.data.search.Search +import foundation.e.apps.data.cleanapk.data.app.Application +import foundation.e.apps.data.cleanapk.data.categories.Categories +import foundation.e.apps.data.cleanapk.data.search.Search import retrofit2.Response class CleanApkPWARepository( diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRepository.kt similarity index 80% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRepository.kt index 8838b51d6..84a2609b0 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRepository.kt @@ -16,12 +16,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk -import foundation.e.apps.api.BaseStoreRepository -import foundation.e.apps.api.cleanapk.data.categories.Categories -import foundation.e.apps.api.cleanapk.data.download.Download -import foundation.e.apps.api.cleanapk.data.search.Search +import foundation.e.apps.data.BaseStoreRepository +import foundation.e.apps.data.cleanapk.data.categories.Categories +import foundation.e.apps.data.cleanapk.data.search.Search import retrofit2.Response interface CleanApkRepository : BaseStoreRepository { diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRetrofit.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRetrofit.kt similarity index 87% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRetrofit.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRetrofit.kt index 4feb18bc5..d6660cd60 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRetrofit.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRetrofit.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk -import foundation.e.apps.api.cleanapk.data.app.Application -import foundation.e.apps.api.cleanapk.data.categories.Categories -import foundation.e.apps.api.cleanapk.data.download.Download -import foundation.e.apps.api.cleanapk.data.home.HomeScreen -import foundation.e.apps.api.cleanapk.data.search.Search +import foundation.e.apps.data.cleanapk.data.app.Application +import foundation.e.apps.data.cleanapk.data.categories.Categories +import foundation.e.apps.data.cleanapk.data.download.Download +import foundation.e.apps.data.cleanapk.data.home.HomeScreen +import foundation.e.apps.data.cleanapk.data.search.Search import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Query diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/RetrofitModule.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/RetrofitModule.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/api/cleanapk/RetrofitModule.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/RetrofitModule.kt index 26e8f8cad..7b46568dc 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/RetrofitModule.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/RetrofitModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk import android.os.Build import android.util.Log @@ -30,11 +30,11 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import foundation.e.apps.api.cleanapk.data.app.Application -import foundation.e.apps.api.ecloud.EcloudApiInterface -import foundation.e.apps.api.exodus.ExodusTrackerApi -import foundation.e.apps.api.fdroid.FdroidApiInterface -import foundation.e.apps.api.fdroid.FdroidWebInterface +import foundation.e.apps.data.cleanapk.data.app.Application +import foundation.e.apps.data.ecloud.EcloudApiInterface +import foundation.e.apps.data.exodus.ExodusTrackerApi +import foundation.e.apps.data.fdroid.FdroidApiInterface +import foundation.e.apps.data.fdroid.FdroidWebInterface import okhttp3.Cache import okhttp3.Interceptor import okhttp3.MediaType.Companion.toMediaTypeOrNull diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/AppWarningInfo.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/blockedApps/AppWarningInfo.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/AppWarningInfo.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/blockedApps/AppWarningInfo.kt index 5175e1f19..d5194445e 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/AppWarningInfo.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/blockedApps/AppWarningInfo.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.blockedApps +package foundation.e.apps.data.cleanapk.blockedApps import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/BlockedAppRepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/blockedApps/BlockedAppRepository.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/BlockedAppRepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/blockedApps/BlockedAppRepository.kt index 5e09583ce..7ad226501 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/BlockedAppRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/blockedApps/BlockedAppRepository.kt @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.blockedApps +package foundation.e.apps.data.cleanapk.blockedApps import com.google.gson.Gson -import foundation.e.apps.api.DownloadManager -import foundation.e.apps.manager.fused.FileManager +import foundation.e.apps.install.download.DownloadManager +import foundation.e.apps.data.fusedDownload.FileManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import java.io.File diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/data/app/Application.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt similarity index 87% rename from app/src/main/java/foundation/e/apps/api/cleanapk/data/app/Application.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt index 7e0cfbb3e..e3b039721 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/data/app/Application.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/app/Application.kt @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.data.app +package foundation.e.apps.data.cleanapk.data.app -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp data class Application( val app: FusedApp = FusedApp(), diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/data/categories/Categories.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/categories/Categories.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/api/cleanapk/data/categories/Categories.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/data/categories/Categories.kt index 11bf717e8..6fac8eefc 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/data/categories/Categories.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/categories/Categories.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.data.categories +package foundation.e.apps.data.cleanapk.data.categories data class Categories( val apps: List = emptyList(), diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/data/download/Download.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/download/Download.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/api/cleanapk/data/download/Download.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/data/download/Download.kt index d916bc312..0776bf058 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/data/download/Download.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/download/Download.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.data.download +package foundation.e.apps.data.cleanapk.data.download data class Download( val download_data: DownloadData = DownloadData(), diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/data/download/DownloadData.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/download/DownloadData.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/api/cleanapk/data/download/DownloadData.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/data/download/DownloadData.kt index cec080d21..2ee625449 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/data/download/DownloadData.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/download/DownloadData.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.data.download +package foundation.e.apps.data.cleanapk.data.download data class DownloadData( val download_link: String = String(), diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/data/home/Home.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/api/cleanapk/data/home/Home.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt index 29197bf4c..b811ced8a 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/data/home/Home.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/Home.kt @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.data.home +package foundation.e.apps.data.cleanapk.data.home -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.utils.enums.Origin data class Home( diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/data/home/HomeScreen.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/HomeScreen.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/api/cleanapk/data/home/HomeScreen.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/data/home/HomeScreen.kt index 48ad42d89..27d0f7db4 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/data/home/HomeScreen.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/home/HomeScreen.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.data.home +package foundation.e.apps.data.cleanapk.data.home data class HomeScreen( val home: Home = Home(), diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/data/search/Search.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt similarity index 87% rename from app/src/main/java/foundation/e/apps/api/cleanapk/data/search/Search.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt index 955be0b09..97dc3c330 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/data/search/Search.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/data/search/Search.kt @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk.data.search +package foundation.e.apps.data.cleanapk.data.search -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp data class Search( val apps: List = emptyList(), diff --git a/app/src/main/java/foundation/e/apps/api/database/AppDatabase.kt b/app/src/main/java/foundation/e/apps/data/database/AppDatabase.kt similarity index 73% rename from app/src/main/java/foundation/e/apps/api/database/AppDatabase.kt rename to app/src/main/java/foundation/e/apps/data/database/AppDatabase.kt index d52abde04..bb5a4cbf0 100644 --- a/app/src/main/java/foundation/e/apps/api/database/AppDatabase.kt +++ b/app/src/main/java/foundation/e/apps/data/database/AppDatabase.kt @@ -1,15 +1,15 @@ -package foundation.e.apps.api.database +package foundation.e.apps.data.database import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase -import foundation.e.apps.api.exodus.Tracker -import foundation.e.apps.api.exodus.TrackerDao -import foundation.e.apps.api.faultyApps.FaultyApp -import foundation.e.apps.api.faultyApps.FaultyAppDao -import foundation.e.apps.api.fdroid.FdroidDao -import foundation.e.apps.api.fdroid.models.FdroidEntity +import foundation.e.apps.data.exodus.Tracker +import foundation.e.apps.data.exodus.TrackerDao +import foundation.e.apps.data.faultyApps.FaultyApp +import foundation.e.apps.data.faultyApps.FaultyAppDao +import foundation.e.apps.data.fdroid.FdroidDao +import foundation.e.apps.data.fdroid.models.FdroidEntity @Database( entities = [Tracker::class, FdroidEntity::class, FaultyApp::class], diff --git a/app/src/main/java/foundation/e/apps/manager/database/DatabaseModule.kt b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/DatabaseModule.kt similarity index 82% rename from app/src/main/java/foundation/e/apps/manager/database/DatabaseModule.kt rename to app/src/main/java/foundation/e/apps/data/database/fusedDownload/DatabaseModule.kt index d2cf3fd03..2c0085234 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/DatabaseModule.kt +++ b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/DatabaseModule.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.database +package foundation.e.apps.data.database.fusedDownload import android.content.Context import dagger.Module @@ -6,7 +6,6 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import foundation.e.apps.manager.database.fusedDownload.FusedDownloadDAO import javax.inject.Singleton @Module diff --git a/app/src/main/java/foundation/e/apps/manager/database/DatabaseRepository.kt b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/DatabaseRepository.kt similarity index 86% rename from app/src/main/java/foundation/e/apps/manager/database/DatabaseRepository.kt rename to app/src/main/java/foundation/e/apps/data/database/fusedDownload/DatabaseRepository.kt index bc2614918..bcf02cfee 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/DatabaseRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/DatabaseRepository.kt @@ -1,10 +1,8 @@ -package foundation.e.apps.manager.database +package foundation.e.apps.data.database.fusedDownload import androidx.lifecycle.LiveData import androidx.lifecycle.asFlow import foundation.e.apps.OpenForTesting -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.database.fusedDownload.FusedDownloadDAO import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/app/src/main/java/foundation/e/apps/manager/database/FusedConverter.kt b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedConverter.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/manager/database/FusedConverter.kt rename to app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedConverter.kt index adc654cc5..285c0e945 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/FusedConverter.kt +++ b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedConverter.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.database +package foundation.e.apps.data.database.fusedDownload import androidx.room.TypeConverter import com.aurora.gplayapi.data.models.File diff --git a/app/src/main/java/foundation/e/apps/manager/database/FusedDatabase.kt b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDatabase.kt similarity index 78% rename from app/src/main/java/foundation/e/apps/manager/database/FusedDatabase.kt rename to app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDatabase.kt index 3a307ef88..071b4765d 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/FusedDatabase.kt +++ b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDatabase.kt @@ -1,13 +1,11 @@ -package foundation.e.apps.manager.database +package foundation.e.apps.data.database.fusedDownload import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters -import foundation.e.apps.api.database.AppDatabase -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.database.fusedDownload.FusedDownloadDAO +import foundation.e.apps.data.database.AppDatabase @Database(entities = [FusedDownload::class], version = 3, exportSchema = false) @TypeConverters(FusedConverter::class) diff --git a/app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownload.kt b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownload.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownload.kt rename to app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownload.kt index 377ad26f7..d859e0839 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownload.kt +++ b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownload.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.database.fusedDownload +package foundation.e.apps.data.database.fusedDownload import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownloadDAO.kt b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownloadDAO.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownloadDAO.kt rename to app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownloadDAO.kt index a5311262b..fecb441fb 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownloadDAO.kt +++ b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownloadDAO.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.database.fusedDownload +package foundation.e.apps.data.database.fusedDownload import androidx.lifecycle.LiveData import androidx.room.Dao diff --git a/app/src/main/java/foundation/e/apps/api/ecloud/EcloudApiInterface.kt b/app/src/main/java/foundation/e/apps/data/ecloud/EcloudApiInterface.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/api/ecloud/EcloudApiInterface.kt rename to app/src/main/java/foundation/e/apps/data/ecloud/EcloudApiInterface.kt index 55b8cd67d..e22a3d121 100644 --- a/app/src/main/java/foundation/e/apps/api/ecloud/EcloudApiInterface.kt +++ b/app/src/main/java/foundation/e/apps/data/ecloud/EcloudApiInterface.kt @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.ecloud +package foundation.e.apps.data.ecloud -import foundation.e.apps.api.ecloud.modules.FaultyToken +import foundation.e.apps.data.ecloud.modules.FaultyToken import retrofit2.http.Body import retrofit2.http.Headers import retrofit2.http.POST diff --git a/app/src/main/java/foundation/e/apps/api/ecloud/EcloudRepository.kt b/app/src/main/java/foundation/e/apps/data/ecloud/EcloudRepository.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/api/ecloud/EcloudRepository.kt rename to app/src/main/java/foundation/e/apps/data/ecloud/EcloudRepository.kt index 27fb20699..941735dc8 100644 --- a/app/src/main/java/foundation/e/apps/api/ecloud/EcloudRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/ecloud/EcloudRepository.kt @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.ecloud +package foundation.e.apps.data.ecloud -import foundation.e.apps.api.ecloud.modules.FaultyToken +import foundation.e.apps.data.ecloud.modules.FaultyToken import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/api/ecloud/modules/FaultyToken.kt b/app/src/main/java/foundation/e/apps/data/ecloud/modules/FaultyToken.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/api/ecloud/modules/FaultyToken.kt rename to app/src/main/java/foundation/e/apps/data/ecloud/modules/FaultyToken.kt index f8693271d..8091d36d4 100644 --- a/app/src/main/java/foundation/e/apps/api/ecloud/modules/FaultyToken.kt +++ b/app/src/main/java/foundation/e/apps/data/ecloud/modules/FaultyToken.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.ecloud.modules +package foundation.e.apps.data.ecloud.modules data class FaultyToken( val email: String, diff --git a/app/src/main/java/foundation/e/apps/api/exodus/ExodusTrackerApi.kt b/app/src/main/java/foundation/e/apps/data/exodus/ExodusTrackerApi.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/api/exodus/ExodusTrackerApi.kt rename to app/src/main/java/foundation/e/apps/data/exodus/ExodusTrackerApi.kt index 4fe785603..a9f48731a 100644 --- a/app/src/main/java/foundation/e/apps/api/exodus/ExodusTrackerApi.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/ExodusTrackerApi.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api.exodus +package foundation.e.apps.data.exodus import retrofit2.Response import retrofit2.http.GET diff --git a/app/src/main/java/foundation/e/apps/api/exodus/TrackerApiResponse.kt b/app/src/main/java/foundation/e/apps/data/exodus/TrackerApiResponse.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/api/exodus/TrackerApiResponse.kt rename to app/src/main/java/foundation/e/apps/data/exodus/TrackerApiResponse.kt index 54cd8707c..44dc8f4be 100644 --- a/app/src/main/java/foundation/e/apps/api/exodus/TrackerApiResponse.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/TrackerApiResponse.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api.exodus +package foundation.e.apps.data.exodus import com.squareup.moshi.Json diff --git a/app/src/main/java/foundation/e/apps/api/exodus/TrackerDao.kt b/app/src/main/java/foundation/e/apps/data/exodus/TrackerDao.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/api/exodus/TrackerDao.kt rename to app/src/main/java/foundation/e/apps/data/exodus/TrackerDao.kt index d6de8b5eb..ebdc7d1d7 100644 --- a/app/src/main/java/foundation/e/apps/api/exodus/TrackerDao.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/TrackerDao.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api.exodus +package foundation.e.apps.data.exodus import androidx.room.Dao import androidx.room.Insert diff --git a/app/src/main/java/foundation/e/apps/api/exodus/models/AppPrivacyInfo.kt b/app/src/main/java/foundation/e/apps/data/exodus/models/AppPrivacyInfo.kt similarity index 75% rename from app/src/main/java/foundation/e/apps/api/exodus/models/AppPrivacyInfo.kt rename to app/src/main/java/foundation/e/apps/data/exodus/models/AppPrivacyInfo.kt index d7074a293..e1a1af00f 100644 --- a/app/src/main/java/foundation/e/apps/api/exodus/models/AppPrivacyInfo.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/models/AppPrivacyInfo.kt @@ -1,3 +1,3 @@ -package foundation.e.apps.api.exodus.models +package foundation.e.apps.data.exodus.models data class AppPrivacyInfo(val trackerList: List = listOf(), val permissionList: List = listOf(), val reportId: Long = -1L) diff --git a/app/src/main/java/foundation/e/apps/api/exodus/models/Trackers.kt b/app/src/main/java/foundation/e/apps/data/exodus/models/Trackers.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/api/exodus/models/Trackers.kt rename to app/src/main/java/foundation/e/apps/data/exodus/models/Trackers.kt index 1c6d948ea..49f19e31f 100644 --- a/app/src/main/java/foundation/e/apps/api/exodus/models/Trackers.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/models/Trackers.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api.exodus +package foundation.e.apps.data.exodus import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/foundation/e/apps/api/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/api/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt rename to app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt index 2a6be501c..d9c327ea0 100644 --- a/app/src/main/java/foundation/e/apps/api/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/AppPrivacyInfoRepositoryImpl.kt @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.exodus.repositories - -import foundation.e.apps.api.Result -import foundation.e.apps.api.exodus.ExodusTrackerApi -import foundation.e.apps.api.exodus.Report -import foundation.e.apps.api.exodus.Tracker -import foundation.e.apps.api.exodus.TrackerDao -import foundation.e.apps.api.exodus.models.AppPrivacyInfo -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.getResult +package foundation.e.apps.data.exodus.repositories + +import foundation.e.apps.data.Result +import foundation.e.apps.data.exodus.ExodusTrackerApi +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.FusedApp +import foundation.e.apps.data.getResult import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.getFormattedString import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL 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 new file mode 100644 index 000000000..213c96cf0 --- /dev/null +++ b/app/src/main/java/foundation/e/apps/data/exodus/repositories/IAppPrivacyInfoRepository.kt @@ -0,0 +1,10 @@ +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.FusedApp + +interface IAppPrivacyInfoRepository { + suspend fun getAppPrivacyInfo(fusedApp: FusedApp, appHandle: String): Result + fun calculatePrivacyScore(fusedApp: FusedApp): Int +} diff --git a/app/src/main/java/foundation/e/apps/api/faultyApps/FaultyApp.kt b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyApp.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/api/faultyApps/FaultyApp.kt rename to app/src/main/java/foundation/e/apps/data/faultyApps/FaultyApp.kt index 36c1af2e0..82163fc98 100644 --- a/app/src/main/java/foundation/e/apps/api/faultyApps/FaultyApp.kt +++ b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyApp.kt @@ -18,7 +18,7 @@ * */ -package foundation.e.apps.api.faultyApps +package foundation.e.apps.data.faultyApps import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/foundation/e/apps/api/faultyApps/FaultyAppDao.kt b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppDao.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/faultyApps/FaultyAppDao.kt rename to app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppDao.kt index 0218ebf6d..d9fdc06a8 100644 --- a/app/src/main/java/foundation/e/apps/api/faultyApps/FaultyAppDao.kt +++ b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppDao.kt @@ -18,7 +18,7 @@ * */ -package foundation.e.apps.api.faultyApps +package foundation.e.apps.data.faultyApps import androidx.room.Dao import androidx.room.Insert diff --git a/app/src/main/java/foundation/e/apps/api/faultyApps/FaultyAppRepository.kt b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/api/faultyApps/FaultyAppRepository.kt rename to app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt index 479460fb7..31a5059c7 100644 --- a/app/src/main/java/foundation/e/apps/api/faultyApps/FaultyAppRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/faultyApps/FaultyAppRepository.kt @@ -18,10 +18,10 @@ * */ -package foundation.e.apps.api.faultyApps +package foundation.e.apps.data.faultyApps import foundation.e.apps.OpenForTesting -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidApiInterface.kt b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidApiInterface.kt similarity index 69% rename from app/src/main/java/foundation/e/apps/api/fdroid/FdroidApiInterface.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/FdroidApiInterface.kt index b0e6fccf7..0480873f1 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidApiInterface.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidApiInterface.kt @@ -1,13 +1,13 @@ -package foundation.e.apps.api.fdroid +package foundation.e.apps.data.fdroid -import foundation.e.apps.api.fdroid.models.FdroidApiModel +import foundation.e.apps.data.fdroid.models.FdroidApiModel import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Path /** * Interface for retrofit calls. - * Created from [foundation.e.apps.api.cleanapk.RetrofitModule.provideFdroidApi]. + * Created from [foundation.e.apps.data.cleanapk.RetrofitModule.provideFdroidApi]. */ interface FdroidApiInterface { diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidDao.kt b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidDao.kt similarity index 85% rename from app/src/main/java/foundation/e/apps/api/fdroid/FdroidDao.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/FdroidDao.kt index e08cc5c37..19576d5ea 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidDao.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidDao.kt @@ -1,10 +1,10 @@ -package foundation.e.apps.api.fdroid +package foundation.e.apps.data.fdroid import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import foundation.e.apps.api.fdroid.models.FdroidEntity +import foundation.e.apps.data.fdroid.models.FdroidEntity /** * Dao interface for storing Fdroid info in DB. diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidRepository.kt b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt similarity index 89% rename from app/src/main/java/foundation/e/apps/api/fdroid/FdroidRepository.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt index 99ee0f1e7..29a2dc542 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidRepository.kt @@ -1,10 +1,10 @@ -package foundation.e.apps.api.fdroid +package foundation.e.apps.data.fdroid import android.content.Context -import foundation.e.apps.api.cleanapk.ApkSignatureManager -import foundation.e.apps.api.fdroid.models.BuildInfo -import foundation.e.apps.api.fdroid.models.FdroidEntity -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.cleanapk.ApkSignatureManager +import foundation.e.apps.data.fdroid.models.BuildInfo +import foundation.e.apps.data.fdroid.models.FdroidEntity +import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.utils.enums.Origin import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidWebInterface.kt b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidWebInterface.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/fdroid/FdroidWebInterface.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/FdroidWebInterface.kt index 14047877e..0d3917ec7 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/FdroidWebInterface.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/FdroidWebInterface.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fdroid +package foundation.e.apps.data.fdroid import okhttp3.ResponseBody import retrofit2.Response diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/IFdroidRepository.kt b/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/api/fdroid/IFdroidRepository.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt index 2e18be4cf..d93926d5e 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/IFdroidRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/IFdroidRepository.kt @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fdroid +package foundation.e.apps.data.fdroid import android.content.Context -import foundation.e.apps.api.fdroid.models.FdroidEntity -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fdroid.models.FdroidEntity +import foundation.e.apps.data.fused.data.FusedApp interface IFdroidRepository { /** diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/models/BuildInfo.kt b/app/src/main/java/foundation/e/apps/data/fdroid/models/BuildInfo.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/fdroid/models/BuildInfo.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/models/BuildInfo.kt index 047395ded..4b8062869 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/models/BuildInfo.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/models/BuildInfo.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fdroid.models +package foundation.e.apps.data.fdroid.models import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnoreProperties diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/models/FdroidApiModel.kt b/app/src/main/java/foundation/e/apps/data/fdroid/models/FdroidApiModel.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/fdroid/models/FdroidApiModel.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/models/FdroidApiModel.kt index e25eece59..172bb8802 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/models/FdroidApiModel.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/models/FdroidApiModel.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api.fdroid.models +package foundation.e.apps.data.fdroid.models import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnoreProperties diff --git a/app/src/main/java/foundation/e/apps/api/fdroid/models/FdroidEntity.kt b/app/src/main/java/foundation/e/apps/data/fdroid/models/FdroidEntity.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/api/fdroid/models/FdroidEntity.kt rename to app/src/main/java/foundation/e/apps/data/fdroid/models/FdroidEntity.kt index 88f1a3663..ee89a2cdb 100644 --- a/app/src/main/java/foundation/e/apps/api/fdroid/models/FdroidEntity.kt +++ b/app/src/main/java/foundation/e/apps/data/fdroid/models/FdroidEntity.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.api.fdroid.models +package foundation.e.apps.data.fdroid.models import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIImpl.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt rename to app/src/main/java/foundation/e/apps/data/fused/FusedAPIImpl.kt index 180b3ecbf..d8217afdc 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIImpl.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused +package foundation.e.apps.data.fused import android.content.Context import android.text.format.Formatter @@ -33,26 +33,26 @@ import com.aurora.gplayapi.data.models.StreamBundle import com.aurora.gplayapi.data.models.Artwork import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.api.cleanapk.CleanApkDownloadInfoFetcher -import foundation.e.apps.api.cleanapk.CleanApkRepository -import foundation.e.apps.api.cleanapk.data.app.Application -import foundation.e.apps.api.cleanapk.data.categories.Categories -import foundation.e.apps.api.cleanapk.data.home.Home -import foundation.e.apps.api.cleanapk.data.home.HomeScreen -import foundation.e.apps.api.cleanapk.data.search.Search -import foundation.e.apps.api.fdroid.FdroidWebInterface -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.fused.data.FusedCategory -import foundation.e.apps.api.fused.data.FusedHome -import foundation.e.apps.api.fused.data.Ratings -import foundation.e.apps.api.fused.utils.CategoryType -import foundation.e.apps.api.fused.utils.CategoryUtils -import foundation.e.apps.api.gplay.GplayStoreRepository -import foundation.e.apps.home.model.HomeChildFusedAppDiffUtil -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.pkg.PkgManagerModule +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher +import foundation.e.apps.data.cleanapk.CleanApkRepository +import foundation.e.apps.data.cleanapk.data.app.Application +import foundation.e.apps.data.cleanapk.data.categories.Categories +import foundation.e.apps.data.cleanapk.data.home.Home +import foundation.e.apps.data.cleanapk.data.home.HomeScreen +import foundation.e.apps.data.cleanapk.data.search.Search +import foundation.e.apps.data.fdroid.FdroidWebInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedCategory +import foundation.e.apps.data.fused.data.FusedHome +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.gplay.GplayStoreRepository +import foundation.e.apps.ui.home.model.HomeChildFusedAppDiffUtil +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.utils.Constants.timeoutDurationInMillis import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Status diff --git a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIInterface.kt b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIInterface.kt similarity index 89% rename from app/src/main/java/foundation/e/apps/api/fused/FusedAPIInterface.kt rename to app/src/main/java/foundation/e/apps/data/fused/FusedAPIInterface.kt index 9b18836ed..c60312deb 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIInterface.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIInterface.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused +package foundation.e.apps.data.fused import android.widget.ImageView -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp /** * FusedAPIInterface to allow adapter classes to install applications easily diff --git a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIRepository.kt b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/api/fused/FusedAPIRepository.kt rename to app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt index 4af6c8c3c..dded8b8b9 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused +package foundation.e.apps.data.fused import androidx.lifecycle.LiveData import com.aurora.gplayapi.SearchSuggestEntry @@ -24,12 +24,12 @@ import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.StreamBundle import com.aurora.gplayapi.data.models.StreamCluster -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.fused.data.FusedCategory -import foundation.e.apps.api.fused.data.FusedHome -import foundation.e.apps.api.fused.utils.CategoryType -import foundation.e.apps.manager.database.fusedDownload.FusedDownload +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedCategory +import foundation.e.apps.data.fused.data.FusedHome +import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.utils.enums.FilterLevel import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.ResultStatus diff --git a/app/src/main/java/foundation/e/apps/api/fused/UpdatesDao.kt b/app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/api/fused/UpdatesDao.kt rename to app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt index 30e989c2d..b5e9d0b62 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/UpdatesDao.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/UpdatesDao.kt @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused +package foundation.e.apps.data.fused -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.manager.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.database.fusedDownload.FusedDownload object UpdatesDao { private val _appsAwaitingForUpdate: MutableList = mutableListOf() diff --git a/app/src/main/java/foundation/e/apps/api/fused/data/FusedApp.kt b/app/src/main/java/foundation/e/apps/data/fused/data/FusedApp.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/fused/data/FusedApp.kt rename to app/src/main/java/foundation/e/apps/data/fused/data/FusedApp.kt index 410a237e2..d8cece0ea 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/data/FusedApp.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/data/FusedApp.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused.data +package foundation.e.apps.data.fused.data import com.aurora.gplayapi.Constants.Restriction import foundation.e.apps.utils.enums.FilterLevel diff --git a/app/src/main/java/foundation/e/apps/api/fused/data/FusedCategory.kt b/app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/api/fused/data/FusedCategory.kt rename to app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt index e64d4dd6b..96bc44188 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/data/FusedCategory.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused.data +package foundation.e.apps.data.fused.data import foundation.e.apps.utils.enums.AppTag import java.util.UUID diff --git a/app/src/main/java/foundation/e/apps/api/fused/data/FusedHome.kt b/app/src/main/java/foundation/e/apps/data/fused/data/FusedHome.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/api/fused/data/FusedHome.kt rename to app/src/main/java/foundation/e/apps/data/fused/data/FusedHome.kt index 1cb8cf996..e876c3be0 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/data/FusedHome.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/data/FusedHome.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused.data +package foundation.e.apps.data.fused.data data class FusedHome( val title: String = String(), diff --git a/app/src/main/java/foundation/e/apps/api/fused/data/Ratings.kt b/app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/api/fused/data/Ratings.kt rename to app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt index 7292f15e9..29f5bc87a 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/data/Ratings.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/data/Ratings.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused.data +package foundation.e.apps.data.fused.data data class Ratings( val privacyScore: Double = -1.0, diff --git a/app/src/main/java/foundation/e/apps/api/fused/utils/CategoryUtils.kt b/app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/fused/utils/CategoryUtils.kt rename to app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt index 8b203a6b7..5e31be48b 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/utils/CategoryUtils.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/utils/CategoryUtils.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.fused.utils +package foundation.e.apps.data.fused.utils import foundation.e.apps.R diff --git a/app/src/main/java/foundation/e/apps/manager/fused/FileManager.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FileManager.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/manager/fused/FileManager.kt rename to app/src/main/java/foundation/e/apps/data/fusedDownload/FileManager.kt index 209d77052..63ff614d0 100644 --- a/app/src/main/java/foundation/e/apps/manager/fused/FileManager.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FileManager.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.fused +package foundation.e.apps.data.fusedDownload import timber.log.Timber import java.io.File diff --git a/app/src/main/java/foundation/e/apps/manager/fused/FusedManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/fused/FusedManagerImpl.kt rename to app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt index 3f20b77d2..bf25b4c2f 100644 --- a/app/src/main/java/foundation/e/apps/manager/fused/FusedManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.fused +package foundation.e.apps.data.fusedDownload import android.app.DownloadManager import android.app.NotificationChannel @@ -29,10 +29,10 @@ import androidx.annotation.RequiresApi import androidx.lifecycle.LiveData import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.manager.database.DatabaseRepository -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.download.data.DownloadProgressLD -import foundation.e.apps.manager.pkg.PkgManagerModule +import foundation.e.apps.data.database.fusedDownload.DatabaseRepository +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.install.download.data.DownloadProgressLD +import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.enums.Type import foundation.e.apps.utils.modules.PWAManagerModule diff --git a/app/src/main/java/foundation/e/apps/manager/fused/FusedManagerRepository.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/manager/fused/FusedManagerRepository.kt rename to app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt index 9a433e971..bbac284e9 100644 --- a/app/src/main/java/foundation/e/apps/manager/fused/FusedManagerRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.fused +package foundation.e.apps.data.fusedDownload import android.content.Context import android.os.Build @@ -6,11 +6,11 @@ import androidx.annotation.RequiresApi import androidx.lifecycle.LiveData import androidx.lifecycle.asFlow import foundation.e.apps.OpenForTesting -import foundation.e.apps.api.fdroid.FdroidRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.download.data.DownloadProgress -import foundation.e.apps.manager.workmanager.InstallWorkManager +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.workmanager.InstallWorkManager import foundation.e.apps.utils.enums.Status import kotlinx.coroutines.flow.Flow import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/manager/fused/IFusedManager.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/IFusedManager.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/fused/IFusedManager.kt rename to app/src/main/java/foundation/e/apps/data/fusedDownload/IFusedManager.kt index 4777f2582..6707a5102 100644 --- a/app/src/main/java/foundation/e/apps/manager/fused/IFusedManager.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/IFusedManager.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.fused +package foundation.e.apps.data.fusedDownload import androidx.lifecycle.LiveData -import foundation.e.apps.manager.database.fusedDownload.FusedDownload +import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.utils.enums.Status import java.io.File diff --git a/app/src/main/java/foundation/e/apps/api/gplay/GPlayAPIImpl.kt b/app/src/main/java/foundation/e/apps/data/gplay/GPlayAPIImpl.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/gplay/GPlayAPIImpl.kt rename to app/src/main/java/foundation/e/apps/data/gplay/GPlayAPIImpl.kt index f68b6680e..cb59857d9 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/GPlayAPIImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/GPlayAPIImpl.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay +package foundation.e.apps.data.gplay import androidx.lifecycle.LiveData import androidx.lifecycle.LiveDataScope @@ -36,8 +36,8 @@ import com.aurora.gplayapi.helpers.PurchaseHelper import com.aurora.gplayapi.helpers.SearchHelper import com.aurora.gplayapi.helpers.StreamHelper import com.aurora.gplayapi.helpers.TopChartsHelper -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.gplay.utils.GPlayHttpClient +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.gplay.utils.GPlayHttpClient import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.withContext diff --git a/app/src/main/java/foundation/e/apps/api/gplay/GPlayAPIRepository.kt b/app/src/main/java/foundation/e/apps/data/gplay/GPlayAPIRepository.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/api/gplay/GPlayAPIRepository.kt rename to app/src/main/java/foundation/e/apps/data/gplay/GPlayAPIRepository.kt index 4475cb03a..6e99a0a27 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/GPlayAPIRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/GPlayAPIRepository.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay +package foundation.e.apps.data.gplay import androidx.lifecycle.LiveData import com.aurora.gplayapi.SearchSuggestEntry @@ -27,7 +27,7 @@ import com.aurora.gplayapi.data.models.File import com.aurora.gplayapi.data.models.StreamBundle import com.aurora.gplayapi.data.models.StreamCluster import com.aurora.gplayapi.helpers.TopChartsHelper -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp import javax.inject.Inject class GPlayAPIRepository @Inject constructor(private val gPlayAPIImpl: GPlayAPIImpl) { diff --git a/app/src/main/java/foundation/e/apps/api/gplay/GplayStoreRepository.kt b/app/src/main/java/foundation/e/apps/data/gplay/GplayStoreRepository.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/api/gplay/GplayStoreRepository.kt rename to app/src/main/java/foundation/e/apps/data/gplay/GplayStoreRepository.kt index 2b31ed7eb..9356b6825 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/GplayStoreRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/GplayStoreRepository.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay +package foundation.e.apps.data.gplay import com.aurora.gplayapi.SearchSuggestEntry import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.Category import com.aurora.gplayapi.data.models.File -import foundation.e.apps.api.BaseStoreRepository -import foundation.e.apps.api.fused.utils.CategoryType +import foundation.e.apps.data.BaseStoreRepository +import foundation.e.apps.data.fused.utils.CategoryType import kotlinx.coroutines.flow.Flow interface GplayStoreRepository : BaseStoreRepository { diff --git a/app/src/main/java/foundation/e/apps/api/gplay/GplayStoreRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/gplay/GplayStoreRepositoryImpl.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/api/gplay/GplayStoreRepositoryImpl.kt rename to app/src/main/java/foundation/e/apps/data/gplay/GplayStoreRepositoryImpl.kt index 6184a8737..10a83b7dc 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/GplayStoreRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/GplayStoreRepositoryImpl.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay +package foundation.e.apps.data.gplay import android.content.Context import com.aurora.gplayapi.SearchSuggestEntry @@ -24,9 +24,9 @@ import com.aurora.gplayapi.data.models.* import com.aurora.gplayapi.helpers.* import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.api.fused.utils.CategoryType -import foundation.e.apps.api.gplay.utils.GPlayHttpClient -import foundation.e.apps.login.LoginSourceRepository +import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.gplay.utils.GPlayHttpClient +import foundation.e.apps.data.login.LoginSourceRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.FlowCollector diff --git a/app/src/main/java/foundation/e/apps/api/gplay/utils/AC2DMTask.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/AC2DMTask.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/api/gplay/utils/AC2DMTask.kt rename to app/src/main/java/foundation/e/apps/data/gplay/utils/AC2DMTask.kt index 9c3dc609c..448c45904 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/utils/AC2DMTask.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/AC2DMTask.kt @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay.utils +package foundation.e.apps.data.gplay.utils import com.aurora.gplayapi.data.models.PlayResponse import okhttp3.RequestBody.Companion.toRequestBody diff --git a/app/src/main/java/foundation/e/apps/api/gplay/utils/AC2DMUtil.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/AC2DMUtil.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/api/gplay/utils/AC2DMUtil.kt rename to app/src/main/java/foundation/e/apps/data/gplay/utils/AC2DMUtil.kt index 31b70e7d0..fefe386eb 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/utils/AC2DMUtil.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/AC2DMUtil.kt @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay.utils +package foundation.e.apps.data.gplay.utils import java.util.StringTokenizer import java.util.regex.Pattern diff --git a/app/src/main/java/foundation/e/apps/api/gplay/utils/CustomAuthValidator.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/CustomAuthValidator.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/api/gplay/utils/CustomAuthValidator.kt rename to app/src/main/java/foundation/e/apps/data/gplay/utils/CustomAuthValidator.kt index 068ffa41a..2bfb68252 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/utils/CustomAuthValidator.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/CustomAuthValidator.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay.utils +package foundation.e.apps.data.gplay.utils import com.aurora.gplayapi.GooglePlayApi import com.aurora.gplayapi.data.models.AuthData diff --git a/app/src/main/java/foundation/e/apps/api/gplay/utils/EglExtensionProvider.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/EglExtensionProvider.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/gplay/utils/EglExtensionProvider.kt rename to app/src/main/java/foundation/e/apps/data/gplay/utils/EglExtensionProvider.kt index e2f226b98..3b36d3d2a 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/utils/EglExtensionProvider.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/EglExtensionProvider.kt @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay.utils +package foundation.e.apps.data.gplay.utils import android.opengl.GLES10 import android.text.TextUtils diff --git a/app/src/main/java/foundation/e/apps/api/gplay/utils/GPlayHttpClient.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/GPlayHttpClient.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/api/gplay/utils/GPlayHttpClient.kt rename to app/src/main/java/foundation/e/apps/data/gplay/utils/GPlayHttpClient.kt index 9876fa4d1..ec3fce250 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/utils/GPlayHttpClient.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/GPlayHttpClient.kt @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay.utils +package foundation.e.apps.data.gplay.utils import com.aurora.gplayapi.data.models.PlayResponse import com.aurora.gplayapi.network.IHttpClient -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus import foundation.e.apps.utils.modules.CommonUtilsFunctions diff --git a/app/src/main/java/foundation/e/apps/api/gplay/utils/NativeDeviceInfoProviderModule.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/NativeDeviceInfoProviderModule.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/gplay/utils/NativeDeviceInfoProviderModule.kt rename to app/src/main/java/foundation/e/apps/data/gplay/utils/NativeDeviceInfoProviderModule.kt index 552b7c2e1..53a70ff93 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/utils/NativeDeviceInfoProviderModule.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/NativeDeviceInfoProviderModule.kt @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay.utils +package foundation.e.apps.data.gplay.utils import android.app.ActivityManager import android.content.Context diff --git a/app/src/main/java/foundation/e/apps/api/gplay/utils/NativeGsfVersionProvider.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/NativeGsfVersionProvider.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/api/gplay/utils/NativeGsfVersionProvider.kt rename to app/src/main/java/foundation/e/apps/data/gplay/utils/NativeGsfVersionProvider.kt index 590df58ce..40ab7b2fc 100644 --- a/app/src/main/java/foundation/e/apps/api/gplay/utils/NativeGsfVersionProvider.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/NativeGsfVersionProvider.kt @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.gplay.utils +package foundation.e.apps.data.gplay.utils import android.content.Context import android.content.pm.PackageManager diff --git a/app/src/main/java/foundation/e/apps/login/AuthDataValidator.kt b/app/src/main/java/foundation/e/apps/data/login/AuthDataValidator.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/login/AuthDataValidator.kt rename to app/src/main/java/foundation/e/apps/data/login/AuthDataValidator.kt index 32bcc7bd7..12c5947ca 100644 --- a/app/src/main/java/foundation/e/apps/login/AuthDataValidator.kt +++ b/app/src/main/java/foundation/e/apps/data/login/AuthDataValidator.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login import com.aurora.gplayapi.data.models.AuthData -import foundation.e.apps.api.ResultSupreme +import foundation.e.apps.data.ResultSupreme interface AuthDataValidator { suspend fun validateAuthData(): ResultSupreme diff --git a/app/src/main/java/foundation/e/apps/login/AuthObject.kt b/app/src/main/java/foundation/e/apps/data/login/AuthObject.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/login/AuthObject.kt rename to app/src/main/java/foundation/e/apps/data/login/AuthObject.kt index f08ca43a8..8a20bdd70 100644 --- a/app/src/main/java/foundation/e/apps/login/AuthObject.kt +++ b/app/src/main/java/foundation/e/apps/data/login/AuthObject.kt @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login import com.aurora.gplayapi.data.models.AuthData -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.login.AuthObject.GPlayAuth +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.login.AuthObject.GPlayAuth import foundation.e.apps.utils.enums.User import foundation.e.apps.utils.exceptions.CleanApkException import foundation.e.apps.utils.exceptions.GPlayValidationException diff --git a/app/src/main/java/foundation/e/apps/login/LoginCommon.kt b/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/login/LoginCommon.kt rename to app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt index e17d0997b..02148a502 100644 --- a/app/src/main/java/foundation/e/apps/login/LoginCommon.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login import foundation.e.apps.utils.Constants import foundation.e.apps.utils.enums.User diff --git a/app/src/main/java/foundation/e/apps/login/LoginDataStore.kt b/app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt similarity index 99% rename from app/src/main/java/foundation/e/apps/login/LoginDataStore.kt rename to app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt index 1d544a0f7..2510651dd 100644 --- a/app/src/main/java/foundation/e/apps/login/LoginDataStore.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login import android.content.Context import androidx.datastore.preferences.core.edit diff --git a/app/src/main/java/foundation/e/apps/login/LoginSourceCleanApk.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/login/LoginSourceCleanApk.kt rename to app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt index 2b8f4eadc..01c41423b 100644 --- a/app/src/main/java/foundation/e/apps/login/LoginSourceCleanApk.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login -import foundation.e.apps.api.ResultSupreme +import foundation.e.apps.data.ResultSupreme import foundation.e.apps.utils.enums.User import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/login/LoginSourceGPlay.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/login/LoginSourceGPlay.kt rename to app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt index 323ae6e82..ac7cfb698 100644 --- a/app/src/main/java/foundation/e/apps/login/LoginSourceGPlay.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt @@ -15,17 +15,17 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login import android.content.Context import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.qualifiers.ApplicationContext -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.login.api.GPlayApiFactory -import foundation.e.apps.login.api.GPlayLoginInterface -import foundation.e.apps.login.api.GoogleLoginApi -import foundation.e.apps.login.api.LoginApiRepository +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.login.api.GPlayApiFactory +import foundation.e.apps.data.login.api.GPlayLoginInterface +import foundation.e.apps.data.login.api.GoogleLoginApi +import foundation.e.apps.data.login.api.LoginApiRepository import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.User import foundation.e.apps.utils.exceptions.GPlayValidationException diff --git a/app/src/main/java/foundation/e/apps/login/LoginSourceInterface.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceInterface.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/login/LoginSourceInterface.kt rename to app/src/main/java/foundation/e/apps/data/login/LoginSourceInterface.kt index 79250e87e..c4cc34ce1 100644 --- a/app/src/main/java/foundation/e/apps/login/LoginSourceInterface.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginSourceInterface.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login /** * Interface that defines what methods a login source must define. diff --git a/app/src/main/java/foundation/e/apps/login/LoginSourceRepository.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/login/LoginSourceRepository.kt rename to app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt index 140de79e7..5a8ccf26a 100644 --- a/app/src/main/java/foundation/e/apps/login/LoginSourceRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login import com.aurora.gplayapi.data.models.AuthData -import foundation.e.apps.api.ResultSupreme +import foundation.e.apps.data.ResultSupreme import foundation.e.apps.utils.enums.User import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/login/LoginViewModel.kt b/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt similarity index 99% rename from app/src/main/java/foundation/e/apps/login/LoginViewModel.kt rename to app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt index ad43bda72..15916228c 100644 --- a/app/src/main/java/foundation/e/apps/login/LoginViewModel.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.login +package foundation.e.apps.data.login import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/foundation/e/apps/login/api/AnonymousLoginApi.kt b/app/src/main/java/foundation/e/apps/data/login/api/AnonymousLoginApi.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/login/api/AnonymousLoginApi.kt rename to app/src/main/java/foundation/e/apps/data/login/api/AnonymousLoginApi.kt index d667ad934..edd0d15a2 100644 --- a/app/src/main/java/foundation/e/apps/login/api/AnonymousLoginApi.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/AnonymousLoginApi.kt @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package foundation.e.apps.login.api +package foundation.e.apps.data.login.api import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.PlayResponse import com.google.gson.Gson -import foundation.e.apps.api.gplay.utils.CustomAuthValidator -import foundation.e.apps.api.gplay.utils.GPlayHttpClient +import foundation.e.apps.data.gplay.utils.CustomAuthValidator +import foundation.e.apps.data.gplay.utils.GPlayHttpClient import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.util.Properties diff --git a/app/src/main/java/foundation/e/apps/login/api/GPlayApiFactory.kt b/app/src/main/java/foundation/e/apps/data/login/api/GPlayApiFactory.kt similarity index 89% rename from app/src/main/java/foundation/e/apps/login/api/GPlayApiFactory.kt rename to app/src/main/java/foundation/e/apps/data/login/api/GPlayApiFactory.kt index a910d525d..6ac998756 100644 --- a/app/src/main/java/foundation/e/apps/login/api/GPlayApiFactory.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/GPlayApiFactory.kt @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.login.api +package foundation.e.apps.data.login.api import com.google.gson.Gson -import foundation.e.apps.api.gplay.utils.AC2DMTask -import foundation.e.apps.api.gplay.utils.GPlayHttpClient +import foundation.e.apps.data.gplay.utils.AC2DMTask +import foundation.e.apps.data.gplay.utils.GPlayHttpClient import foundation.e.apps.utils.enums.User import java.util.Properties import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/login/api/GPlayLoginInterface.kt b/app/src/main/java/foundation/e/apps/data/login/api/GPlayLoginInterface.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/login/api/GPlayLoginInterface.kt rename to app/src/main/java/foundation/e/apps/data/login/api/GPlayLoginInterface.kt index 24b212bbc..d1159caae 100644 --- a/app/src/main/java/foundation/e/apps/login/api/GPlayLoginInterface.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/GPlayLoginInterface.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.login.api +package foundation.e.apps.data.login.api import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.PlayResponse diff --git a/app/src/main/java/foundation/e/apps/login/api/GoogleLoginApi.kt b/app/src/main/java/foundation/e/apps/data/login/api/GoogleLoginApi.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/login/api/GoogleLoginApi.kt rename to app/src/main/java/foundation/e/apps/data/login/api/GoogleLoginApi.kt index ffcc455f8..4331d473a 100644 --- a/app/src/main/java/foundation/e/apps/login/api/GoogleLoginApi.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/GoogleLoginApi.kt @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -package foundation.e.apps.login.api +package foundation.e.apps.data.login.api import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.PlayResponse import com.aurora.gplayapi.helpers.AuthHelper -import foundation.e.apps.api.gplay.utils.AC2DMTask -import foundation.e.apps.api.gplay.utils.CustomAuthValidator -import foundation.e.apps.api.gplay.utils.GPlayHttpClient +import foundation.e.apps.data.gplay.utils.AC2DMTask +import foundation.e.apps.data.gplay.utils.CustomAuthValidator +import foundation.e.apps.data.gplay.utils.GPlayHttpClient import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.util.Properties diff --git a/app/src/main/java/foundation/e/apps/login/api/LoginApiRepository.kt b/app/src/main/java/foundation/e/apps/data/login/api/LoginApiRepository.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/login/api/LoginApiRepository.kt rename to app/src/main/java/foundation/e/apps/data/login/api/LoginApiRepository.kt index fa8602834..bf337e79d 100644 --- a/app/src/main/java/foundation/e/apps/login/api/LoginApiRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/LoginApiRepository.kt @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package foundation.e.apps.login.api +package foundation.e.apps.data.login.api import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.PlayResponse -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.gplay.utils.AC2DMUtil +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.gplay.utils.AC2DMUtil import foundation.e.apps.utils.Constants.timeoutDurationInMillis import foundation.e.apps.utils.enums.User import foundation.e.apps.utils.exceptions.GPlayLoginException diff --git a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerImpl.kt rename to app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt index 7c4a002b8..ee08d1f89 100644 --- a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates.manager +package foundation.e.apps.data.updates import android.content.Context import android.content.pm.ApplicationInfo import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.qualifiers.ApplicationContext -import foundation.e.apps.api.cleanapk.ApkSignatureManager -import foundation.e.apps.api.faultyApps.FaultyAppRepository -import foundation.e.apps.api.fdroid.FdroidRepository -import foundation.e.apps.api.fused.FusedAPIImpl.Companion.APP_TYPE_ANY -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.manager.pkg.PkgManagerModule +import foundation.e.apps.data.cleanapk.ApkSignatureManager +import foundation.e.apps.data.faultyApps.FaultyAppRepository +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.fused.FusedAPIImpl.Companion.APP_TYPE_ANY +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Status diff --git a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerRepository.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerRepository.kt rename to app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt index f15c8bde0..500de15aa 100644 --- a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerRepository.kt @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates.manager +package foundation.e.apps.data.updates import com.aurora.gplayapi.data.models.AuthData -import foundation.e.apps.api.fused.UpdatesDao -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.UpdatesDao +import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.utils.enums.ResultStatus import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/di/DaoModule.kt b/app/src/main/java/foundation/e/apps/di/DaoModule.kt index 4c2a77e6f..738869c22 100644 --- a/app/src/main/java/foundation/e/apps/di/DaoModule.kt +++ b/app/src/main/java/foundation/e/apps/di/DaoModule.kt @@ -6,10 +6,10 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import foundation.e.apps.api.database.AppDatabase -import foundation.e.apps.api.exodus.TrackerDao -import foundation.e.apps.api.faultyApps.FaultyAppDao -import foundation.e.apps.api.fdroid.FdroidDao +import foundation.e.apps.data.database.AppDatabase +import foundation.e.apps.data.exodus.TrackerDao +import foundation.e.apps.data.faultyApps.FaultyAppDao +import foundation.e.apps.data.fdroid.FdroidDao @InstallIn(SingletonComponent::class) @Module diff --git a/app/src/main/java/foundation/e/apps/di/LoginModule.kt b/app/src/main/java/foundation/e/apps/di/LoginModule.kt index ba12b0f08..f59a084b8 100644 --- a/app/src/main/java/foundation/e/apps/di/LoginModule.kt +++ b/app/src/main/java/foundation/e/apps/di/LoginModule.kt @@ -21,9 +21,9 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import foundation.e.apps.login.LoginSourceCleanApk -import foundation.e.apps.login.LoginSourceGPlay -import foundation.e.apps.login.LoginSourceInterface +import foundation.e.apps.data.login.LoginSourceCleanApk +import foundation.e.apps.data.login.LoginSourceGPlay +import foundation.e.apps.data.login.LoginSourceInterface @InstallIn(SingletonComponent::class) @Module diff --git a/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt b/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt index 733dc4d9b..30ef6981d 100644 --- a/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt +++ b/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt @@ -25,15 +25,15 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import foundation.e.apps.api.cleanapk.CleanApkRepository -import foundation.e.apps.api.gplay.GplayStoreRepository -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.api.cleanapk.CleanApkAppDetailsRetrofit -import foundation.e.apps.api.cleanapk.CleanApkAppsRepositoryImpl -import foundation.e.apps.api.cleanapk.CleanApkPWARepository -import foundation.e.apps.api.gplay.GplayStoreRepositoryImpl -import foundation.e.apps.api.gplay.utils.GPlayHttpClient -import foundation.e.apps.login.LoginSourceRepository +import foundation.e.apps.data.cleanapk.CleanApkRepository +import foundation.e.apps.data.gplay.GplayStoreRepository +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.cleanapk.CleanApkAppDetailsRetrofit +import foundation.e.apps.data.cleanapk.CleanApkAppsRepositoryImpl +import foundation.e.apps.data.cleanapk.CleanApkPWARepository +import foundation.e.apps.data.gplay.GplayStoreRepositoryImpl +import foundation.e.apps.data.gplay.utils.GPlayHttpClient +import foundation.e.apps.data.login.LoginSourceRepository import javax.inject.Named import javax.inject.Singleton 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 f527d7a7a..ddaff2849 100644 --- a/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt +++ b/app/src/main/java/foundation/e/apps/di/RepositoryModule.kt @@ -4,12 +4,12 @@ import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import foundation.e.apps.api.exodus.repositories.AppPrivacyInfoRepositoryImpl -import foundation.e.apps.api.exodus.repositories.IAppPrivacyInfoRepository -import foundation.e.apps.api.fdroid.FdroidRepository -import foundation.e.apps.api.fdroid.IFdroidRepository -import foundation.e.apps.manager.fused.FusedManagerImpl -import foundation.e.apps.manager.fused.IFusedManager +import foundation.e.apps.data.exodus.repositories.AppPrivacyInfoRepositoryImpl +import foundation.e.apps.data.exodus.repositories.IAppPrivacyInfoRepository +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.fdroid.IFdroidRepository +import foundation.e.apps.data.fusedDownload.FusedManagerImpl +import foundation.e.apps.data.fusedDownload.IFusedManager import javax.inject.Singleton @Module diff --git a/app/src/main/java/foundation/e/apps/api/DownloadManager.kt b/app/src/main/java/foundation/e/apps/install/download/DownloadManager.kt similarity index 99% rename from app/src/main/java/foundation/e/apps/api/DownloadManager.kt rename to app/src/main/java/foundation/e/apps/install/download/DownloadManager.kt index 5b881d6fc..575b046f9 100644 --- a/app/src/main/java/foundation/e/apps/api/DownloadManager.kt +++ b/app/src/main/java/foundation/e/apps/install/download/DownloadManager.kt @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package foundation.e.apps.api +package foundation.e.apps.install.download import android.app.DownloadManager import android.content.Context diff --git a/app/src/main/java/foundation/e/apps/manager/download/DownloadManagerBR.kt b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerBR.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/download/DownloadManagerBR.kt rename to app/src/main/java/foundation/e/apps/install/download/DownloadManagerBR.kt index 08c575860..a508197d3 100644 --- a/app/src/main/java/foundation/e/apps/manager/download/DownloadManagerBR.kt +++ b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerBR.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.download +package foundation.e.apps.install.download import android.app.DownloadManager import android.content.BroadcastReceiver diff --git a/app/src/main/java/foundation/e/apps/manager/download/DownloadManagerModule.kt b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerModule.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/manager/download/DownloadManagerModule.kt rename to app/src/main/java/foundation/e/apps/install/download/DownloadManagerModule.kt index 47c1bee37..9d94e27b3 100644 --- a/app/src/main/java/foundation/e/apps/manager/download/DownloadManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.download +package foundation.e.apps.install.download import android.app.DownloadManager import android.content.Context diff --git a/app/src/main/java/foundation/e/apps/manager/download/DownloadManagerUtils.kt b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/download/DownloadManagerUtils.kt rename to app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt index 58f17ea2b..e41c67955 100644 --- a/app/src/main/java/foundation/e/apps/manager/download/DownloadManagerUtils.kt +++ b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt @@ -16,13 +16,12 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.download +package foundation.e.apps.install.download import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext -import foundation.e.apps.api.DownloadManager -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.fused.FusedManagerRepository +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.Status import kotlinx.coroutines.DelicateCoroutinesApi diff --git a/app/src/main/java/foundation/e/apps/manager/download/data/DownloadProgress.kt b/app/src/main/java/foundation/e/apps/install/download/data/DownloadProgress.kt similarity index 82% rename from app/src/main/java/foundation/e/apps/manager/download/data/DownloadProgress.kt rename to app/src/main/java/foundation/e/apps/install/download/data/DownloadProgress.kt index 4df4506e4..e2132b4de 100644 --- a/app/src/main/java/foundation/e/apps/manager/download/data/DownloadProgress.kt +++ b/app/src/main/java/foundation/e/apps/install/download/data/DownloadProgress.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.download.data +package foundation.e.apps.install.download.data data class DownloadProgress( var totalSizeBytes: MutableMap = mutableMapOf(), diff --git a/app/src/main/java/foundation/e/apps/manager/download/data/DownloadProgressLD.kt b/app/src/main/java/foundation/e/apps/install/download/data/DownloadProgressLD.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/download/data/DownloadProgressLD.kt rename to app/src/main/java/foundation/e/apps/install/download/data/DownloadProgressLD.kt index 3089bdaeb..d65168a24 100644 --- a/app/src/main/java/foundation/e/apps/manager/download/data/DownloadProgressLD.kt +++ b/app/src/main/java/foundation/e/apps/install/download/data/DownloadProgressLD.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.download.data +package foundation.e.apps.install.download.data import android.app.DownloadManager import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import foundation.e.apps.manager.fused.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/app/src/main/java/foundation/e/apps/manager/notification/NotificationManagerModule.kt b/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerModule.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/notification/NotificationManagerModule.kt rename to app/src/main/java/foundation/e/apps/install/notification/NotificationManagerModule.kt index 6860575ab..f12b62b16 100644 --- a/app/src/main/java/foundation/e/apps/manager/notification/NotificationManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.notification +package foundation.e.apps.install.notification import android.app.NotificationChannel import android.app.NotificationManager diff --git a/app/src/main/java/foundation/e/apps/manager/notification/NotificationManagerUtils.kt b/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerUtils.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/notification/NotificationManagerUtils.kt rename to app/src/main/java/foundation/e/apps/install/notification/NotificationManagerUtils.kt index abcfbc53d..57984639a 100644 --- a/app/src/main/java/foundation/e/apps/manager/notification/NotificationManagerUtils.kt +++ b/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerUtils.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.notification +package foundation.e.apps.install.notification import android.content.Context import androidx.core.app.NotificationCompat diff --git a/app/src/main/java/foundation/e/apps/manager/pkg/InstallerService.kt b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/pkg/InstallerService.kt rename to app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt index 3fd637944..9212e1365 100644 --- a/app/src/main/java/foundation/e/apps/manager/pkg/InstallerService.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/InstallerService.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.pkg +package foundation.e.apps.install.pkg import android.app.Service import android.content.Intent @@ -25,9 +25,9 @@ import android.os.Build import android.os.IBinder import androidx.annotation.RequiresApi import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.api.faultyApps.FaultyAppRepository -import foundation.e.apps.api.fused.UpdatesDao -import foundation.e.apps.manager.fused.FusedManagerRepository +import foundation.e.apps.data.faultyApps.FaultyAppRepository +import foundation.e.apps.data.fused.UpdatesDao +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus diff --git a/app/src/main/java/foundation/e/apps/manager/pkg/PackageInstallerService.kt b/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/manager/pkg/PackageInstallerService.kt rename to app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt index c4d7ea74c..6ce9fed9d 100644 --- a/app/src/main/java/foundation/e/apps/manager/pkg/PackageInstallerService.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.pkg +package foundation.e.apps.install.pkg import android.app.Service import android.content.Intent import android.content.pm.PackageInstaller import android.os.IBinder import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.manager.fused.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.utils.enums.Status import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope diff --git a/app/src/main/java/foundation/e/apps/manager/pkg/PkgManagerBR.kt b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/manager/pkg/PkgManagerBR.kt rename to app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt index 665150bdd..4326e64ed 100644 --- a/app/src/main/java/foundation/e/apps/manager/pkg/PkgManagerBR.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.pkg +package foundation.e.apps.install.pkg import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.pm.PackageInstaller import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.api.faultyApps.FaultyAppRepository -import foundation.e.apps.manager.fused.FusedManagerRepository +import foundation.e.apps.data.faultyApps.FaultyAppRepository +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.utils.enums.Status import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi diff --git a/app/src/main/java/foundation/e/apps/manager/pkg/PkgManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/manager/pkg/PkgManagerModule.kt rename to app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt index 1b99aecb1..1206c8341 100644 --- a/app/src/main/java/foundation/e/apps/manager/pkg/PkgManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.pkg +package foundation.e.apps.install.pkg import android.app.PendingIntent import android.content.Context @@ -31,8 +31,8 @@ import android.os.Build import androidx.core.content.pm.PackageInfoCompat import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.OpenForTesting -import foundation.e.apps.api.fused.FusedAPIImpl -import foundation.e.apps.manager.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fused.FusedAPIImpl +import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.enums.Type diff --git a/app/src/main/java/foundation/e/apps/receiver/PWAPlayerStatusReceiver.kt b/app/src/main/java/foundation/e/apps/install/receiver/PWAPlayerStatusReceiver.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/receiver/PWAPlayerStatusReceiver.kt rename to app/src/main/java/foundation/e/apps/install/receiver/PWAPlayerStatusReceiver.kt index 23b340ec1..b5001879e 100644 --- a/app/src/main/java/foundation/e/apps/receiver/PWAPlayerStatusReceiver.kt +++ b/app/src/main/java/foundation/e/apps/install/receiver/PWAPlayerStatusReceiver.kt @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package foundation.e.apps.receiver +package foundation.e.apps.install.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.manager.database.DatabaseRepository +import foundation.e.apps.data.database.fusedDownload.DatabaseRepository import foundation.e.apps.utils.enums.Status import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope diff --git a/app/src/main/java/foundation/e/apps/splitinstall/SplitInstallBinder.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/splitinstall/SplitInstallBinder.kt rename to app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt index 5ce322d9e..ef627d45c 100644 --- a/app/src/main/java/foundation/e/apps/splitinstall/SplitInstallBinder.kt +++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package foundation.e.apps.splitinstall +package foundation.e.apps.install.splitinstall import android.content.Context import androidx.core.content.pm.PackageInfoCompat import com.aurora.gplayapi.data.models.AuthData import foundation.e.apps.ISplitInstallService -import foundation.e.apps.api.DownloadManager -import foundation.e.apps.api.fused.FusedAPIRepository +import foundation.e.apps.install.download.DownloadManager +import foundation.e.apps.data.fused.FusedAPIRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/foundation/e/apps/splitinstall/SplitInstallService.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/splitinstall/SplitInstallService.kt rename to app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt index 17bf1077c..4f17dff30 100644 --- a/app/src/main/java/foundation/e/apps/splitinstall/SplitInstallService.kt +++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.splitinstall +package foundation.e.apps.install.splitinstall import android.content.ComponentName import android.content.Intent @@ -27,8 +27,8 @@ import androidx.lifecycle.lifecycleScope import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.api.DownloadManager -import foundation.e.apps.api.fused.FusedAPIRepository +import foundation.e.apps.install.download.DownloadManager +import foundation.e.apps.data.fused.FusedAPIRepository import foundation.e.apps.utils.modules.DataStoreModule import foundation.e.splitinstall.ISplitInstallService import foundation.e.splitinstall.SplitInstall diff --git a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesBroadcastReceiver.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/updates/manager/UpdatesBroadcastReceiver.kt rename to app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt index bfc8e3b51..a1d9a30f3 100644 --- a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesBroadcastReceiver.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates.manager +package foundation.e.apps.install.updates import android.content.BroadcastReceiver import android.content.Context diff --git a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorkManager.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorkManager.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorkManager.kt rename to app/src/main/java/foundation/e/apps/install/updates/UpdatesWorkManager.kt index b3cdd04d6..895ebf020 100644 --- a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorkManager.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorkManager.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates.manager +package foundation.e.apps.install.updates import android.content.Context import android.util.Log diff --git a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorker.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorker.kt rename to app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt index 71ea39583..3ac7ec833 100644 --- a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorker.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.updates.manager +package foundation.e.apps.install.updates import android.Manifest import android.content.Context @@ -19,15 +19,16 @@ import com.google.gson.Gson import dagger.assisted.Assisted import dagger.assisted.AssistedInject import foundation.e.apps.R -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.login.LoginSourceRepository -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.fused.FusedManagerRepository -import foundation.e.apps.manager.workmanager.InstallWorkManager -import foundation.e.apps.updates.UpdatesNotifier +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.updates.UpdatesManagerRepository +import foundation.e.apps.data.login.LoginSourceRepository +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.install.workmanager.InstallWorkManager +import foundation.e.apps.ui.updates.UpdatesNotifier import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Type diff --git a/app/src/main/java/foundation/e/apps/manager/workmanager/AppInstallProcessor.kt b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/manager/workmanager/AppInstallProcessor.kt rename to app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt index 0d8d75074..6135900e9 100644 --- a/app/src/main/java/foundation/e/apps/manager/workmanager/AppInstallProcessor.kt +++ b/app/src/main/java/foundation/e/apps/install/workmanager/AppInstallProcessor.kt @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.workmanager +package foundation.e.apps.install.workmanager import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.api.fused.UpdatesDao -import foundation.e.apps.manager.database.DatabaseRepository -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.fused.FusedManagerRepository -import foundation.e.apps.updates.UpdatesNotifier +import foundation.e.apps.data.fused.UpdatesDao +import foundation.e.apps.data.database.fusedDownload.DatabaseRepository +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.ui.updates.UpdatesNotifier import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.getFormattedString diff --git a/app/src/main/java/foundation/e/apps/manager/workmanager/InstallAppWorker.kt b/app/src/main/java/foundation/e/apps/install/workmanager/InstallAppWorker.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/manager/workmanager/InstallAppWorker.kt rename to app/src/main/java/foundation/e/apps/install/workmanager/InstallAppWorker.kt index 01fc3e291..5edf4dff4 100644 --- a/app/src/main/java/foundation/e/apps/manager/workmanager/InstallAppWorker.kt +++ b/app/src/main/java/foundation/e/apps/install/workmanager/InstallAppWorker.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.manager.workmanager +package foundation.e.apps.install.workmanager import android.app.NotificationChannel import android.app.NotificationManager diff --git a/app/src/main/java/foundation/e/apps/manager/workmanager/InstallWorkManager.kt b/app/src/main/java/foundation/e/apps/install/workmanager/InstallWorkManager.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/manager/workmanager/InstallWorkManager.kt rename to app/src/main/java/foundation/e/apps/install/workmanager/InstallWorkManager.kt index 3c777c8dd..51dc63460 100644 --- a/app/src/main/java/foundation/e/apps/manager/workmanager/InstallWorkManager.kt +++ b/app/src/main/java/foundation/e/apps/install/workmanager/InstallWorkManager.kt @@ -1,11 +1,11 @@ -package foundation.e.apps.manager.workmanager +package foundation.e.apps.install.workmanager import android.app.Application import androidx.work.Data import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager -import foundation.e.apps.manager.database.fusedDownload.FusedDownload +import foundation.e.apps.data.database.fusedDownload.FusedDownload import java.lang.Exception object InstallWorkManager { diff --git a/app/src/main/java/foundation/e/apps/AppInfoFetchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt similarity index 86% rename from app/src/main/java/foundation/e/apps/AppInfoFetchViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt index 1cc1de5f8..2c0ecc7bb 100644 --- a/app/src/main/java/foundation/e/apps/AppInfoFetchViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt @@ -1,4 +1,4 @@ -package foundation.e.apps +package foundation.e.apps.ui import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel @@ -6,11 +6,11 @@ import androidx.lifecycle.liveData import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.cleanapk.blockedApps.BlockedAppRepository -import foundation.e.apps.api.faultyApps.FaultyAppRepository -import foundation.e.apps.api.fdroid.FdroidRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.gplay.GPlayAPIRepository +import foundation.e.apps.data.cleanapk.blockedApps.BlockedAppRepository +import foundation.e.apps.data.faultyApps.FaultyAppRepository +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.gplay.GPlayAPIRepository import foundation.e.apps.utils.modules.DataStoreModule import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/AppProgressViewModel.kt b/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt similarity index 82% rename from app/src/main/java/foundation/e/apps/AppProgressViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt index 2b791032e..542638257 100644 --- a/app/src/main/java/foundation/e/apps/AppProgressViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/AppProgressViewModel.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package foundation.e.apps +package foundation.e.apps.ui import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.manager.download.data.DownloadProgress -import foundation.e.apps.manager.download.data.DownloadProgressLD -import foundation.e.apps.manager.fused.FusedManagerRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.download.data.DownloadProgressLD +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/MainActivity.kt rename to app/src/main/java/foundation/e/apps/ui/MainActivity.kt index dd3b075e2..aa13b15fd 100644 --- a/app/src/main/java/foundation/e/apps/MainActivity.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps +package foundation.e.apps.ui import android.app.usage.StorageStatsManager import android.os.Build @@ -40,16 +40,17 @@ import com.aurora.gplayapi.exceptions.ApiException import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.R +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment import foundation.e.apps.databinding.ActivityMainBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.login.LoginViewModel -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.workmanager.InstallWorkManager -import foundation.e.apps.purchase.AppPurchaseFragmentDirections -import foundation.e.apps.settings.SettingsFragment -import foundation.e.apps.setup.signin.SignInViewModel -import foundation.e.apps.updates.UpdatesNotifier +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.LoginViewModel +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.install.workmanager.InstallWorkManager +import foundation.e.apps.ui.purchase.AppPurchaseFragmentDirections +import foundation.e.apps.ui.settings.SettingsFragment +import foundation.e.apps.ui.setup.signin.SignInViewModel +import foundation.e.apps.ui.updates.UpdatesNotifier import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus diff --git a/app/src/main/java/foundation/e/apps/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/MainActivityViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt index e769ba46b..fe30c75b4 100644 --- a/app/src/main/java/foundation/e/apps/MainActivityViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps +package foundation.e.apps.ui import android.content.Context import android.content.Intent @@ -40,13 +40,14 @@ import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.exceptions.ApiException import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.cleanapk.blockedApps.BlockedAppRepository -import foundation.e.apps.api.ecloud.EcloudRepository -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.fused.FusedManagerRepository -import foundation.e.apps.manager.pkg.PkgManagerModule +import foundation.e.apps.R +import foundation.e.apps.data.cleanapk.blockedApps.BlockedAppRepository +import foundation.e.apps.data.ecloud.EcloudRepository +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.enums.Type diff --git a/app/src/main/java/foundation/e/apps/PrivacyInfoViewModel.kt b/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt similarity index 86% rename from app/src/main/java/foundation/e/apps/PrivacyInfoViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt index ae4322e21..6dfd01650 100644 --- a/app/src/main/java/foundation/e/apps/PrivacyInfoViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/PrivacyInfoViewModel.kt @@ -1,13 +1,13 @@ -package foundation.e.apps +package foundation.e.apps.ui import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.liveData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.Result -import foundation.e.apps.api.exodus.models.AppPrivacyInfo -import foundation.e.apps.api.exodus.repositories.IAppPrivacyInfoRepository -import foundation.e.apps.api.fused.data.FusedApp +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.fused.data.FusedApp import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt rename to app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt index 982785769..582dfecf8 100644 --- a/app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application +package foundation.e.apps.ui.application import android.content.Intent import android.graphics.Color @@ -44,19 +44,19 @@ import com.google.android.material.button.MaterialButton import com.google.android.material.snackbar.Snackbar import com.google.android.material.textview.MaterialTextView import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.MainActivity -import foundation.e.apps.MainActivityViewModel -import foundation.e.apps.PrivacyInfoViewModel +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.MainActivity +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.PrivacyInfoViewModel import foundation.e.apps.R -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.application.model.ApplicationScreenshotsRVAdapter -import foundation.e.apps.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.ui.application.model.ApplicationScreenshotsRVAdapter +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment import foundation.e.apps.databinding.FragmentApplicationBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.manager.download.data.DownloadProgress -import foundation.e.apps.manager.pkg.PkgManagerModule +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Status diff --git a/app/src/main/java/foundation/e/apps/application/ApplicationViewModel.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/application/ApplicationViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt index 6ecc40c5c..c62f5f671 100644 --- a/app/src/main/java/foundation/e/apps/application/ApplicationViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application +package foundation.e.apps.ui.application import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope @@ -24,13 +24,13 @@ import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.exceptions.ApiException import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.R -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.login.AuthObject -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.download.data.DownloadProgress -import foundation.e.apps.manager.download.data.DownloadProgressLD -import foundation.e.apps.manager.fused.FusedManagerRepository +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.download.data.DownloadProgressLD +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.utils.enums.Origin import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Status diff --git a/app/src/main/java/foundation/e/apps/application/model/ApplicationScreenshotsDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsDiffUtil.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/application/model/ApplicationScreenshotsDiffUtil.kt rename to app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsDiffUtil.kt index a8a84b38e..d68ba25f8 100644 --- a/app/src/main/java/foundation/e/apps/application/model/ApplicationScreenshotsDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsDiffUtil.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application.model +package foundation.e.apps.ui.application.model import androidx.recyclerview.widget.DiffUtil diff --git a/app/src/main/java/foundation/e/apps/application/model/ApplicationScreenshotsRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsRVAdapter.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/application/model/ApplicationScreenshotsRVAdapter.kt rename to app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsRVAdapter.kt index eb121340f..90257370a 100644 --- a/app/src/main/java/foundation/e/apps/application/model/ApplicationScreenshotsRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsRVAdapter.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application.model +package foundation.e.apps.ui.application.model import android.view.LayoutInflater import android.view.ViewGroup @@ -24,9 +24,9 @@ import androidx.navigation.findNavController import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import coil.load -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.application.ApplicationFragmentDirections +import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.databinding.ApplicationScreenshotsListItemBinding +import foundation.e.apps.ui.application.ApplicationFragmentDirections import foundation.e.apps.utils.enums.Origin class ApplicationScreenshotsRVAdapter( diff --git a/app/src/main/java/foundation/e/apps/application/model/DepthPageTransformer.kt b/app/src/main/java/foundation/e/apps/ui/application/model/DepthPageTransformer.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/application/model/DepthPageTransformer.kt rename to app/src/main/java/foundation/e/apps/ui/application/model/DepthPageTransformer.kt index 9984bdd09..727a39814 100644 --- a/app/src/main/java/foundation/e/apps/application/model/DepthPageTransformer.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/model/DepthPageTransformer.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application.model +package foundation.e.apps.ui.application.model import android.view.View import androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/java/foundation/e/apps/application/model/ScreenshotRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/application/model/ScreenshotRVAdapter.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/application/model/ScreenshotRVAdapter.kt rename to app/src/main/java/foundation/e/apps/ui/application/model/ScreenshotRVAdapter.kt index 61f2cb0c9..21f54e7e4 100644 --- a/app/src/main/java/foundation/e/apps/application/model/ScreenshotRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/model/ScreenshotRVAdapter.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application.model +package foundation.e.apps.ui.application.model import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter @@ -26,7 +26,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.CircularProgressDrawable import coil.load import foundation.e.apps.R -import foundation.e.apps.api.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.databinding.ScreenshotListItemBinding import foundation.e.apps.utils.enums.Origin diff --git a/app/src/main/java/foundation/e/apps/application/subFrags/ApplicationDialogFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/application/subFrags/ApplicationDialogFragment.kt rename to app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt index e975c8d0f..79e0a3081 100644 --- a/app/src/main/java/foundation/e/apps/application/subFrags/ApplicationDialogFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application.subFrags +package foundation.e.apps.ui.application.subFrags import android.app.Dialog import android.os.Bundle diff --git a/app/src/main/java/foundation/e/apps/application/subFrags/DescriptionFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/subFrags/DescriptionFragment.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/application/subFrags/DescriptionFragment.kt rename to app/src/main/java/foundation/e/apps/ui/application/subFrags/DescriptionFragment.kt index 2819d9bf1..590f27d81 100644 --- a/app/src/main/java/foundation/e/apps/application/subFrags/DescriptionFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/subFrags/DescriptionFragment.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.application.subFrags +package foundation.e.apps.ui.application.subFrags import android.os.Bundle import android.text.Html diff --git a/app/src/main/java/foundation/e/apps/application/subFrags/ScreenshotFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/subFrags/ScreenshotFragment.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/application/subFrags/ScreenshotFragment.kt rename to app/src/main/java/foundation/e/apps/ui/application/subFrags/ScreenshotFragment.kt index a4fd15391..fd215a41f 100644 --- a/app/src/main/java/foundation/e/apps/application/subFrags/ScreenshotFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/subFrags/ScreenshotFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.application.subFrags +package foundation.e.apps.ui.application.subFrags import android.os.Bundle import android.view.View @@ -25,8 +25,8 @@ import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R -import foundation.e.apps.application.model.DepthPageTransformer -import foundation.e.apps.application.model.ScreenshotRVAdapter +import foundation.e.apps.ui.application.model.DepthPageTransformer +import foundation.e.apps.ui.application.model.ScreenshotRVAdapter import foundation.e.apps.databinding.FragmentScreenshotBinding @AndroidEntryPoint diff --git a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/applicationlist/ApplicationDiffUtil.kt rename to app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt index d7595c510..13fbf72bb 100644 --- a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationDiffUtil.kt @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package foundation.e.apps.applicationlist +package foundation.e.apps.ui.applicationlist import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL class ApplicationDiffUtil : DiffUtil.ItemCallback() { diff --git a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListFragment.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/applicationlist/ApplicationListFragment.kt rename to app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt index 881919e63..d185d9679 100644 --- a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.applicationlist +package foundation.e.apps.ui.applicationlist import android.os.Bundle import android.view.View @@ -31,19 +31,19 @@ import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.AppProgressViewModel -import foundation.e.apps.MainActivityViewModel -import foundation.e.apps.PrivacyInfoViewModel +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.AppProgressViewModel +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.PrivacyInfoViewModel import foundation.e.apps.R -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.fused.FusedAPIInterface -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment import foundation.e.apps.databinding.FragmentApplicationListBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.manager.download.data.DownloadProgress -import foundation.e.apps.manager.pkg.PkgManagerModule +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.exceptions.GPlayLoginException import foundation.e.apps.utils.modules.PWAManagerModule diff --git a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt rename to app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt index 3e669f31e..081a7e16f 100644 --- a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListRVAdapter.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.applicationlist +package foundation.e.apps.ui.applicationlist import android.util.Log import android.view.LayoutInflater @@ -36,17 +36,17 @@ import com.facebook.shimmer.Shimmer.Direction.LEFT_TO_RIGHT import com.facebook.shimmer.ShimmerDrawable import com.google.android.material.button.MaterialButton import com.google.android.material.snackbar.Snackbar -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.MainActivityViewModel -import foundation.e.apps.PrivacyInfoViewModel +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.PrivacyInfoViewModel import foundation.e.apps.R -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.api.fused.FusedAPIInterface -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.databinding.ApplicationListItemBinding -import foundation.e.apps.manager.pkg.InstallerService -import foundation.e.apps.search.SearchFragmentDirections -import foundation.e.apps.updates.UpdatesFragmentDirections +import foundation.e.apps.install.pkg.InstallerService +import foundation.e.apps.ui.search.SearchFragmentDirections +import foundation.e.apps.ui.updates.UpdatesFragmentDirections import foundation.e.apps.utils.disableInstallButton import foundation.e.apps.utils.enableInstallButton import foundation.e.apps.utils.enums.Origin diff --git a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListViewModel.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/applicationlist/ApplicationListViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt index 7eb43ebe4..1b2c181df 100644 --- a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListViewModel.kt @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.applicationlist +package foundation.e.apps.ui.applicationlist import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.exceptions.CleanApkException import foundation.e.apps.utils.exceptions.GPlayException import foundation.e.apps.utils.parentFragment.LoadingViewModel diff --git a/app/src/main/java/foundation/e/apps/categories/AppsFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/categories/AppsFragment.kt rename to app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt index 6838af774..545894427 100644 --- a/app/src/main/java/foundation/e/apps/categories/AppsFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.categories +package foundation.e.apps.ui.categories import android.os.Bundle import android.view.View @@ -25,12 +25,12 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.MainActivityViewModel +import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.R -import foundation.e.apps.api.fused.utils.CategoryType -import foundation.e.apps.categories.model.CategoriesRVAdapter +import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.ui.categories.model.CategoriesRVAdapter import foundation.e.apps.databinding.FragmentAppsBinding -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.exceptions.GPlayLoginException import foundation.e.apps.utils.parentFragment.TimeoutFragment diff --git a/app/src/main/java/foundation/e/apps/categories/CategoriesFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesFragment.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/categories/CategoriesFragment.kt rename to app/src/main/java/foundation/e/apps/ui/categories/CategoriesFragment.kt index 59e949435..6e9552aa0 100644 --- a/app/src/main/java/foundation/e/apps/categories/CategoriesFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.categories +package foundation.e.apps.ui.categories import android.os.Bundle import android.view.View @@ -24,7 +24,7 @@ import androidx.fragment.app.Fragment import com.google.android.material.tabs.TabLayoutMediator import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R -import foundation.e.apps.categories.model.CategoriesVPAdapter +import foundation.e.apps.ui.categories.model.CategoriesVPAdapter import foundation.e.apps.databinding.FragmentCategoriesBinding @AndroidEntryPoint diff --git a/app/src/main/java/foundation/e/apps/categories/CategoriesViewModel.kt b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/categories/CategoriesViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt index 9cb652112..cc4db97c0 100644 --- a/app/src/main/java/foundation/e/apps/categories/CategoriesViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/CategoriesViewModel.kt @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.categories +package foundation.e.apps.ui.categories import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedCategory -import foundation.e.apps.api.fused.utils.CategoryType -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedCategory +import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.exceptions.CleanApkException import foundation.e.apps.utils.exceptions.GPlayException diff --git a/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/categories/GamesFragment.kt rename to app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt index 76ccada5a..b1e465752 100644 --- a/app/src/main/java/foundation/e/apps/categories/GamesFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.categories +package foundation.e.apps.ui.categories import android.os.Bundle import android.view.View @@ -25,12 +25,12 @@ import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.MainActivityViewModel +import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.R -import foundation.e.apps.api.fused.utils.CategoryType -import foundation.e.apps.categories.model.CategoriesRVAdapter +import foundation.e.apps.data.fused.utils.CategoryType +import foundation.e.apps.ui.categories.model.CategoriesRVAdapter import foundation.e.apps.databinding.FragmentGamesBinding -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.exceptions.GPlayLoginException import foundation.e.apps.utils.parentFragment.TimeoutFragment diff --git a/app/src/main/java/foundation/e/apps/categories/model/CategoriesDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/categories/model/CategoriesDiffUtil.kt rename to app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt index 8f9a1cb1b..23503db56 100644 --- a/app/src/main/java/foundation/e/apps/categories/model/CategoriesDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesDiffUtil.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package foundation.e.apps.categories.model +package foundation.e.apps.ui.categories.model import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.api.fused.data.FusedCategory +import foundation.e.apps.data.fused.data.FusedCategory class CategoriesDiffUtil( private val oldList: List, diff --git a/app/src/main/java/foundation/e/apps/categories/model/CategoriesRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/categories/model/CategoriesRVAdapter.kt rename to app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt index f98cf1ce7..c9d118290 100644 --- a/app/src/main/java/foundation/e/apps/categories/model/CategoriesRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesRVAdapter.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.categories.model +package foundation.e.apps.ui.categories.model import android.view.LayoutInflater import android.view.View @@ -25,9 +25,9 @@ import androidx.navigation.findNavController import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import coil.load -import foundation.e.apps.api.fused.data.FusedCategory -import foundation.e.apps.categories.CategoriesFragmentDirections +import foundation.e.apps.data.fused.data.FusedCategory import foundation.e.apps.databinding.CategoriesListItemBinding +import foundation.e.apps.ui.categories.CategoriesFragmentDirections class CategoriesRVAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/foundation/e/apps/categories/model/CategoriesVPAdapter.kt b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesVPAdapter.kt similarity index 87% rename from app/src/main/java/foundation/e/apps/categories/model/CategoriesVPAdapter.kt rename to app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesVPAdapter.kt index 559192fcc..cdb8da38b 100644 --- a/app/src/main/java/foundation/e/apps/categories/model/CategoriesVPAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/categories/model/CategoriesVPAdapter.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package foundation.e.apps.categories.model +package foundation.e.apps.ui.categories.model import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.lifecycle.Lifecycle import androidx.viewpager2.adapter.FragmentStateAdapter -import foundation.e.apps.categories.AppsFragment -import foundation.e.apps.categories.GamesFragment +import foundation.e.apps.ui.categories.AppsFragment +import foundation.e.apps.ui.categories.GamesFragment class CategoriesVPAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle) : FragmentStateAdapter(fragmentManager, lifecycle) { diff --git a/app/src/main/java/foundation/e/apps/home/HomeFragment.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/home/HomeFragment.kt rename to app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt index ab8e94b95..20430025e 100644 --- a/app/src/main/java/foundation/e/apps/home/HomeFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.home +package foundation.e.apps.ui.home import android.os.Bundle import android.view.View @@ -29,20 +29,20 @@ import androidx.navigation.findNavController import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.AppProgressViewModel -import foundation.e.apps.MainActivityViewModel +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.AppProgressViewModel +import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.R -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.fused.FusedAPIInterface -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.fused.data.FusedHome -import foundation.e.apps.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedHome +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment import foundation.e.apps.databinding.FragmentHomeBinding -import foundation.e.apps.home.model.HomeChildRVAdapter -import foundation.e.apps.home.model.HomeParentRVAdapter -import foundation.e.apps.login.AuthObject -import foundation.e.apps.manager.download.data.DownloadProgress +import foundation.e.apps.ui.home.model.HomeChildRVAdapter +import foundation.e.apps.ui.home.model.HomeParentRVAdapter +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.exceptions.GPlayException import foundation.e.apps.utils.exceptions.GPlayLoginException diff --git a/app/src/main/java/foundation/e/apps/home/HomeViewModel.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/home/HomeViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt index dd24925e7..30967281f 100644 --- a/app/src/main/java/foundation/e/apps/home/HomeViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package foundation.e.apps.home +package foundation.e.apps.ui.home import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.fused.data.FusedHome -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedHome +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.exceptions.CleanApkException import foundation.e.apps.utils.exceptions.GPlayException import foundation.e.apps.utils.parentFragment.LoadingViewModel diff --git a/app/src/main/java/foundation/e/apps/home/model/FusedHomeDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/home/model/FusedHomeDiffUtil.kt rename to app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt index 3933132b2..037bcd383 100644 --- a/app/src/main/java/foundation/e/apps/home/model/FusedHomeDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/FusedHomeDiffUtil.kt @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package foundation.e.apps.home.model +package foundation.e.apps.ui.home.model import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.api.fused.data.FusedHome +import foundation.e.apps.data.fused.data.FusedHome class FusedHomeDiffUtil : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: FusedHome, newItem: FusedHome): Boolean { diff --git a/app/src/main/java/foundation/e/apps/home/model/HomeChildFusedAppDiffUtil.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/home/model/HomeChildFusedAppDiffUtil.kt rename to app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt index 20db3b68c..61bba5097 100644 --- a/app/src/main/java/foundation/e/apps/home/model/HomeChildFusedAppDiffUtil.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildFusedAppDiffUtil.kt @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package foundation.e.apps.home.model +package foundation.e.apps.ui.home.model import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedApp class HomeChildFusedAppDiffUtil : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: FusedApp, newItem: FusedApp): Boolean { diff --git a/app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt rename to app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt index 548af8d7d..be456d974 100644 --- a/app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeChildRVAdapter.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.home.model +package foundation.e.apps.ui.home.model import android.view.LayoutInflater import android.view.View @@ -32,14 +32,14 @@ import com.facebook.shimmer.Shimmer import com.facebook.shimmer.ShimmerDrawable import com.google.android.material.button.MaterialButton import com.google.android.material.snackbar.Snackbar -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.MainActivityViewModel +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.R -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.api.fused.FusedAPIInterface -import foundation.e.apps.api.fused.data.FusedApp +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.databinding.HomeChildListItemBinding -import foundation.e.apps.home.HomeFragmentDirections +import foundation.e.apps.ui.home.HomeFragmentDirections import foundation.e.apps.utils.disableInstallButton import foundation.e.apps.utils.enableInstallButton import foundation.e.apps.utils.enums.Origin diff --git a/app/src/main/java/foundation/e/apps/home/model/HomeParentRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/home/model/HomeParentRVAdapter.kt rename to app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt index 07641183c..aa0318a58 100644 --- a/app/src/main/java/foundation/e/apps/home/model/HomeParentRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/model/HomeParentRVAdapter.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.home.model +package foundation.e.apps.ui.home.model import android.view.LayoutInflater import android.view.ViewGroup @@ -24,11 +24,11 @@ import androidx.lifecycle.LifecycleOwner import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.MainActivityViewModel -import foundation.e.apps.api.fused.FusedAPIInterface -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.api.fused.data.FusedHome +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fused.data.FusedHome import foundation.e.apps.databinding.HomeParentListItemBinding class HomeParentRVAdapter( diff --git a/app/src/main/java/foundation/e/apps/purchase/AppPurchaseFragment.kt b/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/purchase/AppPurchaseFragment.kt rename to app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt index bafc74ffa..0c3b77292 100644 --- a/app/src/main/java/foundation/e/apps/purchase/AppPurchaseFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/purchase/AppPurchaseFragment.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.purchase +package foundation.e.apps.ui.purchase import android.os.Build import android.os.Bundle @@ -11,7 +11,7 @@ import android.webkit.WebView import android.webkit.WebViewClient import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import foundation.e.apps.MainActivityViewModel +import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.databinding.FragmentAppPurchaseBinding /** diff --git a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/search/SearchFragment.kt rename to app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt index f89298ed1..334ad55a1 100644 --- a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.search +package foundation.e.apps.ui.search import android.app.Activity import android.content.Context @@ -42,19 +42,19 @@ import androidx.recyclerview.widget.RecyclerView import com.aurora.gplayapi.SearchSuggestEntry import com.facebook.shimmer.ShimmerFrameLayout import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.AppProgressViewModel -import foundation.e.apps.MainActivityViewModel -import foundation.e.apps.PrivacyInfoViewModel +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.AppProgressViewModel +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.PrivacyInfoViewModel import foundation.e.apps.R -import foundation.e.apps.api.fused.FusedAPIInterface -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.application.subFrags.ApplicationDialogFragment -import foundation.e.apps.applicationlist.ApplicationListRVAdapter +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.ui.applicationlist.ApplicationListRVAdapter import foundation.e.apps.databinding.FragmentSearchBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.download.data.DownloadProgress +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.exceptions.GPlayLoginException import foundation.e.apps.utils.modules.PWAManagerModule diff --git a/app/src/main/java/foundation/e/apps/search/SearchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/search/SearchViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt index deab32583..cba087637 100644 --- a/app/src/main/java/foundation/e/apps/search/SearchViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.search +package foundation.e.apps.ui.search import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData @@ -25,10 +25,10 @@ import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.SearchSuggestEntry import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.exceptions.CleanApkException import foundation.e.apps.utils.exceptions.GPlayException import foundation.e.apps.utils.parentFragment.LoadingViewModel diff --git a/app/src/main/java/foundation/e/apps/settings/LongPressPreference.kt b/app/src/main/java/foundation/e/apps/ui/settings/LongPressPreference.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/settings/LongPressPreference.kt rename to app/src/main/java/foundation/e/apps/ui/settings/LongPressPreference.kt index 14b4b592e..5d6130624 100644 --- a/app/src/main/java/foundation/e/apps/settings/LongPressPreference.kt +++ b/app/src/main/java/foundation/e/apps/ui/settings/LongPressPreference.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.settings +package foundation.e.apps.ui.settings import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/foundation/e/apps/settings/RadioButtonPreference.kt b/app/src/main/java/foundation/e/apps/ui/settings/RadioButtonPreference.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/settings/RadioButtonPreference.kt rename to app/src/main/java/foundation/e/apps/ui/settings/RadioButtonPreference.kt index b1565a724..0dcc41d42 100644 --- a/app/src/main/java/foundation/e/apps/settings/RadioButtonPreference.kt +++ b/app/src/main/java/foundation/e/apps/ui/settings/RadioButtonPreference.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.settings +package foundation.e.apps.ui.settings import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt rename to app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt index 3fead6e10..76a52a613 100644 --- a/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.settings +package foundation.e.apps.ui.settings import android.content.ClipboardManager import android.content.Intent @@ -37,13 +37,13 @@ import com.google.android.material.snackbar.Snackbar import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.BuildConfig -import foundation.e.apps.MainActivity -import foundation.e.apps.MainActivityViewModel +import foundation.e.apps.ui.MainActivity +import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.R -import foundation.e.apps.api.fused.UpdatesDao +import foundation.e.apps.data.fused.UpdatesDao import foundation.e.apps.databinding.CustomPreferenceBinding -import foundation.e.apps.login.LoginViewModel -import foundation.e.apps.updates.manager.UpdatesWorkManager +import foundation.e.apps.data.login.LoginViewModel +import foundation.e.apps.install.updates.UpdatesWorkManager import foundation.e.apps.utils.enums.User import foundation.e.apps.utils.modules.CommonUtilsFunctions import timber.log.Timber diff --git a/app/src/main/java/foundation/e/apps/setup/signin/LocaleChangedBroadcastReceiver.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/setup/signin/LocaleChangedBroadcastReceiver.kt rename to app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt index 2c47379f0..bf4f8ba24 100644 --- a/app/src/main/java/foundation/e/apps/setup/signin/LocaleChangedBroadcastReceiver.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.setup.signin +package foundation.e.apps.ui.setup.signin import android.content.BroadcastReceiver import android.content.Context diff --git a/app/src/main/java/foundation/e/apps/setup/signin/SignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/setup/signin/SignInFragment.kt rename to app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt index becf88684..5ced07b33 100644 --- a/app/src/main/java/foundation/e/apps/setup/signin/SignInFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.setup.signin +package foundation.e.apps.ui.setup.signin import android.os.Bundle import android.view.View @@ -8,7 +8,7 @@ import androidx.navigation.findNavController import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R import foundation.e.apps.databinding.FragmentSignInBinding -import foundation.e.apps.login.LoginViewModel +import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.utils.modules.CommonUtilsModule.safeNavigate @AndroidEntryPoint diff --git a/app/src/main/java/foundation/e/apps/setup/signin/SignInViewModel.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/setup/signin/SignInViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt index ee0e1ea91..f91f0c7a7 100644 --- a/app/src/main/java/foundation/e/apps/setup/signin/SignInViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.setup.signin +package foundation.e.apps.ui.setup.signin import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/foundation/e/apps/setup/signin/google/GoogleSignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/setup/signin/google/GoogleSignInFragment.kt rename to app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt index 8470c359c..314b64168 100644 --- a/app/src/main/java/foundation/e/apps/setup/signin/google/GoogleSignInFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.setup.signin.google +package foundation.e.apps.ui.setup.signin.google import android.annotation.SuppressLint import android.os.Build @@ -31,9 +31,9 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R -import foundation.e.apps.api.gplay.utils.AC2DMUtil +import foundation.e.apps.data.gplay.utils.AC2DMUtil import foundation.e.apps.databinding.FragmentGoogleSigninBinding -import foundation.e.apps.login.LoginViewModel +import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.utils.modules.CommonUtilsModule.safeNavigate @AndroidEntryPoint diff --git a/app/src/main/java/foundation/e/apps/setup/tos/TOSFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSFragment.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/setup/tos/TOSFragment.kt rename to app/src/main/java/foundation/e/apps/ui/setup/tos/TOSFragment.kt index 9a0515c15..82a282be0 100644 --- a/app/src/main/java/foundation/e/apps/setup/tos/TOSFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSFragment.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.setup.tos +package foundation.e.apps.ui.setup.tos import android.content.res.Configuration import android.os.Bundle diff --git a/app/src/main/java/foundation/e/apps/setup/tos/TOSViewModel.kt b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/setup/tos/TOSViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt index c9a26fd42..b616cc43b 100644 --- a/app/src/main/java/foundation/e/apps/setup/tos/TOSViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.setup.tos +package foundation.e.apps.ui.setup.tos import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt rename to app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt index 60bb51b26..e7e1fdd7a 100644 --- a/app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates +package foundation.e.apps.ui.updates import android.os.Bundle import android.view.View @@ -33,22 +33,22 @@ import androidx.recyclerview.widget.RecyclerView import androidx.work.WorkInfo import androidx.work.WorkManager import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.AppInfoFetchViewModel -import foundation.e.apps.AppProgressViewModel -import foundation.e.apps.MainActivityViewModel -import foundation.e.apps.PrivacyInfoViewModel +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.AppProgressViewModel +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.PrivacyInfoViewModel import foundation.e.apps.R -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.fused.FusedAPIInterface -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.application.subFrags.ApplicationDialogFragment -import foundation.e.apps.applicationlist.ApplicationListRVAdapter +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.ui.applicationlist.ApplicationListRVAdapter import foundation.e.apps.databinding.FragmentUpdatesBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.download.data.DownloadProgress -import foundation.e.apps.manager.workmanager.InstallWorkManager.INSTALL_WORK_NAME -import foundation.e.apps.updates.manager.UpdatesWorkManager +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.workmanager.InstallWorkManager.INSTALL_WORK_NAME +import foundation.e.apps.install.updates.UpdatesWorkManager import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.eventBus.AppEvent diff --git a/app/src/main/java/foundation/e/apps/updates/UpdatesNotifier.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesNotifier.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/updates/UpdatesNotifier.kt rename to app/src/main/java/foundation/e/apps/ui/updates/UpdatesNotifier.kt index 1b6a7a57b..1bc983899 100644 --- a/app/src/main/java/foundation/e/apps/updates/UpdatesNotifier.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesNotifier.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates +package foundation.e.apps.ui.updates import android.app.Notification import android.app.NotificationChannel @@ -26,7 +26,7 @@ import android.content.Intent import android.os.Build import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import foundation.e.apps.MainActivity +import foundation.e.apps.ui.MainActivity import foundation.e.apps.R object UpdatesNotifier { diff --git a/app/src/main/java/foundation/e/apps/updates/UpdatesViewModel.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/updates/UpdatesViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt index d66ca5ace..4368c292b 100644 --- a/app/src/main/java/foundation/e/apps/updates/UpdatesViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesViewModel.kt @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates +package foundation.e.apps.ui.updates import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import androidx.work.WorkInfo import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.api.fused.FusedAPIRepository -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.login.AuthObject -import foundation.e.apps.updates.manager.UpdatesManagerRepository +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.updates.UpdatesManagerRepository import foundation.e.apps.utils.enums.ResultStatus import foundation.e.apps.utils.enums.Status import foundation.e.apps.utils.exceptions.CleanApkException diff --git a/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt b/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt index 1509729b2..449afdf19 100644 --- a/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt +++ b/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt @@ -20,7 +20,7 @@ package foundation.e.apps.utils.eventBus -import foundation.e.apps.api.ResultSupreme +import foundation.e.apps.data.ResultSupreme import foundation.e.apps.utils.enums.ResultStatus sealed class AppEvent(val data: Any) { diff --git a/app/src/main/java/foundation/e/apps/utils/modules/PWAManagerModule.kt b/app/src/main/java/foundation/e/apps/utils/modules/PWAManagerModule.kt index 6d3faa62a..2413796b0 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/PWAManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/utils/modules/PWAManagerModule.kt @@ -13,9 +13,9 @@ import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.graphics.drawable.IconCompat import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.OpenForTesting -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.manager.database.DatabaseRepository -import foundation.e.apps.manager.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.database.fusedDownload.DatabaseRepository +import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.utils.enums.Status import kotlinx.coroutines.delay import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/utils/parentFragment/LoadingViewModel.kt b/app/src/main/java/foundation/e/apps/utils/parentFragment/LoadingViewModel.kt index cbd0ab493..7e61e6b58 100644 --- a/app/src/main/java/foundation/e/apps/utils/parentFragment/LoadingViewModel.kt +++ b/app/src/main/java/foundation/e/apps/utils/parentFragment/LoadingViewModel.kt @@ -19,7 +19,7 @@ package foundation.e.apps.utils.parentFragment import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import foundation.e.apps.login.AuthObject +import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.exceptions.GPlayValidationException import foundation.e.apps.utils.exceptions.UnknownSourceException diff --git a/app/src/main/java/foundation/e/apps/utils/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/utils/parentFragment/TimeoutFragment.kt index 447720787..2e0d9bb2d 100644 --- a/app/src/main/java/foundation/e/apps/utils/parentFragment/TimeoutFragment.kt +++ b/app/src/main/java/foundation/e/apps/utils/parentFragment/TimeoutFragment.kt @@ -26,12 +26,12 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider -import foundation.e.apps.MainActivityViewModel +import foundation.e.apps.ui.MainActivityViewModel import foundation.e.apps.R import foundation.e.apps.databinding.DialogErrorLogBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.login.LoginSourceGPlay -import foundation.e.apps.login.LoginViewModel +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.LoginSourceGPlay +import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.utils.enums.User import foundation.e.apps.utils.exceptions.CleanApkException import foundation.e.apps.utils.exceptions.GPlayException diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 99610ac83..59e74f839 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,7 +21,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".ui.MainActivity"> + tools:context=".ui.purchase.AppPurchaseFragment"> + tools:context=".ui.application.ApplicationFragment"> + tools:context=".ui.applicationlist.ApplicationListFragment"> + tools:context=".ui.categories.AppsFragment"> + tools:context=".ui.categories.CategoriesFragment"> + tools:context=".ui.application.subFrags.DescriptionFragment"> + tools:context=".ui.categories.AppsFragment"> + tools:context=".ui.home.HomeFragment"> + tools:context=".ui.application.subFrags.ScreenshotFragment"> + tools:context=".ui.search.SearchFragment"> + tools:context=".ui.setup.signin.SignInFragment"> + tools:context=".ui.updates.UpdatesFragment"> - () diff --git a/app/src/test/java/foundation/e/apps/installProcessor/FakeFusedManagerRepository.kt b/app/src/test/java/foundation/e/apps/installProcessor/FakeFusedManagerRepository.kt index 8b65b50b5..87757e9a1 100644 --- a/app/src/test/java/foundation/e/apps/installProcessor/FakeFusedManagerRepository.kt +++ b/app/src/test/java/foundation/e/apps/installProcessor/FakeFusedManagerRepository.kt @@ -18,10 +18,10 @@ package foundation.e.apps.installProcessor -import foundation.e.apps.api.fdroid.FdroidRepository -import foundation.e.apps.manager.database.fusedDownload.FusedDownload -import foundation.e.apps.manager.fused.FusedManagerRepository -import foundation.e.apps.manager.fused.IFusedManager +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.database.fusedDownload.FusedDownload +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.IFusedManager import foundation.e.apps.utils.enums.Status import kotlinx.coroutines.delay -- GitLab From 7891aa1b47f87cbb3f2537ce9a36b0f2b26b4bbe Mon Sep 17 00:00:00 2001 From: hasibprince Date: Tue, 23 May 2023 23:13:49 +0600 Subject: [PATCH 2/2] refactored utils package --- .../foundation/e/apps/AppLoungeApplication.kt | 4 ++-- .../e/apps/{utils => data}/Constants.kt | 2 +- .../java/foundation/e/apps/data/JobResult.kt | 2 +- .../foundation/e/apps/data/ResultSupreme.kt | 2 +- .../e/apps/data/cleanapk/data/home/Home.kt | 2 +- .../{ => repositories}/CleanAPKRepository.kt | 4 +++- .../CleanApkAppsRepositoryImpl.kt | 7 ++++-- .../CleanApkPWARepository.kt | 4 +++- .../{ => repositories}/CleanApkRepository.kt | 2 +- .../database/fusedDownload/FusedDownload.kt | 6 ++--- .../e/apps/{utils => data}/enums/AppTag.kt | 2 +- .../apps/{utils => data}/enums/FilterLevel.kt | 2 +- .../e/apps/{utils => data}/enums/Origin.kt | 2 +- .../{utils => data}/enums/ResultStatus.kt | 2 +- .../e/apps/{utils => data}/enums/Source.kt | 2 +- .../e/apps/{utils => data}/enums/Status.kt | 2 +- .../java/foundation/e/apps/data/enums/Type.kt | 6 +++++ .../e/apps/{utils => data}/enums/User.kt | 2 +- .../AppPrivacyInfoRepositoryImpl.kt | 4 ++-- .../e/apps/data/fdroid/FdroidRepository.kt | 2 +- .../e/apps/data/fused/FusedAPIImpl.kt | 24 +++++++++---------- .../e/apps/data/fused/FusedAPIRepository.kt | 8 +++---- .../e/apps/data/fused/data/FusedApp.kt | 10 ++++---- .../e/apps/data/fused/data/FusedCategory.kt | 2 +- .../data/fusedDownload/FusedManagerImpl.kt | 6 ++--- .../fusedDownload/FusedManagerRepository.kt | 2 +- .../apps/data/fusedDownload/IFusedManager.kt | 2 +- .../apps/data/gplay/utils/GPlayHttpClient.kt | 2 +- .../e/apps/data/login/AuthObject.kt | 6 ++--- .../e/apps/data/login/LoginCommon.kt | 4 ++-- .../e/apps/data/login/LoginDataStore.kt | 10 ++++---- .../e/apps/data/login/LoginSourceCleanApk.kt | 2 +- .../e/apps/data/login/LoginSourceGPlay.kt | 6 ++--- .../apps/data/login/LoginSourceRepository.kt | 2 +- .../e/apps/data/login/LoginViewModel.kt | 4 ++-- .../e/apps/data/login/api/GPlayApiFactory.kt | 2 +- .../apps/data/login/api/LoginApiRepository.kt | 6 ++--- .../login}/exceptions/CleanApkException.kt | 2 +- .../login}/exceptions/GPlayException.kt | 2 +- .../login}/exceptions/GPlayLoginException.kt | 4 ++-- .../exceptions/GPlayValidationException.kt | 4 ++-- .../login}/exceptions/LoginException.kt | 2 +- .../exceptions/UnknownSourceException.kt | 2 +- .../prefrences}/DataStoreManager.kt | 4 ++-- .../prefrences}/DataStoreModule.kt | 4 ++-- .../prefrences}/PreferenceManagerModule.kt | 8 +++---- .../e/apps/data/updates/UpdatesManagerImpl.kt | 10 ++++---- .../data/updates/UpdatesManagerRepository.kt | 2 +- .../modules => di}/CommonUtilsModule.kt | 2 +- .../e/apps/di/NamedRepositoryModule.kt | 6 ++--- .../install/download/DownloadManagerUtils.kt | 4 ++-- .../notification/NotificationManagerUtils.kt | 2 +- .../e/apps/install/pkg/InstallerService.kt | 2 +- .../pkg}/PWAManagerModule.kt | 4 ++-- .../install/pkg/PackageInstallerService.kt | 2 +- .../e/apps/install/pkg/PkgManagerBR.kt | 2 +- .../e/apps/install/pkg/PkgManagerModule.kt | 6 ++--- .../receiver/PWAPlayerStatusReceiver.kt | 2 +- .../splitinstall/SplitInstallService.kt | 2 +- .../updates/UpdatesBroadcastReceiver.kt | 2 +- .../e/apps/install/updates/UpdatesWorker.kt | 10 ++++---- .../workmanager/AppInstallProcessor.kt | 6 ++--- .../e/apps/ui/AppInfoFetchViewModel.kt | 2 +- .../java/foundation/e/apps/ui/MainActivity.kt | 6 ++--- .../e/apps/ui/MainActivityViewModel.kt | 16 ++++++------- .../ui/application/ApplicationFragment.kt | 18 +++++++------- .../ui/application/ApplicationViewModel.kt | 12 +++++----- .../model/ApplicationScreenshotsRVAdapter.kt | 2 +- .../application/model/ScreenshotRVAdapter.kt | 2 +- .../ui/applicationlist/ApplicationDiffUtil.kt | 2 +- .../ApplicationListFragment.kt | 8 +++---- .../ApplicationListRVAdapter.kt | 6 ++--- .../ApplicationListViewModel.kt | 6 ++--- .../e/apps/ui/categories/AppsFragment.kt | 4 ++-- .../apps/ui/categories/CategoriesViewModel.kt | 8 +++---- .../e/apps/ui/categories/GamesFragment.kt | 4 ++-- .../foundation/e/apps/ui/home/HomeFragment.kt | 12 +++++----- .../e/apps/ui/home/HomeViewModel.kt | 6 ++--- .../apps/ui/home/model/HomeChildRVAdapter.kt | 6 ++--- .../parentFragment/LoadingViewModel.kt | 6 ++--- .../parentFragment/TimeoutFragment.kt | 14 +++++------ .../e/apps/ui/search/SearchFragment.kt | 8 +++---- .../e/apps/ui/search/SearchViewModel.kt | 6 ++--- .../e/apps/ui/settings/SettingsFragment.kt | 4 ++-- .../signin/LocaleChangedBroadcastReceiver.kt | 2 +- .../e/apps/ui/setup/signin/SignInFragment.kt | 2 +- .../e/apps/ui/setup/signin/SignInViewModel.kt | 4 ++-- .../signin/google/GoogleSignInFragment.kt | 2 +- .../e/apps/ui/setup/tos/TOSViewModel.kt | 2 +- .../e/apps/ui/updates/UpdatesFragment.kt | 14 +++++------ .../e/apps/ui/updates/UpdatesViewModel.kt | 12 +++++----- .../{modules => }/CommonUtilsFunctions.kt | 2 +- .../utils/{CommonUtils.kt => Extensions.kt} | 0 .../e/apps/utils/MaterialButtonUtils.kt | 2 +- .../foundation/e/apps/utils/enums/Type.kt | 6 ----- .../e/apps/utils/eventBus/AppEvent.kt | 2 +- .../res/navigation/navigation_resource.xml | 4 ++-- .../foundation/e/apps/FakePreferenceModule.kt | 2 +- .../foundation/e/apps/FusedApiImplTest.kt | 12 +++++----- .../e/apps/UpdateManagerImptTest.kt | 8 +++---- .../AppPrivacyInfoRepositoryImplTest.kt | 4 ++-- .../e/apps/fusedManager/FakeFusedManager.kt | 2 +- .../FusedManagerRepositoryTest.kt | 2 +- .../AppInstallProcessorTest.kt | 4 ++-- .../FakeFusedManagerRepository.kt | 2 +- 105 files changed, 255 insertions(+), 248 deletions(-) rename app/src/main/java/foundation/e/apps/{utils => data}/Constants.kt (88%) rename app/src/main/java/foundation/e/apps/data/cleanapk/{ => repositories}/CleanAPKRepository.kt (91%) rename app/src/main/java/foundation/e/apps/data/cleanapk/{ => repositories}/CleanApkAppsRepositoryImpl.kt (90%) rename app/src/main/java/foundation/e/apps/data/cleanapk/{ => repositories}/CleanApkPWARepository.kt (93%) rename app/src/main/java/foundation/e/apps/data/cleanapk/{ => repositories}/CleanApkRepository.kt (95%) rename app/src/main/java/foundation/e/apps/{utils => data}/enums/AppTag.kt (97%) rename app/src/main/java/foundation/e/apps/{utils => data}/enums/FilterLevel.kt (98%) rename app/src/main/java/foundation/e/apps/{utils => data}/enums/Origin.kt (92%) rename app/src/main/java/foundation/e/apps/{utils => data}/enums/ResultStatus.kt (73%) rename app/src/main/java/foundation/e/apps/{utils => data}/enums/Source.kt (95%) rename app/src/main/java/foundation/e/apps/{utils => data}/enums/Status.kt (93%) create mode 100644 app/src/main/java/foundation/e/apps/data/enums/Type.kt rename app/src/main/java/foundation/e/apps/{utils => data}/enums/User.kt (63%) rename app/src/main/java/foundation/e/apps/{utils => data/login}/exceptions/CleanApkException.kt (94%) rename app/src/main/java/foundation/e/apps/{utils => data/login}/exceptions/GPlayException.kt (94%) rename app/src/main/java/foundation/e/apps/{utils => data/login}/exceptions/GPlayLoginException.kt (91%) rename app/src/main/java/foundation/e/apps/{utils => data/login}/exceptions/GPlayValidationException.kt (92%) rename app/src/main/java/foundation/e/apps/{utils => data/login}/exceptions/LoginException.kt (94%) rename app/src/main/java/foundation/e/apps/{utils => data/login}/exceptions/UnknownSourceException.kt (94%) rename app/src/main/java/foundation/e/apps/{utils/modules => data/prefrences}/DataStoreManager.kt (94%) rename app/src/main/java/foundation/e/apps/{utils/modules => data/prefrences}/DataStoreModule.kt (95%) rename app/src/main/java/foundation/e/apps/{utils/modules => data/prefrences}/PreferenceManagerModule.kt (88%) rename app/src/main/java/foundation/e/apps/{utils/modules => di}/CommonUtilsModule.kt (96%) rename app/src/main/java/foundation/e/apps/{utils/modules => install/pkg}/PWAManagerModule.kt (98%) rename app/src/main/java/foundation/e/apps/{utils => ui}/parentFragment/LoadingViewModel.kt (93%) rename app/src/main/java/foundation/e/apps/{utils => ui}/parentFragment/TimeoutFragment.kt (97%) rename app/src/main/java/foundation/e/apps/utils/{modules => }/CommonUtilsFunctions.kt (98%) rename app/src/main/java/foundation/e/apps/utils/{CommonUtils.kt => Extensions.kt} (100%) delete mode 100644 app/src/main/java/foundation/e/apps/utils/enums/Type.kt diff --git a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt index 1fbb78ed1..b271df54b 100644 --- a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt +++ b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt @@ -29,8 +29,8 @@ import foundation.e.apps.install.pkg.PkgManagerModule import foundation.e.apps.install.workmanager.InstallWorkManager import foundation.e.apps.ui.setup.tos.TOS_VERSION import foundation.e.apps.install.updates.UpdatesWorkManager -import foundation.e.apps.utils.modules.DataStoreModule -import foundation.e.apps.utils.modules.PreferenceManagerModule +import foundation.e.apps.data.prefrences.DataStoreModule +import foundation.e.apps.data.prefrences.PreferenceManagerModule import foundation.e.lib.telemetry.Telemetry import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.MainScope diff --git a/app/src/main/java/foundation/e/apps/utils/Constants.kt b/app/src/main/java/foundation/e/apps/data/Constants.kt similarity index 88% rename from app/src/main/java/foundation/e/apps/utils/Constants.kt rename to app/src/main/java/foundation/e/apps/data/Constants.kt index d8083adaf..c3be8404c 100644 --- a/app/src/main/java/foundation/e/apps/utils/Constants.kt +++ b/app/src/main/java/foundation/e/apps/data/Constants.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.utils +package foundation.e.apps.data object Constants { const val timeoutDurationInMillis: Long = 10000 diff --git a/app/src/main/java/foundation/e/apps/data/JobResult.kt b/app/src/main/java/foundation/e/apps/data/JobResult.kt index 202093d9a..b085c5031 100644 --- a/app/src/main/java/foundation/e/apps/data/JobResult.kt +++ b/app/src/main/java/foundation/e/apps/data/JobResult.kt @@ -1,6 +1,6 @@ package foundation.e.apps.data -import foundation.e.apps.utils.enums.ResultStatus +import foundation.e.apps.data.enums.ResultStatus /** * Currently defunct, not being used anywhere. diff --git a/app/src/main/java/foundation/e/apps/data/ResultSupreme.kt b/app/src/main/java/foundation/e/apps/data/ResultSupreme.kt index 3f2e40041..14695702f 100644 --- a/app/src/main/java/foundation/e/apps/data/ResultSupreme.kt +++ b/app/src/main/java/foundation/e/apps/data/ResultSupreme.kt @@ -17,7 +17,7 @@ package foundation.e.apps.data -import foundation.e.apps.utils.enums.ResultStatus +import foundation.e.apps.data.enums.ResultStatus import java.util.concurrent.TimeoutException /** 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 b811ced8a..0f5271240 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.fused.data.FusedApp -import foundation.e.apps.utils.enums.Origin +import foundation.e.apps.data.enums.Origin data class Home( val top_updated_apps: List = emptyList(), diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanAPKRepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanAPKRepository.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/data/cleanapk/CleanAPKRepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanAPKRepository.kt index b40bcd2ec..22656d5bb 100644 --- a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanAPKRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanAPKRepository.kt @@ -16,9 +16,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.cleanapk +package foundation.e.apps.data.cleanapk.repositories import foundation.e.apps.OpenForTesting +import foundation.e.apps.data.cleanapk.CleanApkAppDetailsRetrofit +import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.cleanapk.data.app.Application import foundation.e.apps.data.cleanapk.data.categories.Categories import foundation.e.apps.data.cleanapk.data.download.Download diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppsRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepositoryImpl.kt similarity index 90% rename from app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppsRepositoryImpl.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepositoryImpl.kt index 42247d4fa..fc4dc038c 100644 --- a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppsRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepositoryImpl.kt @@ -16,8 +16,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.cleanapk +package foundation.e.apps.data.cleanapk.repositories +import foundation.e.apps.data.cleanapk.CleanApkAppDetailsRetrofit +import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher +import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.cleanapk.data.app.Application import foundation.e.apps.data.cleanapk.data.categories.Categories import foundation.e.apps.data.cleanapk.data.download.Download @@ -28,7 +31,7 @@ import retrofit2.Response class CleanApkAppsRepositoryImpl( private val cleanApkRetrofit: CleanApkRetrofit, private val cleanApkAppDetailsRetrofit: CleanApkAppDetailsRetrofit -) : CleanApkRepository, CleanApkDownloadInfoFetcher{ +) : CleanApkRepository, CleanApkDownloadInfoFetcher { override suspend fun getHomeScreenData(): Response { return cleanApkRetrofit.getHomeScreenData( diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkPWARepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkPWARepository.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkPWARepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkPWARepository.kt index 488d6227e..b0ae420d7 100644 --- a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkPWARepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkPWARepository.kt @@ -16,8 +16,10 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.cleanapk +package foundation.e.apps.data.cleanapk.repositories +import foundation.e.apps.data.cleanapk.CleanApkAppDetailsRetrofit +import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.cleanapk.data.app.Application import foundation.e.apps.data.cleanapk.data.categories.Categories import foundation.e.apps.data.cleanapk.data.search.Search diff --git a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkRepository.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkRepository.kt index 84a2609b0..d0ef49f00 100644 --- a/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkRepository.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.data.cleanapk +package foundation.e.apps.data.cleanapk.repositories import foundation.e.apps.data.BaseStoreRepository import foundation.e.apps.data.cleanapk.data.categories.Categories diff --git a/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownload.kt b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownload.kt index d859e0839..2634555a4 100644 --- a/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownload.kt +++ b/app/src/main/java/foundation/e/apps/data/database/fusedDownload/FusedDownload.kt @@ -3,9 +3,9 @@ package foundation.e.apps.data.database.fusedDownload import androidx.room.Entity import androidx.room.PrimaryKey import com.aurora.gplayapi.data.models.File -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.Type +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.Type @Entity data class FusedDownload( diff --git a/app/src/main/java/foundation/e/apps/utils/enums/AppTag.kt b/app/src/main/java/foundation/e/apps/data/enums/AppTag.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/utils/enums/AppTag.kt rename to app/src/main/java/foundation/e/apps/data/enums/AppTag.kt index 5a5361dd8..2b1611655 100644 --- a/app/src/main/java/foundation/e/apps/utils/enums/AppTag.kt +++ b/app/src/main/java/foundation/e/apps/data/enums/AppTag.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.enums +package foundation.e.apps.data.enums /** * This sealed class is used for the tags shown in the categories screen, diff --git a/app/src/main/java/foundation/e/apps/utils/enums/FilterLevel.kt b/app/src/main/java/foundation/e/apps/data/enums/FilterLevel.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/utils/enums/FilterLevel.kt rename to app/src/main/java/foundation/e/apps/data/enums/FilterLevel.kt index 4fd93c524..13dcc7b7a 100644 --- a/app/src/main/java/foundation/e/apps/utils/enums/FilterLevel.kt +++ b/app/src/main/java/foundation/e/apps/data/enums/FilterLevel.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.enums +package foundation.e.apps.data.enums /** * Use this class for various levels of filtering. diff --git a/app/src/main/java/foundation/e/apps/utils/enums/Origin.kt b/app/src/main/java/foundation/e/apps/data/enums/Origin.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/utils/enums/Origin.kt rename to app/src/main/java/foundation/e/apps/data/enums/Origin.kt index 5534bc177..ae1218ccd 100644 --- a/app/src/main/java/foundation/e/apps/utils/enums/Origin.kt +++ b/app/src/main/java/foundation/e/apps/data/enums/Origin.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.enums +package foundation.e.apps.data.enums enum class Origin { CLEANAPK, diff --git a/app/src/main/java/foundation/e/apps/utils/enums/ResultStatus.kt b/app/src/main/java/foundation/e/apps/data/enums/ResultStatus.kt similarity index 73% rename from app/src/main/java/foundation/e/apps/utils/enums/ResultStatus.kt rename to app/src/main/java/foundation/e/apps/data/enums/ResultStatus.kt index 87dcf9530..34f4d54e7 100644 --- a/app/src/main/java/foundation/e/apps/utils/enums/ResultStatus.kt +++ b/app/src/main/java/foundation/e/apps/data/enums/ResultStatus.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.utils.enums +package foundation.e.apps.data.enums enum class ResultStatus { OK, diff --git a/app/src/main/java/foundation/e/apps/utils/enums/Source.kt b/app/src/main/java/foundation/e/apps/data/enums/Source.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/utils/enums/Source.kt rename to app/src/main/java/foundation/e/apps/data/enums/Source.kt index 07780704e..0e0b08ae4 100644 --- a/app/src/main/java/foundation/e/apps/utils/enums/Source.kt +++ b/app/src/main/java/foundation/e/apps/data/enums/Source.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.enums +package foundation.e.apps.data.enums enum class Source { GPLAY, diff --git a/app/src/main/java/foundation/e/apps/utils/enums/Status.kt b/app/src/main/java/foundation/e/apps/data/enums/Status.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/utils/enums/Status.kt rename to app/src/main/java/foundation/e/apps/data/enums/Status.kt index 196727e36..849f305f2 100644 --- a/app/src/main/java/foundation/e/apps/utils/enums/Status.kt +++ b/app/src/main/java/foundation/e/apps/data/enums/Status.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.enums +package foundation.e.apps.data.enums enum class Status { INSTALLED, diff --git a/app/src/main/java/foundation/e/apps/data/enums/Type.kt b/app/src/main/java/foundation/e/apps/data/enums/Type.kt new file mode 100644 index 000000000..ccb670d50 --- /dev/null +++ b/app/src/main/java/foundation/e/apps/data/enums/Type.kt @@ -0,0 +1,6 @@ +package foundation.e.apps.data.enums + +enum class Type { + NATIVE, + PWA +} diff --git a/app/src/main/java/foundation/e/apps/utils/enums/User.kt b/app/src/main/java/foundation/e/apps/data/enums/User.kt similarity index 63% rename from app/src/main/java/foundation/e/apps/utils/enums/User.kt rename to app/src/main/java/foundation/e/apps/data/enums/User.kt index 1363b7fa0..e9190cfd9 100644 --- a/app/src/main/java/foundation/e/apps/utils/enums/User.kt +++ b/app/src/main/java/foundation/e/apps/data/enums/User.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.utils.enums +package foundation.e.apps.data.enums enum class User { NO_GOOGLE, 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 d9c327ea0..d5f56dc17 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 @@ -26,9 +26,9 @@ import foundation.e.apps.data.exodus.TrackerDao import foundation.e.apps.data.exodus.models.AppPrivacyInfo import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.getResult -import foundation.e.apps.utils.enums.Origin +import foundation.e.apps.data.enums.Origin import foundation.e.apps.utils.getFormattedString -import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL +import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL import java.util.Date import java.util.Locale import javax.inject.Inject 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 29a2dc542..52933b3f8 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.fdroid.models.BuildInfo import foundation.e.apps.data.fdroid.models.FdroidEntity import foundation.e.apps.data.fused.data.FusedApp -import foundation.e.apps.utils.enums.Origin +import foundation.e.apps.data.enums.Origin import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/fused/FusedAPIImpl.kt b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIImpl.kt index d8217afdc..5b6f6f4d7 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/FusedAPIImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIImpl.kt @@ -36,7 +36,7 @@ import foundation.e.apps.R import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher -import foundation.e.apps.data.cleanapk.CleanApkRepository +import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository import foundation.e.apps.data.cleanapk.data.app.Application import foundation.e.apps.data.cleanapk.data.categories.Categories import foundation.e.apps.data.cleanapk.data.home.Home @@ -53,17 +53,17 @@ import foundation.e.apps.data.gplay.GplayStoreRepository import foundation.e.apps.ui.home.model.HomeChildFusedAppDiffUtil import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.install.pkg.PkgManagerModule -import foundation.e.apps.utils.Constants.timeoutDurationInMillis -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.Source -import foundation.e.apps.utils.enums.FilterLevel -import foundation.e.apps.utils.enums.AppTag -import foundation.e.apps.utils.enums.isUnFiltered -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Type -import foundation.e.apps.utils.modules.PWAManagerModule -import foundation.e.apps.utils.modules.PreferenceManagerModule +import foundation.e.apps.data.Constants.timeoutDurationInMillis +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.Source +import foundation.e.apps.data.enums.FilterLevel +import foundation.e.apps.data.enums.AppTag +import foundation.e.apps.data.enums.isUnFiltered +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.Type +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.data.prefrences.PreferenceManagerModule import kotlinx.coroutines.Deferred import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt index dded8b8b9..e454726ee 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt @@ -30,10 +30,10 @@ import foundation.e.apps.data.fused.data.FusedCategory import foundation.e.apps.data.fused.data.FusedHome import foundation.e.apps.data.fused.utils.CategoryType import foundation.e.apps.data.database.fusedDownload.FusedDownload -import foundation.e.apps.utils.enums.FilterLevel -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status +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 javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/FusedApp.kt b/app/src/main/java/foundation/e/apps/data/fused/data/FusedApp.kt index d8cece0ea..bda418240 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/data/FusedApp.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/data/FusedApp.kt @@ -19,11 +19,11 @@ package foundation.e.apps.data.fused.data import com.aurora.gplayapi.Constants.Restriction -import foundation.e.apps.utils.enums.FilterLevel -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.Type -import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL +import foundation.e.apps.data.enums.FilterLevel +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.di.CommonUtilsModule.LIST_OF_NULL data class FusedApp( val _id: String = String(), diff --git a/app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt b/app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt index 96bc44188..13a24cb5c 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt @@ -18,7 +18,7 @@ package foundation.e.apps.data.fused.data -import foundation.e.apps.utils.enums.AppTag +import foundation.e.apps.data.enums.AppTag import java.util.UUID data class FusedCategory( diff --git a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt index bf25b4c2f..fcb461edf 100644 --- a/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerImpl.kt @@ -33,9 +33,9 @@ import foundation.e.apps.data.database.fusedDownload.DatabaseRepository import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.install.download.data.DownloadProgressLD import foundation.e.apps.install.pkg.PkgManagerModule -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.Type -import foundation.e.apps.utils.modules.PWAManagerModule +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.Type +import foundation.e.apps.install.pkg.PWAManagerModule 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/fusedDownload/FusedManagerRepository.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedManagerRepository.kt index bbac284e9..029b067f0 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 @@ -11,7 +11,7 @@ import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.install.workmanager.InstallWorkManager -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import kotlinx.coroutines.flow.Flow import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/fusedDownload/IFusedManager.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/IFusedManager.kt index 6707a5102..5bec97697 100644 --- a/app/src/main/java/foundation/e/apps/data/fusedDownload/IFusedManager.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/IFusedManager.kt @@ -20,7 +20,7 @@ package foundation.e.apps.data.fusedDownload import androidx.lifecycle.LiveData import foundation.e.apps.data.database.fusedDownload.FusedDownload -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import java.io.File interface IFusedManager { diff --git a/app/src/main/java/foundation/e/apps/data/gplay/utils/GPlayHttpClient.kt b/app/src/main/java/foundation/e/apps/data/gplay/utils/GPlayHttpClient.kt index ec3fce250..fd3cc1d48 100644 --- a/app/src/main/java/foundation/e/apps/data/gplay/utils/GPlayHttpClient.kt +++ b/app/src/main/java/foundation/e/apps/data/gplay/utils/GPlayHttpClient.kt @@ -24,7 +24,7 @@ import com.aurora.gplayapi.network.IHttpClient import foundation.e.apps.data.login.AuthObject import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus -import foundation.e.apps.utils.modules.CommonUtilsFunctions +import foundation.e.apps.utils.CommonUtilsFunctions import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch import okhttp3.Cache diff --git a/app/src/main/java/foundation/e/apps/data/login/AuthObject.kt b/app/src/main/java/foundation/e/apps/data/login/AuthObject.kt index 8a20bdd70..88fbbe04c 100644 --- a/app/src/main/java/foundation/e/apps/data/login/AuthObject.kt +++ b/app/src/main/java/foundation/e/apps/data/login/AuthObject.kt @@ -20,9 +20,9 @@ package foundation.e.apps.data.login import com.aurora.gplayapi.data.models.AuthData import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.login.AuthObject.GPlayAuth -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayValidationException +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayValidationException /** * Auth objects define which sources data is to be loaded from, for each source, also provides diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt b/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt index 02148a502..6f3646153 100644 --- a/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt @@ -17,8 +17,8 @@ package foundation.e.apps.data.login -import foundation.e.apps.utils.Constants -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.Constants +import foundation.e.apps.data.enums.User import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt b/app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt index 2510651dd..2ab9cd0e7 100644 --- a/app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt @@ -24,11 +24,11 @@ import androidx.preference.PreferenceManager import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.qualifiers.ApplicationContext -import foundation.e.apps.utils.Constants.PREFERENCE_SHOW_FOSS -import foundation.e.apps.utils.Constants.PREFERENCE_SHOW_GPLAY -import foundation.e.apps.utils.Constants.PREFERENCE_SHOW_PWA -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.modules.DataStoreModule.Companion.dataStore +import foundation.e.apps.data.Constants.PREFERENCE_SHOW_FOSS +import foundation.e.apps.data.Constants.PREFERENCE_SHOW_GPLAY +import foundation.e.apps.data.Constants.PREFERENCE_SHOW_PWA +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.prefrences.DataStoreModule.Companion.dataStore import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt index 01c41423b..a5f49569b 100644 --- a/app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt @@ -18,7 +18,7 @@ package foundation.e.apps.data.login import foundation.e.apps.data.ResultSupreme -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt index ac7cfb698..a9ab9fafa 100644 --- a/app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt @@ -26,9 +26,9 @@ import foundation.e.apps.data.login.api.GPlayApiFactory import foundation.e.apps.data.login.api.GPlayLoginInterface import foundation.e.apps.data.login.api.GoogleLoginApi import foundation.e.apps.data.login.api.LoginApiRepository -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.exceptions.GPlayValidationException +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.login.exceptions.GPlayValidationException import timber.log.Timber import java.util.Locale import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt index 5a8ccf26a..bbe9d7b7a 100644 --- a/app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt @@ -19,7 +19,7 @@ package foundation.e.apps.data.login import com.aurora.gplayapi.data.models.AuthData import foundation.e.apps.data.ResultSupreme -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt b/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt index 15916228c..25c54362e 100644 --- a/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt +++ b/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt @@ -21,8 +21,8 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.parentFragment.LoadingViewModel +import foundation.e.apps.data.enums.User +import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/data/login/api/GPlayApiFactory.kt b/app/src/main/java/foundation/e/apps/data/login/api/GPlayApiFactory.kt index 6ac998756..a2146e60c 100644 --- a/app/src/main/java/foundation/e/apps/data/login/api/GPlayApiFactory.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/GPlayApiFactory.kt @@ -20,7 +20,7 @@ package foundation.e.apps.data.login.api import com.google.gson.Gson import foundation.e.apps.data.gplay.utils.AC2DMTask import foundation.e.apps.data.gplay.utils.GPlayHttpClient -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User import java.util.Properties import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/data/login/api/LoginApiRepository.kt b/app/src/main/java/foundation/e/apps/data/login/api/LoginApiRepository.kt index bf337e79d..943e3d611 100644 --- a/app/src/main/java/foundation/e/apps/data/login/api/LoginApiRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/login/api/LoginApiRepository.kt @@ -21,9 +21,9 @@ import com.aurora.gplayapi.data.models.AuthData import com.aurora.gplayapi.data.models.PlayResponse import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.gplay.utils.AC2DMUtil -import foundation.e.apps.utils.Constants.timeoutDurationInMillis -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.exceptions.GPlayLoginException +import foundation.e.apps.data.Constants.timeoutDurationInMillis +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.login.exceptions.GPlayLoginException import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.withTimeout import java.util.Locale diff --git a/app/src/main/java/foundation/e/apps/utils/exceptions/CleanApkException.kt b/app/src/main/java/foundation/e/apps/data/login/exceptions/CleanApkException.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/utils/exceptions/CleanApkException.kt rename to app/src/main/java/foundation/e/apps/data/login/exceptions/CleanApkException.kt index 5fed1e3a0..293819914 100644 --- a/app/src/main/java/foundation/e/apps/utils/exceptions/CleanApkException.kt +++ b/app/src/main/java/foundation/e/apps/data/login/exceptions/CleanApkException.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.exceptions +package foundation.e.apps.data.login.exceptions /** * This exception is for all CleanApk data loading exceptions. diff --git a/app/src/main/java/foundation/e/apps/utils/exceptions/GPlayException.kt b/app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayException.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/utils/exceptions/GPlayException.kt rename to app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayException.kt index 5a01fb4d3..345208778 100644 --- a/app/src/main/java/foundation/e/apps/utils/exceptions/GPlayException.kt +++ b/app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayException.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.exceptions +package foundation.e.apps.data.login.exceptions /** * This exception is for all Google Play network calls or other GPlay related exceptions. diff --git a/app/src/main/java/foundation/e/apps/utils/exceptions/GPlayLoginException.kt b/app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayLoginException.kt similarity index 91% rename from app/src/main/java/foundation/e/apps/utils/exceptions/GPlayLoginException.kt rename to app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayLoginException.kt index 2902ba28f..d6a64a7bb 100644 --- a/app/src/main/java/foundation/e/apps/utils/exceptions/GPlayLoginException.kt +++ b/app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayLoginException.kt @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.exceptions +package foundation.e.apps.data.login.exceptions -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User /** * Parent class for all GPlay login related errors. diff --git a/app/src/main/java/foundation/e/apps/utils/exceptions/GPlayValidationException.kt b/app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayValidationException.kt similarity index 92% rename from app/src/main/java/foundation/e/apps/utils/exceptions/GPlayValidationException.kt rename to app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayValidationException.kt index 0257dc91c..5b4322a4c 100644 --- a/app/src/main/java/foundation/e/apps/utils/exceptions/GPlayValidationException.kt +++ b/app/src/main/java/foundation/e/apps/data/login/exceptions/GPlayValidationException.kt @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.exceptions +package foundation.e.apps.data.login.exceptions -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User /** * This exception is specifically used when a GPlay auth data could not be validated. diff --git a/app/src/main/java/foundation/e/apps/utils/exceptions/LoginException.kt b/app/src/main/java/foundation/e/apps/data/login/exceptions/LoginException.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/utils/exceptions/LoginException.kt rename to app/src/main/java/foundation/e/apps/data/login/exceptions/LoginException.kt index 01011dbdf..e69cb47b5 100644 --- a/app/src/main/java/foundation/e/apps/utils/exceptions/LoginException.kt +++ b/app/src/main/java/foundation/e/apps/data/login/exceptions/LoginException.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.exceptions +package foundation.e.apps.data.login.exceptions /** * Super class for all Login related exceptions. diff --git a/app/src/main/java/foundation/e/apps/utils/exceptions/UnknownSourceException.kt b/app/src/main/java/foundation/e/apps/data/login/exceptions/UnknownSourceException.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/utils/exceptions/UnknownSourceException.kt rename to app/src/main/java/foundation/e/apps/data/login/exceptions/UnknownSourceException.kt index 10e5ab362..3c881d9f6 100644 --- a/app/src/main/java/foundation/e/apps/utils/exceptions/UnknownSourceException.kt +++ b/app/src/main/java/foundation/e/apps/data/login/exceptions/UnknownSourceException.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.exceptions +package foundation.e.apps.data.login.exceptions /** * Generic exception class - used to define unknown errors. diff --git a/app/src/main/java/foundation/e/apps/utils/modules/DataStoreManager.kt b/app/src/main/java/foundation/e/apps/data/prefrences/DataStoreManager.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/utils/modules/DataStoreManager.kt rename to app/src/main/java/foundation/e/apps/data/prefrences/DataStoreManager.kt index 9be76a382..26d8b05ac 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/DataStoreManager.kt +++ b/app/src/main/java/foundation/e/apps/data/prefrences/DataStoreManager.kt @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.data.prefrences import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/utils/modules/DataStoreModule.kt b/app/src/main/java/foundation/e/apps/data/prefrences/DataStoreModule.kt similarity index 95% rename from app/src/main/java/foundation/e/apps/utils/modules/DataStoreModule.kt rename to app/src/main/java/foundation/e/apps/data/prefrences/DataStoreModule.kt index e30305e9b..b6849db1d 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/DataStoreModule.kt +++ b/app/src/main/java/foundation/e/apps/data/prefrences/DataStoreModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.data.prefrences import android.content.Context import androidx.datastore.preferences.core.booleanPreferencesKey @@ -26,7 +26,7 @@ import androidx.datastore.preferences.preferencesDataStore import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.qualifiers.ApplicationContext -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/foundation/e/apps/utils/modules/PreferenceManagerModule.kt b/app/src/main/java/foundation/e/apps/data/prefrences/PreferenceManagerModule.kt similarity index 88% rename from app/src/main/java/foundation/e/apps/utils/modules/PreferenceManagerModule.kt rename to app/src/main/java/foundation/e/apps/data/prefrences/PreferenceManagerModule.kt index a6274f061..f95a5de7e 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/PreferenceManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/data/prefrences/PreferenceManagerModule.kt @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.data.prefrences import android.content.Context import androidx.preference.PreferenceManager import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.OpenForTesting import foundation.e.apps.R -import foundation.e.apps.utils.Constants.PREFERENCE_SHOW_FOSS -import foundation.e.apps.utils.Constants.PREFERENCE_SHOW_GPLAY -import foundation.e.apps.utils.Constants.PREFERENCE_SHOW_PWA +import foundation.e.apps.data.Constants.PREFERENCE_SHOW_FOSS +import foundation.e.apps.data.Constants.PREFERENCE_SHOW_GPLAY +import foundation.e.apps.data.Constants.PREFERENCE_SHOW_PWA import javax.inject.Inject import javax.inject.Singleton 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 ee08d1f89..0adc6f3cb 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 @@ -29,11 +29,11 @@ import foundation.e.apps.data.fused.FusedAPIImpl.Companion.APP_TYPE_ANY import foundation.e.apps.data.fused.FusedAPIRepository import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.install.pkg.PkgManagerModule -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.isUnFiltered -import foundation.e.apps.utils.modules.PreferenceManagerModule +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.enums.isUnFiltered +import foundation.e.apps.data.prefrences.PreferenceManagerModule import javax.inject.Inject import timber.log.Timber 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 500de15aa..efdb97546 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 @@ -21,7 +21,7 @@ package foundation.e.apps.data.updates import com.aurora.gplayapi.data.models.AuthData import foundation.e.apps.data.fused.UpdatesDao import foundation.e.apps.data.fused.data.FusedApp -import foundation.e.apps.utils.enums.ResultStatus +import foundation.e.apps.data.enums.ResultStatus import javax.inject.Inject class UpdatesManagerRepository @Inject constructor( diff --git a/app/src/main/java/foundation/e/apps/utils/modules/CommonUtilsModule.kt b/app/src/main/java/foundation/e/apps/di/CommonUtilsModule.kt similarity index 96% rename from app/src/main/java/foundation/e/apps/utils/modules/CommonUtilsModule.kt rename to app/src/main/java/foundation/e/apps/di/CommonUtilsModule.kt index a533a77e5..f868f978a 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/CommonUtilsModule.kt +++ b/app/src/main/java/foundation/e/apps/di/CommonUtilsModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.di import android.content.ClipboardManager import android.content.Context diff --git a/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt b/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt index 30ef6981d..98f305040 100644 --- a/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt +++ b/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt @@ -25,12 +25,12 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import foundation.e.apps.data.cleanapk.CleanApkRepository +import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository import foundation.e.apps.data.gplay.GplayStoreRepository import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.data.cleanapk.CleanApkAppDetailsRetrofit -import foundation.e.apps.data.cleanapk.CleanApkAppsRepositoryImpl -import foundation.e.apps.data.cleanapk.CleanApkPWARepository +import foundation.e.apps.data.cleanapk.repositories.CleanApkAppsRepositoryImpl +import foundation.e.apps.data.cleanapk.repositories.CleanApkPWARepository import foundation.e.apps.data.gplay.GplayStoreRepositoryImpl import foundation.e.apps.data.gplay.utils.GPlayHttpClient import foundation.e.apps.data.login.LoginSourceRepository diff --git a/app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt index e41c67955..43377d3da 100644 --- a/app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt +++ b/app/src/main/java/foundation/e/apps/install/download/DownloadManagerUtils.kt @@ -22,8 +22,8 @@ import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.data.fusedDownload.FusedManagerRepository -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.Status import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay diff --git a/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerUtils.kt b/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerUtils.kt index 57984639a..76d3114c8 100644 --- a/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerUtils.kt +++ b/app/src/main/java/foundation/e/apps/install/notification/NotificationManagerUtils.kt @@ -22,7 +22,7 @@ import android.content.Context import androidx.core.app.NotificationCompat import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.utils.modules.PreferenceManagerModule +import foundation.e.apps.data.prefrences.PreferenceManagerModule import javax.inject.Inject class NotificationManagerUtils @Inject constructor( 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 9212e1365..76675d95b 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 @@ -28,7 +28,7 @@ import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fused.UpdatesDao import foundation.e.apps.data.fusedDownload.FusedManagerRepository -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus import kotlinx.coroutines.DelicateCoroutinesApi diff --git a/app/src/main/java/foundation/e/apps/utils/modules/PWAManagerModule.kt b/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/utils/modules/PWAManagerModule.kt rename to app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt index 2413796b0..604e7b949 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/PWAManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PWAManagerModule.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.utils.modules +package foundation.e.apps.install.pkg import android.content.ContentUris import android.content.ContentValues @@ -16,7 +16,7 @@ import foundation.e.apps.OpenForTesting import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.database.fusedDownload.DatabaseRepository import foundation.e.apps.data.database.fusedDownload.FusedDownload -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import kotlinx.coroutines.delay import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt b/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt index 6ce9fed9d..fe898bae1 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt @@ -24,7 +24,7 @@ import android.content.pm.PackageInstaller import android.os.IBinder import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.fusedDownload.FusedManagerRepository -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt index 4326e64ed..e6e7f75fd 100644 --- a/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt +++ b/app/src/main/java/foundation/e/apps/install/pkg/PkgManagerBR.kt @@ -25,7 +25,7 @@ import android.content.pm.PackageInstaller import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fusedDownload.FusedManagerRepository -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope 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 1206c8341..9424ea932 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 @@ -33,9 +33,9 @@ import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.OpenForTesting import foundation.e.apps.data.fused.FusedAPIImpl import foundation.e.apps.data.database.fusedDownload.FusedDownload -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.Type +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.Type import kotlinx.coroutines.DelicateCoroutinesApi import timber.log.Timber import java.io.File diff --git a/app/src/main/java/foundation/e/apps/install/receiver/PWAPlayerStatusReceiver.kt b/app/src/main/java/foundation/e/apps/install/receiver/PWAPlayerStatusReceiver.kt index b5001879e..82c0fcf38 100644 --- a/app/src/main/java/foundation/e/apps/install/receiver/PWAPlayerStatusReceiver.kt +++ b/app/src/main/java/foundation/e/apps/install/receiver/PWAPlayerStatusReceiver.kt @@ -22,7 +22,7 @@ import android.content.Context import android.content.Intent import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.data.database.fusedDownload.DatabaseRepository -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope 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 4f17dff30..dd549831f 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 @@ -29,7 +29,7 @@ import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.install.download.DownloadManager import foundation.e.apps.data.fused.FusedAPIRepository -import foundation.e.apps.utils.modules.DataStoreModule +import foundation.e.apps.data.prefrences.DataStoreModule import foundation.e.splitinstall.ISplitInstallService import foundation.e.splitinstall.SplitInstall import kotlinx.coroutines.launch diff --git a/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt index a1d9a30f3..02999b9fb 100644 --- a/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt @@ -21,7 +21,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.work.ExistingPeriodicWorkPolicy -import foundation.e.apps.utils.modules.PreferenceManagerModule +import foundation.e.apps.data.prefrences.PreferenceManagerModule import timber.log.Timber class UpdatesBroadcastReceiver : BroadcastReceiver() { 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 3ac7ec833..e79946a16 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 @@ -29,13 +29,13 @@ import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.install.workmanager.InstallWorkManager import foundation.e.apps.ui.updates.UpdatesNotifier -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Type -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.Type +import foundation.e.apps.data.enums.User import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus -import foundation.e.apps.utils.modules.DataStoreManager +import foundation.e.apps.data.prefrences.DataStoreManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext 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 6135900e9..9bcdc3e41 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,10 +26,10 @@ import foundation.e.apps.data.database.fusedDownload.DatabaseRepository import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.ui.updates.UpdatesNotifier -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.Status import foundation.e.apps.utils.getFormattedString -import foundation.e.apps.utils.modules.DataStoreManager +import foundation.e.apps.data.prefrences.DataStoreManager import kotlinx.coroutines.flow.transformWhile import timber.log.Timber import java.text.NumberFormat 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 2c0ecc7bb..b526fba31 100644 --- a/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt @@ -11,7 +11,7 @@ import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fdroid.FdroidRepository import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.gplay.GPlayAPIRepository -import foundation.e.apps.utils.modules.DataStoreModule +import foundation.e.apps.data.prefrences.DataStoreModule import javax.inject.Inject /** diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt index aa13b15fd..e4d6d94b5 100644 --- a/app/src/main/java/foundation/e/apps/ui/MainActivity.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivity.kt @@ -51,11 +51,11 @@ import foundation.e.apps.ui.purchase.AppPurchaseFragmentDirections import foundation.e.apps.ui.settings.SettingsFragment import foundation.e.apps.ui.setup.signin.SignInViewModel import foundation.e.apps.ui.updates.UpdatesNotifier -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus -import foundation.e.apps.utils.exceptions.GPlayValidationException -import foundation.e.apps.utils.modules.CommonUtilsFunctions +import foundation.e.apps.data.login.exceptions.GPlayValidationException +import foundation.e.apps.utils.CommonUtilsFunctions import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter 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 fe30c75b4..1ed4a1f90 100644 --- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt @@ -48,14 +48,14 @@ import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.data.fusedDownload.FusedManagerRepository import foundation.e.apps.install.pkg.PkgManagerModule -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.Type -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.enums.isInitialized -import foundation.e.apps.utils.enums.isUnFiltered -import foundation.e.apps.utils.modules.DataStoreModule -import foundation.e.apps.utils.modules.PWAManagerModule +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.enums.User +import foundation.e.apps.data.enums.isInitialized +import foundation.e.apps.data.enums.isUnFiltered +import foundation.e.apps.data.prefrences.DataStoreModule +import foundation.e.apps.install.pkg.PWAManagerModule import kotlinx.coroutines.channels.ProducerScope import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.callbackFlow 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 582dfecf8..8d2aefe5d 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 @@ -57,15 +57,15 @@ import foundation.e.apps.databinding.FragmentApplicationBinding import foundation.e.apps.data.login.AuthObject import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.install.pkg.PkgManagerModule -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.enums.isInitialized -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL -import foundation.e.apps.utils.modules.PWAManagerModule -import foundation.e.apps.utils.parentFragment.TimeoutFragment +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.enums.User +import foundation.e.apps.data.enums.isInitialized +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.ui.parentFragment.TimeoutFragment import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import timber.log.Timber 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 c62f5f671..8638e8e44 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 @@ -31,12 +31,12 @@ import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.install.download.data.DownloadProgressLD import foundation.e.apps.data.fusedDownload.FusedManagerRepository -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +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.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsRVAdapter.kt index 90257370a..ddc351d58 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/model/ApplicationScreenshotsRVAdapter.kt @@ -27,7 +27,7 @@ import coil.load import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.databinding.ApplicationScreenshotsListItemBinding import foundation.e.apps.ui.application.ApplicationFragmentDirections -import foundation.e.apps.utils.enums.Origin +import foundation.e.apps.data.enums.Origin class ApplicationScreenshotsRVAdapter( private val origin: Origin diff --git a/app/src/main/java/foundation/e/apps/ui/application/model/ScreenshotRVAdapter.kt b/app/src/main/java/foundation/e/apps/ui/application/model/ScreenshotRVAdapter.kt index 21f54e7e4..36df6c043 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/model/ScreenshotRVAdapter.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/model/ScreenshotRVAdapter.kt @@ -28,7 +28,7 @@ import coil.load import foundation.e.apps.R import foundation.e.apps.data.cleanapk.CleanApkRetrofit import foundation.e.apps.databinding.ScreenshotListItemBinding -import foundation.e.apps.utils.enums.Origin +import foundation.e.apps.data.enums.Origin class ScreenshotRVAdapter(private val list: List, private val origin: Origin) : RecyclerView.Adapter() { 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 13fbf72bb..4013e7095 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 @@ -19,7 +19,7 @@ package foundation.e.apps.ui.applicationlist import androidx.recyclerview.widget.DiffUtil import foundation.e.apps.data.fused.data.FusedApp -import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL +import foundation.e.apps.di.CommonUtilsModule.LIST_OF_NULL class ApplicationDiffUtil : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: FusedApp, newItem: FusedApp): Boolean { 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 d185d9679..953b14d6b 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 @@ -44,10 +44,10 @@ import foundation.e.apps.databinding.FragmentApplicationListBinding import foundation.e.apps.data.login.AuthObject import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.install.pkg.PkgManagerModule -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.modules.PWAManagerModule -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.ui.parentFragment.TimeoutFragment import kotlinx.coroutines.launch import javax.inject.Inject 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 081a7e16f..56fc53381 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 @@ -49,9 +49,9 @@ import foundation.e.apps.ui.search.SearchFragmentDirections import foundation.e.apps.ui.updates.UpdatesFragmentDirections import foundation.e.apps.utils.disableInstallButton import foundation.e.apps.utils.enableInstallButton -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.User import timber.log.Timber import javax.inject.Singleton 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 1b2c181df..b73b66db0 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 @@ -26,9 +26,9 @@ import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.fused.FusedAPIRepository import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.login.AuthObject -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import javax.inject.Inject 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 545894427..65c98c2fc 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 @@ -31,8 +31,8 @@ import foundation.e.apps.data.fused.utils.CategoryType import foundation.e.apps.ui.categories.model.CategoriesRVAdapter import foundation.e.apps.databinding.FragmentAppsBinding import foundation.e.apps.data.login.AuthObject -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.ui.parentFragment.TimeoutFragment @AndroidEntryPoint class AppsFragment : TimeoutFragment(R.layout.fragment_apps) { 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 cc4db97c0..b80cba1fa 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 @@ -26,10 +26,10 @@ import foundation.e.apps.data.fused.FusedAPIRepository import foundation.e.apps.data.fused.data.FusedCategory import foundation.e.apps.data.fused.utils.CategoryType import foundation.e.apps.data.login.AuthObject -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.launch import javax.inject.Inject 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 b1e465752..5e0f758b6 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 @@ -31,8 +31,8 @@ import foundation.e.apps.data.fused.utils.CategoryType import foundation.e.apps.ui.categories.model.CategoriesRVAdapter import foundation.e.apps.databinding.FragmentGamesBinding import foundation.e.apps.data.login.AuthObject -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.ui.parentFragment.TimeoutFragment @AndroidEntryPoint class GamesFragment : TimeoutFragment(R.layout.fragment_games) { 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 20430025e..bfbc1d2a3 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 @@ -43,12 +43,12 @@ import foundation.e.apps.ui.home.model.HomeChildRVAdapter import foundation.e.apps.ui.home.model.HomeParentRVAdapter import foundation.e.apps.data.login.AuthObject import foundation.e.apps.install.download.data.DownloadProgress -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.modules.CommonUtilsModule.safeNavigate -import foundation.e.apps.utils.modules.PWAManagerModule -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.di.CommonUtilsModule.safeNavigate +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.ui.parentFragment.TimeoutFragment import kotlinx.coroutines.launch import javax.inject.Inject 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 30967281f..2fbea50a8 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 @@ -28,9 +28,9 @@ import foundation.e.apps.data.fused.FusedAPIRepository import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.fused.data.FusedHome import foundation.e.apps.data.login.AuthObject -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.launch import javax.inject.Inject 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 be456d974..ec582ae71 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 @@ -42,9 +42,9 @@ import foundation.e.apps.databinding.HomeChildListItemBinding import foundation.e.apps.ui.home.HomeFragmentDirections import foundation.e.apps.utils.disableInstallButton import foundation.e.apps.utils.enableInstallButton -import foundation.e.apps.utils.enums.Origin -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.User class HomeChildRVAdapter( private var fusedAPIInterface: FusedAPIInterface?, diff --git a/app/src/main/java/foundation/e/apps/utils/parentFragment/LoadingViewModel.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/LoadingViewModel.kt similarity index 93% rename from app/src/main/java/foundation/e/apps/utils/parentFragment/LoadingViewModel.kt rename to app/src/main/java/foundation/e/apps/ui/parentFragment/LoadingViewModel.kt index 7e61e6b58..a59e502ca 100644 --- a/app/src/main/java/foundation/e/apps/utils/parentFragment/LoadingViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/LoadingViewModel.kt @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.parentFragment +package foundation.e.apps.ui.parentFragment import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import foundation.e.apps.data.login.AuthObject -import foundation.e.apps.utils.exceptions.GPlayValidationException -import foundation.e.apps.utils.exceptions.UnknownSourceException +import foundation.e.apps.data.login.exceptions.GPlayValidationException +import foundation.e.apps.data.login.exceptions.UnknownSourceException abstract class LoadingViewModel : ViewModel() { diff --git a/app/src/main/java/foundation/e/apps/utils/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt similarity index 97% rename from app/src/main/java/foundation/e/apps/utils/parentFragment/TimeoutFragment.kt rename to app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt index 2e0d9bb2d..5fa10b95b 100644 --- a/app/src/main/java/foundation/e/apps/utils/parentFragment/TimeoutFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.parentFragment +package foundation.e.apps.ui.parentFragment import androidx.annotation.LayoutRes import androidx.appcompat.app.AlertDialog @@ -32,12 +32,12 @@ import foundation.e.apps.databinding.DialogErrorLogBinding import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.login.LoginSourceGPlay import foundation.e.apps.data.login.LoginViewModel -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.exceptions.GPlayValidationException -import foundation.e.apps.utils.exceptions.UnknownSourceException +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.data.login.exceptions.GPlayValidationException +import foundation.e.apps.data.login.exceptions.UnknownSourceException import timber.log.Timber /** 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 334ad55a1..6b26d4df2 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 @@ -55,10 +55,10 @@ import foundation.e.apps.databinding.FragmentSearchBinding import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.install.download.data.DownloadProgress -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.modules.PWAManagerModule -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.ui.parentFragment.TimeoutFragment import kotlinx.coroutines.launch import javax.inject.Inject 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 cba087637..09f8b2d6a 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 @@ -29,9 +29,9 @@ import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.fused.FusedAPIRepository import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.login.AuthObject -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import javax.inject.Inject 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 76a52a613..711d35021 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 @@ -44,8 +44,8 @@ import foundation.e.apps.data.fused.UpdatesDao import foundation.e.apps.databinding.CustomPreferenceBinding import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.install.updates.UpdatesWorkManager -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.modules.CommonUtilsFunctions +import foundation.e.apps.data.enums.User +import foundation.e.apps.utils.CommonUtilsFunctions import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt index bf4f8ba24..adcb3f0b0 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/LocaleChangedBroadcastReceiver.kt @@ -24,7 +24,7 @@ import android.content.Intent import com.aurora.gplayapi.data.models.AuthData import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint -import foundation.e.apps.utils.modules.DataStoreModule +import foundation.e.apps.data.prefrences.DataStoreModule import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt index 5ced07b33..47a701711 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt @@ -9,7 +9,7 @@ import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R import foundation.e.apps.databinding.FragmentSignInBinding import foundation.e.apps.data.login.LoginViewModel -import foundation.e.apps.utils.modules.CommonUtilsModule.safeNavigate +import foundation.e.apps.di.CommonUtilsModule.safeNavigate @AndroidEntryPoint class SignInFragment : Fragment(R.layout.fragment_sign_in) { diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt index f91f0c7a7..58a3d2e64 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt @@ -7,8 +7,8 @@ import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import com.aurora.gplayapi.data.models.AuthData import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.modules.DataStoreModule +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.prefrences.DataStoreModule import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt index 314b64168..a42a9bc62 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/signin/google/GoogleSignInFragment.kt @@ -34,7 +34,7 @@ import foundation.e.apps.R import foundation.e.apps.data.gplay.utils.AC2DMUtil import foundation.e.apps.databinding.FragmentGoogleSigninBinding import foundation.e.apps.data.login.LoginViewModel -import foundation.e.apps.utils.modules.CommonUtilsModule.safeNavigate +import foundation.e.apps.di.CommonUtilsModule.safeNavigate @AndroidEntryPoint class GoogleSignInFragment : Fragment(R.layout.fragment_google_signin) { diff --git a/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt index b616cc43b..4806e3a58 100644 --- a/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/setup/tos/TOSViewModel.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import foundation.e.apps.utils.modules.DataStoreModule +import foundation.e.apps.data.prefrences.DataStoreModule import kotlinx.coroutines.launch import javax.inject.Inject 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 e7e1fdd7a..d8446b47f 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 @@ -49,15 +49,15 @@ import foundation.e.apps.data.database.fusedDownload.FusedDownload import foundation.e.apps.install.download.data.DownloadProgress import foundation.e.apps.install.workmanager.InstallWorkManager.INSTALL_WORK_NAME import foundation.e.apps.install.updates.UpdatesWorkManager -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.Status import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.modules.CommonUtilsModule.safeNavigate -import foundation.e.apps.utils.modules.PWAManagerModule -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.data.login.exceptions.GPlayLoginException +import foundation.e.apps.di.CommonUtilsModule.safeNavigate +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.ui.parentFragment.TimeoutFragment import foundation.e.apps.utils.toast import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.filter 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 4368c292b..1d7ef3da8 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 @@ -27,12 +27,12 @@ import foundation.e.apps.data.fused.FusedAPIRepository import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.login.AuthObject import foundation.e.apps.data.updates.UpdatesManagerRepository -import foundation.e.apps.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.modules.PreferenceManagerModule -import foundation.e.apps.utils.parentFragment.LoadingViewModel +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.data.prefrences.PreferenceManagerModule +import foundation.e.apps.ui.parentFragment.LoadingViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/foundation/e/apps/utils/modules/CommonUtilsFunctions.kt b/app/src/main/java/foundation/e/apps/utils/CommonUtilsFunctions.kt similarity index 98% rename from app/src/main/java/foundation/e/apps/utils/modules/CommonUtilsFunctions.kt rename to app/src/main/java/foundation/e/apps/utils/CommonUtilsFunctions.kt index 6dcf53f9b..f3f93b989 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/CommonUtilsFunctions.kt +++ b/app/src/main/java/foundation/e/apps/utils/CommonUtilsFunctions.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.utils import android.annotation.SuppressLint import android.content.ClipData diff --git a/app/src/main/java/foundation/e/apps/utils/CommonUtils.kt b/app/src/main/java/foundation/e/apps/utils/Extensions.kt similarity index 100% rename from app/src/main/java/foundation/e/apps/utils/CommonUtils.kt rename to app/src/main/java/foundation/e/apps/utils/Extensions.kt diff --git a/app/src/main/java/foundation/e/apps/utils/MaterialButtonUtils.kt b/app/src/main/java/foundation/e/apps/utils/MaterialButtonUtils.kt index 1d6b29825..6e1ff3745 100644 --- a/app/src/main/java/foundation/e/apps/utils/MaterialButtonUtils.kt +++ b/app/src/main/java/foundation/e/apps/utils/MaterialButtonUtils.kt @@ -21,7 +21,7 @@ import android.graphics.Color import androidx.core.content.ContextCompat import com.google.android.material.button.MaterialButton import foundation.e.apps.R -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.enums.Status fun MaterialButton.disableInstallButton(status: Status? = null) { toggleEnableMaterialButton(false, status) diff --git a/app/src/main/java/foundation/e/apps/utils/enums/Type.kt b/app/src/main/java/foundation/e/apps/utils/enums/Type.kt deleted file mode 100644 index dd5775b0d..000000000 --- a/app/src/main/java/foundation/e/apps/utils/enums/Type.kt +++ /dev/null @@ -1,6 +0,0 @@ -package foundation.e.apps.utils.enums - -enum class Type { - NATIVE, - PWA -} diff --git a/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt b/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt index 449afdf19..d979763ed 100644 --- a/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt +++ b/app/src/main/java/foundation/e/apps/utils/eventBus/AppEvent.kt @@ -21,7 +21,7 @@ package foundation.e.apps.utils.eventBus import foundation.e.apps.data.ResultSupreme -import foundation.e.apps.utils.enums.ResultStatus +import foundation.e.apps.data.enums.ResultStatus sealed class AppEvent(val data: Any) { class SignatureMissMatchError(packageName: String) : AppEvent(packageName) diff --git a/app/src/main/res/navigation/navigation_resource.xml b/app/src/main/res/navigation/navigation_resource.xml index 2a91f84a6..9077ebf27 100644 --- a/app/src/main/res/navigation/navigation_resource.xml +++ b/app/src/main/res/navigation/navigation_resource.xml @@ -105,7 +105,7 @@ + app:argType="foundation.e.apps.data.enums.Origin" /> + app:argType="foundation.e.apps.data.enums.Origin" />