From 1c9968e47c9052dfce208c038ceab11f8b5083a9 Mon Sep 17 00:00:00 2001 From: hasibprince Date: Wed, 24 May 2023 18:33:57 +0600 Subject: [PATCH] refactored package structure --- app/src/main/AndroidManifest.xml | 16 ++--- .../foundation/e/apps/AppLoungeApplication.kt | 14 ++-- .../repositories/IAppPrivacyInfoRepository.kt | 10 --- .../e/apps/{api => data}/ApiCaller.kt | 2 +- .../apps/{api => data}/BaseStoreRepository.kt | 2 +- .../e/apps/{utils => data}/Constants.kt | 2 +- .../e/apps/{api => data}/DownloadManager.kt | 2 +- .../e/apps/{api => data}/JobResult.kt | 4 +- .../foundation/e/apps/{api => data}/Result.kt | 2 +- .../e/apps/{api => data}/ResultSupreme.kt | 4 +- .../blockedApps/AppWarningInfo.kt | 2 +- .../blockedApps/BlockedAppRepository.kt | 6 +- .../cleanapk/ApkSignatureManager.kt | 2 +- .../cleanapk/ApplicationDeserializer.kt | 4 +- .../cleanapk/CleanApkAppDetailsRetrofit.kt | 4 +- .../cleanapk/CleanApkDownloadInfoFetcher.kt | 4 +- .../cleanapk/CleanApkRetrofit.kt | 12 ++-- .../{api => data}/cleanapk/RetrofitModule.kt | 12 ++-- .../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 | 6 +- .../cleanapk/data/home/HomeScreen.kt | 2 +- .../cleanapk/data/search/Search.kt | 4 +- .../repositories}/CleanAPKRepository.kt | 14 ++-- .../CleanApkAppsRepositoryImpl.kt | 15 +++-- .../repositories}/CleanApkPWARepository.kt | 10 +-- .../repositories}/CleanApkRepository.kt | 8 +-- .../{api => data}/database/AppDatabase.kt | 14 ++-- .../database/fusedDownload}/FusedConverter.kt | 2 +- .../database/fusedDownload}/FusedDatabase.kt | 8 +-- .../ecloud/EcloudApiInterface.kt | 4 +- .../{api => data}/ecloud/EcloudRepository.kt | 4 +- .../ecloud/modules/FaultyToken.kt | 2 +- .../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 +- .../{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 | 24 +++---- .../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 | 12 ++-- .../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 | 64 +++++++++---------- .../{api => data}/fused/FusedAPIInterface.kt | 4 +- .../{api => data}/fused/FusedAPIRepository.kt | 22 +++---- .../e/apps/{api => data}/fused/UpdatesDao.kt | 6 +- .../apps/{api => data}/fused/data/FusedApp.kt | 12 ++-- .../{api => data}/fused/data/FusedCategory.kt | 4 +- .../{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/FusedDownloadDAO.kt | 3 +- .../fusedDownload/FusedDownloadRepository.kt} | 7 +- .../fusedDownload}/FusedManagerImpl.kt | 49 +++++++------- .../fusedDownload}/FusedManagerRepository.kt | 14 ++-- .../fusedDownload}/IFusedManager.kt | 6 +- .../fusedDownload/models}/FusedDownload.kt | 8 +-- .../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 | 6 +- .../utils/NativeDeviceInfoProviderModule.kt | 2 +- .../gplay/utils/NativeGsfVersionProvider.kt | 2 +- .../{ => data}/login/AuthDataValidator.kt | 4 +- .../e/apps/{ => data}/login/AuthObject.kt | 12 ++-- .../e/apps/{ => data}/login/LoginCommon.kt | 6 +- .../e/apps/{ => data}/login/LoginDataStore.kt | 12 ++-- .../{ => data}/login/LoginSourceCleanApk.kt | 6 +- .../apps/{ => data}/login/LoginSourceGPlay.kt | 18 +++--- .../{ => data}/login/LoginSourceInterface.kt | 2 +- .../{ => data}/login/LoginSourceRepository.kt | 6 +- .../e/apps/{ => data}/login/LoginViewModel.kt | 6 +- .../{ => data}/login/api/AnonymousLoginApi.kt | 6 +- .../{ => data}/login/api/GPlayApiFactory.kt | 8 +-- .../login/api/GPlayLoginInterface.kt | 2 +- .../{ => data}/login/api/GoogleLoginApi.kt | 8 +-- .../login/api/LoginApiRepository.kt | 12 ++-- .../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 +- .../preference}/DataStoreManager.kt | 4 +- .../preference}/DataStoreModule.kt | 4 +- .../preference}/PreferenceManagerModule.kt | 8 +-- .../updates}/UpdatesManagerImpl.kt | 26 ++++---- .../updates}/UpdatesManagerRepository.kt | 8 +-- .../modules => di}/CommonUtilsModule.kt | 2 +- .../java/foundation/e/apps/di/DaoModule.kt | 8 +-- .../database => di}/DatabaseModule.kt | 5 +- .../java/foundation/e/apps/di/LoginModule.kt | 6 +- .../e/apps/di/NamedRepositoryModule.kt | 18 +++--- .../foundation/e/apps/di/RepositoryModule.kt | 12 ++-- .../download/DownloadManagerBR.kt | 2 +- .../download/DownloadManagerModule.kt | 2 +- .../download/DownloadManagerUtils.kt | 12 ++-- .../download/data/DownloadProgress.kt | 2 +- .../download/data/DownloadProgressLD.kt | 4 +- .../notification/NotificationManagerModule.kt | 2 +- .../notification/NotificationManagerUtils.kt | 4 +- .../pkg/InstallerService.kt | 10 +-- .../pkg}/PWAManagerModule.kt | 20 +++--- .../pkg/PackageInstallerService.kt | 6 +- .../{manager => install}/pkg/PkgManagerBR.kt | 8 +-- .../pkg/PkgManagerModule.kt | 12 ++-- .../receiver/PWAPlayerStatusReceiver.kt | 14 ++-- .../splitinstall/SplitInstallBinder.kt | 6 +- .../splitinstall/SplitInstallService.kt | 8 +-- .../updates}/UpdatesBroadcastReceiver.kt | 4 +- .../{ => install}/updates/UpdatesNotifier.kt | 4 +- .../updates}/UpdatesWorkManager.kt | 2 +- .../updates}/UpdatesWorker.kt | 30 ++++----- .../workmanager/AppInstallProcessor.kt | 26 ++++---- .../workmanager/InstallAppWorker.kt | 2 +- .../workmanager/InstallWorkManager.kt | 4 +- .../e/apps/{ => ui}/AppInfoFetchViewModel.kt | 14 ++-- .../e/apps/{ => ui}/AppProgressViewModel.kt | 10 +-- .../e/apps/{ => ui}/MainActivity.kt | 27 ++++---- .../e/apps/{ => ui}/MainActivityViewModel.kt | 33 +++++----- .../e/apps/{ => ui}/PrivacyInfoViewModel.kt | 10 +-- .../application/ApplicationFragment.kt | 42 ++++++------ .../application/ApplicationViewModel.kt | 28 ++++---- .../model/ApplicationScreenshotsDiffUtil.kt | 2 +- .../model/ApplicationScreenshotsRVAdapter.kt | 8 +-- .../application/model/DepthPageTransformer.kt | 2 +- .../application/model/ScreenshotRVAdapter.kt | 6 +- .../subFrags/ApplicationDialogFragment.kt | 2 +- .../subFrags/DescriptionFragment.kt | 2 +- .../subFrags/ScreenshotFragment.kt | 6 +- .../applicationlist/ApplicationDiffUtil.kt | 6 +- .../ApplicationListFragment.kt | 32 +++++----- .../ApplicationListRVAdapter.kt | 26 ++++---- .../ApplicationListViewModel.kt | 16 ++--- .../apps/{ => ui}/categories/AppsFragment.kt | 14 ++-- .../{ => ui}/categories/CategoriesFragment.kt | 4 +- .../categories/CategoriesViewModel.kt | 18 +++--- .../apps/{ => ui}/categories/GamesFragment.kt | 14 ++-- .../categories/model/CategoriesDiffUtil.kt | 4 +- .../categories/model/CategoriesRVAdapter.kt | 6 +- .../categories/model/CategoriesVPAdapter.kt | 6 +- .../e/apps/{ => ui}/home/HomeFragment.kt | 38 +++++------ .../e/apps/{ => ui}/home/HomeViewModel.kt | 18 +++--- .../{ => ui}/home/model/FusedHomeDiffUtil.kt | 4 +- .../home/model/HomeChildFusedAppDiffUtil.kt | 4 +- .../{ => ui}/home/model/HomeChildRVAdapter.kt | 20 +++--- .../home/model/HomeParentRVAdapter.kt | 12 ++-- .../parentFragment/LoadingViewModel.kt | 8 +-- .../parentFragment/TimeoutFragment.kt | 22 +++---- .../{ => ui}/purchase/AppPurchaseFragment.kt | 4 +- .../e/apps/{ => ui}/search/SearchFragment.kt | 32 +++++----- .../e/apps/{ => ui}/search/SearchViewModel.kt | 16 ++--- .../{ => ui}/settings/LongPressPreference.kt | 2 +- .../settings/RadioButtonPreference.kt | 2 +- .../{ => ui}/settings/SettingsFragment.kt | 16 ++--- .../signin/LocaleChangedBroadcastReceiver.kt | 4 +- .../{ => ui}/setup/signin/SignInFragment.kt | 6 +- .../{ => ui}/setup/signin/SignInViewModel.kt | 6 +- .../signin/google/GoogleSignInFragment.kt | 8 +-- .../e/apps/{ => ui}/setup/tos/TOSFragment.kt | 2 +- .../e/apps/{ => ui}/setup/tos/TOSViewModel.kt | 4 +- .../apps/{ => ui}/updates/UpdatesFragment.kt | 44 ++++++------- .../apps/{ => ui}/updates/UpdatesViewModel.kt | 22 +++---- .../{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 | 4 +- 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 | 30 ++++----- app/src/main/res/xml/settings_preferences.xml | 2 +- .../foundation/e/apps/FakeFaultyAppDao.kt | 4 +- .../foundation/e/apps/FakePreferenceModule.kt | 2 +- .../e/apps/FaultyAppRepositoryTest.kt | 6 +- .../foundation/e/apps/FusedApiImplTest.kt | 30 ++++----- .../e/apps/FusedApiRepositoryTest.kt | 4 +- .../e/apps/UpdateManagerImptTest.kt | 20 +++--- .../AppPrivacyInfoRepositoryImplTest.kt | 8 +-- .../e/apps/exodus/FakeExoudsTrackerApi.kt | 8 +-- .../e/apps/exodus/FakeTrackerDao.kt | 4 +- .../e/apps/fusedManager/FakeFusedManager.kt | 8 +-- .../FusedManagerRepositoryTest.kt | 12 ++-- .../AppInstallProcessorTest.kt | 21 +++--- .../installProcessor/FakeFusedDownloadDAO.kt | 4 +- .../FakeFusedManagerRepository.kt | 10 +-- 222 files changed, 913 insertions(+), 905 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/{utils => data}/Constants.kt (88%) rename app/src/main/java/foundation/e/apps/{api => data}/DownloadManager.kt (99%) rename app/src/main/java/foundation/e/apps/{api => data}/JobResult.kt (97%) 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 (98%) rename app/src/main/java/foundation/e/apps/{api/cleanapk => data}/blockedApps/AppWarningInfo.kt (94%) rename app/src/main/java/foundation/e/apps/{api/cleanapk => data}/blockedApps/BlockedAppRepository.kt (94%) 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/CleanApkAppDetailsRetrofit.kt (92%) rename app/src/main/java/foundation/e/apps/{api => data}/cleanapk/CleanApkDownloadInfoFetcher.kt (90%) 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/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 (87%) 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/cleanapk => data/cleanapk/repositories}/CleanAPKRepository.kt (82%) rename app/src/main/java/foundation/e/apps/{api/cleanapk => data/cleanapk/repositories}/CleanApkAppsRepositoryImpl.kt (82%) rename app/src/main/java/foundation/e/apps/{api/cleanapk => data/cleanapk/repositories}/CleanApkPWARepository.kt (86%) rename app/src/main/java/foundation/e/apps/{api/cleanapk => data/cleanapk/repositories}/CleanApkRepository.kt (83%) rename app/src/main/java/foundation/e/apps/{api => data}/database/AppDatabase.kt (79%) 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/{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/{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/{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 (93%) 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 (87%) 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 (94%) 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 (94%) 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 (89%) rename app/src/main/java/foundation/e/apps/{api => data}/fused/data/FusedCategory.kt (90%) 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/database => data}/fusedDownload/FusedDownloadDAO.kt (86%) rename app/src/main/java/foundation/e/apps/{manager/database/DatabaseRepository.kt => data/fusedDownload/FusedDownloadRepository.kt} (83%) rename app/src/main/java/foundation/e/apps/{manager/fused => data/fusedDownload}/FusedManagerImpl.kt (85%) 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 (94%) rename app/src/main/java/foundation/e/apps/{manager/database/fusedDownload => data/fusedDownload/models}/FusedDownload.kt (83%) 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 (94%) 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 (88%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginCommon.kt (94%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginDataStore.kt (94%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginSourceCleanApk.kt (92%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginSourceGPlay.kt (94%) 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 (94%) rename app/src/main/java/foundation/e/apps/{ => data}/login/LoginViewModel.kt (97%) 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 (87%) 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 (95%) 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/preference}/DataStoreManager.kt (94%) rename app/src/main/java/foundation/e/apps/{utils/modules => data/preference}/DataStoreModule.kt (95%) rename app/src/main/java/foundation/e/apps/{utils/modules => data/preference}/PreferenceManagerModule.kt (88%) rename app/src/main/java/foundation/e/apps/{updates/manager => data/updates}/UpdatesManagerImpl.kt (92%) rename app/src/main/java/foundation/e/apps/{updates/manager => data/updates}/UpdatesManagerRepository.kt (87%) rename app/src/main/java/foundation/e/apps/{utils/modules => di}/CommonUtilsModule.kt (96%) rename app/src/main/java/foundation/e/apps/{manager/database => di}/DatabaseModule.kt (77%) 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 (94%) 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 (93%) rename app/src/main/java/foundation/e/apps/{manager => install}/pkg/InstallerService.kt (94%) rename app/src/main/java/foundation/e/apps/{utils/modules => install/pkg}/PWAManagerModule.kt (90%) rename app/src/main/java/foundation/e/apps/{manager => install}/pkg/PackageInstallerService.kt (94%) 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 (94%) rename app/src/main/java/foundation/e/apps/{ => install}/receiver/PWAPlayerStatusReceiver.kt (82%) 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 (93%) rename app/src/main/java/foundation/e/apps/{updates/manager => install/updates}/UpdatesBroadcastReceiver.kt (93%) rename app/src/main/java/foundation/e/apps/{ => install}/updates/UpdatesNotifier.kt (98%) 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 (93%) rename app/src/main/java/foundation/e/apps/{manager => install}/workmanager/AppInstallProcessor.kt (91%) 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 (84%) rename app/src/main/java/foundation/e/apps/{ => ui}/AppProgressViewModel.kt (82%) rename app/src/main/java/foundation/e/apps/{ => ui}/MainActivity.kt (92%) rename app/src/main/java/foundation/e/apps/{ => ui}/MainActivityViewModel.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/PrivacyInfoViewModel.kt (86%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/ApplicationFragment.kt (96%) rename app/src/main/java/foundation/e/apps/{ => ui}/application/ApplicationViewModel.kt (87%) 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 (90%) 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 (92%) 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 (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/applicationlist/ApplicationListFragment.kt (93%) 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 (90%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/AppsFragment.kt (91%) 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 (83%) rename app/src/main/java/foundation/e/apps/{ => ui}/categories/GamesFragment.kt (91%) 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 (88%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/HomeViewModel.kt (86%) 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 (93%) rename app/src/main/java/foundation/e/apps/{ => ui}/home/model/HomeParentRVAdapter.kt (90%) rename app/src/main/java/foundation/e/apps/{utils => ui}/parentFragment/LoadingViewModel.kt (91%) rename app/src/main/java/foundation/e/apps/{utils => ui}/parentFragment/TimeoutFragment.kt (95%) 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 (94%) rename app/src/main/java/foundation/e/apps/{ => ui}/search/SearchViewModel.kt (89%) 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 (96%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/LocaleChangedBroadcastReceiver.kt (95%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/SignInFragment.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/SignInViewModel.kt (85%) rename app/src/main/java/foundation/e/apps/{ => ui}/setup/signin/google/GoogleSignInFragment.kt (95%) 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 (84%) rename app/src/main/java/foundation/e/apps/{ => ui}/updates/UpdatesFragment.kt (91%) rename app/src/main/java/foundation/e/apps/{ => ui}/updates/UpdatesViewModel.kt (86%) 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/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..1ffcfd057 100644 --- a/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt +++ b/app/src/main/java/foundation/e/apps/AppLoungeApplication.kt @@ -24,13 +24,13 @@ 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.utils.modules.DataStoreModule -import foundation.e.apps.utils.modules.PreferenceManagerModule +import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.install.pkg.PkgManagerBR +import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.install.updates.UpdatesWorkManager +import foundation.e.apps.install.workmanager.InstallWorkManager +import foundation.e.apps.ui.setup.tos.TOS_VERSION import foundation.e.lib.telemetry.Telemetry import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.MainScope 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 d72e5b379..722bfb177 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 { suspend fun getHomeScreenData(): Any 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/api/DownloadManager.kt b/app/src/main/java/foundation/e/apps/data/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/data/DownloadManager.kt index 5b881d6fc..37461b80e 100644 --- a/app/src/main/java/foundation/e/apps/api/DownloadManager.kt +++ b/app/src/main/java/foundation/e/apps/data/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.data import android.app.DownloadManager import android.content.Context 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 97% 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..b085c5031 100644 --- a/app/src/main/java/foundation/e/apps/api/JobResult.kt +++ b/app/src/main/java/foundation/e/apps/data/JobResult.kt @@ -1,6 +1,6 @@ -package foundation.e.apps.api +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/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 98% 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..14695702f 100644 --- a/app/src/main/java/foundation/e/apps/api/ResultSupreme.kt +++ b/app/src/main/java/foundation/e/apps/data/ResultSupreme.kt @@ -15,9 +15,9 @@ * 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 foundation.e.apps.data.enums.ResultStatus import java.util.concurrent.TimeoutException /** diff --git a/app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/AppWarningInfo.kt b/app/src/main/java/foundation/e/apps/data/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/blockedApps/AppWarningInfo.kt index 5175e1f19..c5eba1acf 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/AppWarningInfo.kt +++ b/app/src/main/java/foundation/e/apps/data/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.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/blockedApps/BlockedAppRepository.kt similarity index 94% rename from app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/BlockedAppRepository.kt rename to app/src/main/java/foundation/e/apps/data/blockedApps/BlockedAppRepository.kt index 5e09583ce..e09202ea6 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/BlockedAppRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/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.blockedApps import com.google.gson.Gson -import foundation.e.apps.api.DownloadManager -import foundation.e.apps.manager.fused.FileManager +import foundation.e.apps.data.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/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/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/CleanApkDownloadInfoFetcher.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkDownloadInfoFetcher.kt similarity index 90% 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 14dcd7f6c..5cad79811 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 @@ -16,9 +16,9 @@ * 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.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/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/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 87% 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..be01d9440 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,10 +16,10 @@ * 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.utils.enums.Origin +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.fused.data.FusedApp data class Home( val top_updated_apps: List = emptyList(), 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/cleanapk/CleanAPKRepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanAPKRepository.kt similarity index 82% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanAPKRepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanAPKRepository.kt index fc77fbb13..22656d5bb 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanAPKRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanAPKRepository.kt @@ -16,14 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk.repositories 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.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 +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/CleanApkAppsRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepositoryImpl.kt similarity index 82% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppsRepositoryImpl.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepositoryImpl.kt index 4fc16cbf3..fe16ef3a9 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkAppsRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkAppsRepositoryImpl.kt @@ -16,13 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk.repositories -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.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 +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/CleanApkPWARepository.kt b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkPWARepository.kt similarity index 86% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkPWARepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkPWARepository.kt index 0bb4afa65..03c43a6ce 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkPWARepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkPWARepository.kt @@ -16,11 +16,13 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk.repositories -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.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 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/repositories/CleanApkRepository.kt similarity index 83% rename from app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRepository.kt rename to app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkRepository.kt index 3959d18eb..618e41203 100644 --- a/app/src/main/java/foundation/e/apps/api/cleanapk/CleanApkRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkRepository.kt @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.api.cleanapk +package foundation.e.apps.data.cleanapk.repositories -import foundation.e.apps.api.BaseStoreRepository -import foundation.e.apps.api.cleanapk.data.categories.Categories -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 const val NUMBER_OF_ITEMS = 20 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 79% 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 3cbf4105e..69c179b19 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,4 +1,4 @@ -package foundation.e.apps.api.database +package foundation.e.apps.data.database import android.content.Context import androidx.room.Database @@ -6,12 +6,12 @@ import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -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/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..88df8af12 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,13 @@ -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 +import foundation.e.apps.data.fusedDownload.FusedDownloadDAO +import foundation.e.apps.data.fusedDownload.models.FusedDownload @Database(entities = [FusedDownload::class], version = 3, exportSchema = false) @TypeConverters(FusedConverter::class) 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/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/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 93% 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..ab32cf0c9 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,19 +16,19 @@ * 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 -import foundation.e.apps.utils.enums.Origin +package foundation.e.apps.data.exodus.repositories + +import foundation.e.apps.data.Result +import foundation.e.apps.data.enums.Origin +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.di.CommonUtilsModule.LIST_OF_NULL import foundation.e.apps.utils.getFormattedString -import foundation.e.apps.utils.modules.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/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 87% 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..fe2b08f0e 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,11 +1,11 @@ -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.utils.enums.Origin +import foundation.e.apps.data.cleanapk.ApkSignatureManager +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.fdroid.models.BuildInfo +import foundation.e.apps.data.fdroid.models.FdroidEntity +import foundation.e.apps.data.fused.data.FusedApp 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 b574a7b9e..6b70811d6 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 94% 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 6cc7b55a8..db60c4d7a 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,37 +33,37 @@ import com.aurora.gplayapi.data.models.StreamBundle import com.aurora.gplayapi.data.models.StreamCluster import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.api.cleanapk.CleanApkDownloadInfoFetcher -import foundation.e.apps.api.cleanapk.CleanApkRepository -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -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.utils.Constants.timeoutDurationInMillis -import foundation.e.apps.utils.enums.AppTag -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.Source -import foundation.e.apps.utils.enums.Status -import foundation.e.apps.utils.enums.Type -import foundation.e.apps.utils.enums.isUnFiltered -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.ResultSupreme +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.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.cleanapk.repositories.CleanApkRepository +import foundation.e.apps.data.enums.AppTag +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.Source +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.Type +import foundation.e.apps.data.enums.isUnFiltered +import foundation.e.apps.data.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.fusedDownload.models.FusedDownload +import foundation.e.apps.data.gplay.GplayStoreRepository +import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PkgManagerModule +import foundation.e.apps.ui.home.model.HomeChildFusedAppDiffUtil import kotlinx.coroutines.Deferred import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.async 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 94% 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..220bf137b 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,16 +24,16 @@ 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.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.ResultSupreme +import foundation.e.apps.data.enums.FilterLevel +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fused.data.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.fusedDownload.models.FusedDownload import javax.inject.Inject import javax.inject.Singleton 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..65e5edc9f 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.fusedDownload.models.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 89% 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..bda418240 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,14 +16,14 @@ * 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 -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/api/fused/data/FusedCategory.kt b/app/src/main/java/foundation/e/apps/data/fused/data/FusedCategory.kt similarity index 90% 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..13a24cb5c 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,9 +16,9 @@ * 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 foundation.e.apps.data.enums.AppTag import java.util.UUID data class FusedCategory( 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/database/fusedDownload/FusedDownloadDAO.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedDownloadDAO.kt similarity index 86% rename from app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownloadDAO.kt rename to app/src/main/java/foundation/e/apps/data/fusedDownload/FusedDownloadDAO.kt index a5311262b..02b3fbfeb 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownloadDAO.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedDownloadDAO.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.database.fusedDownload +package foundation.e.apps.data.fusedDownload import androidx.lifecycle.LiveData import androidx.room.Dao @@ -7,6 +7,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update +import foundation.e.apps.data.fusedDownload.models.FusedDownload @Dao interface FusedDownloadDAO { diff --git a/app/src/main/java/foundation/e/apps/manager/database/DatabaseRepository.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedDownloadRepository.kt similarity index 83% rename from app/src/main/java/foundation/e/apps/manager/database/DatabaseRepository.kt rename to app/src/main/java/foundation/e/apps/data/fusedDownload/FusedDownloadRepository.kt index bc2614918..b15dc8cd4 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/DatabaseRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/FusedDownloadRepository.kt @@ -1,10 +1,9 @@ -package foundation.e.apps.manager.database +package foundation.e.apps.data.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 foundation.e.apps.data.fusedDownload.models.FusedDownload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock @@ -13,7 +12,7 @@ import javax.inject.Singleton @Singleton @OpenForTesting -class DatabaseRepository @Inject constructor( +class FusedDownloadRepository @Inject constructor( private val fusedDownloadDAO: FusedDownloadDAO ) { 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 85% 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..863172191 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,13 +29,12 @@ 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.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.data.fusedDownload.models.FusedDownload +import foundation.e.apps.install.download.data.DownloadProgressLD +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PkgManagerModule import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock @@ -51,7 +50,7 @@ class FusedManagerImpl @Inject constructor( @Named("cacheDir") private val cacheDir: String, private val downloadManager: DownloadManager, private val notificationManager: NotificationManager, - private val databaseRepository: DatabaseRepository, + private val fusedDownloadRepository: FusedDownloadRepository, private val pwaManagerModule: PWAManagerModule, private val pkgManagerModule: PkgManagerModule, @Named("download") private val downloadNotificationChannel: NotificationChannel, @@ -73,24 +72,24 @@ class FusedManagerImpl @Inject constructor( override suspend fun addDownload(fusedDownload: FusedDownload) { fusedDownload.status = Status.QUEUED - databaseRepository.addDownload(fusedDownload) + fusedDownloadRepository.addDownload(fusedDownload) } override suspend fun getDownloadById(fusedDownload: FusedDownload): FusedDownload? { - return databaseRepository.getDownloadById(fusedDownload.id) + return fusedDownloadRepository.getDownloadById(fusedDownload.id) } override suspend fun getDownloadList(): List { - return databaseRepository.getDownloadList() + return fusedDownloadRepository.getDownloadList() } override fun getDownloadLiveList(): LiveData> { - return databaseRepository.getDownloadLiveList() + return fusedDownloadRepository.getDownloadLiveList() } override suspend fun clearInstallationIssue(fusedDownload: FusedDownload) { flushOldDownload(fusedDownload.packageName) - databaseRepository.deleteDownload(fusedDownload) + fusedDownloadRepository.deleteDownload(fusedDownload) } @OptIn(DelicateCoroutinesApi::class) @@ -98,11 +97,11 @@ class FusedManagerImpl @Inject constructor( if (status == Status.INSTALLED) { fusedDownload.status = status flushOldDownload(fusedDownload.packageName) - databaseRepository.deleteDownload(fusedDownload) + fusedDownloadRepository.deleteDownload(fusedDownload) } else if (status == Status.INSTALLING) { fusedDownload.downloadIdMap.all { true } fusedDownload.status = status - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) installApp(fusedDownload) } } @@ -139,7 +138,7 @@ class FusedManagerImpl @Inject constructor( else -> { Timber.d("Unsupported application type!") fusedDownload.status = Status.INSTALLATION_ISSUE - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) } } } @@ -162,7 +161,7 @@ class FusedManagerImpl @Inject constructor( DownloadProgressLD.setDownloadId(-1) if (fusedDownload.status != Status.INSTALLATION_ISSUE) { - databaseRepository.deleteDownload(fusedDownload) + fusedDownloadRepository.deleteDownload(fusedDownload) } flushOldDownload(fusedDownload.packageName) @@ -199,7 +198,7 @@ class FusedManagerImpl @Inject constructor( File(parentPath).mkdirs() fusedDownload.status = Status.DOWNLOADING - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) DownloadProgressLD.setDownloadId(-1) fusedDownload.downloadURLList.forEach { count += 1 @@ -215,7 +214,7 @@ class FusedManagerImpl @Inject constructor( DownloadProgressLD.setDownloadId(requestId) fusedDownload.downloadIdMap[requestId] = false } - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) } override fun getGplayInstallationPackagePath( @@ -263,26 +262,26 @@ class FusedManagerImpl @Inject constructor( override suspend fun installationIssue(fusedDownload: FusedDownload) { flushOldDownload(fusedDownload.packageName) fusedDownload.status = Status.INSTALLATION_ISSUE - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) } override suspend fun updateAwaiting(fusedDownload: FusedDownload) { fusedDownload.status = Status.AWAITING - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) } override suspend fun updateUnavailable(fusedDownload: FusedDownload) { fusedDownload.status = Status.UNAVAILABLE - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) } override suspend fun updateFusedDownload(fusedDownload: FusedDownload) { - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) } override suspend fun insertFusedDownloadPurchaseNeeded(fusedDownload: FusedDownload) { fusedDownload.status = Status.PURCHASE_NEEDED - databaseRepository.addDownload(fusedDownload) + fusedDownloadRepository.addDownload(fusedDownload) } override fun isFusedDownloadInstalled(fusedDownload: FusedDownload): Boolean { 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..7c6ad105d 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,12 +6,12 @@ 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.workmanager.InstallWorkManager import kotlinx.coroutines.flow.Flow import javax.inject.Inject import javax.inject.Singleton 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 94% 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..18320fe88 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,11 +16,11 @@ * 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fusedDownload.models.FusedDownload import java.io.File interface IFusedManager { diff --git a/app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownload.kt b/app/src/main/java/foundation/e/apps/data/fusedDownload/models/FusedDownload.kt similarity index 83% rename from app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownload.kt rename to app/src/main/java/foundation/e/apps/data/fusedDownload/models/FusedDownload.kt index 377ad26f7..148de9d88 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/fusedDownload/FusedDownload.kt +++ b/app/src/main/java/foundation/e/apps/data/fusedDownload/models/FusedDownload.kt @@ -1,11 +1,11 @@ -package foundation.e.apps.manager.database.fusedDownload +package foundation.e.apps.data.fusedDownload.models 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/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 65651eac0..dac57f8a8 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 cd9fcffce..1eae7a423 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 @@ -36,9 +36,9 @@ import com.aurora.gplayapi.helpers.StreamHelper import com.aurora.gplayapi.helpers.TopChartsHelper 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 94% 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..1ad5e201b 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,14 +17,14 @@ * 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.CommonUtilsFunctions import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus -import foundation.e.apps.utils.modules.CommonUtilsFunctions import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch import okhttp3.Cache 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 029558a3e..908fe70b5 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 88% 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..e63f051de 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,14 +15,14 @@ * 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.utils.enums.User -import foundation.e.apps.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayValidationException +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.login.AuthObject.GPlayAuth +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/login/LoginCommon.kt b/app/src/main/java/foundation/e/apps/data/login/LoginCommon.kt similarity index 94% 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..6f3646153 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,10 +15,10 @@ * 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 +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/login/LoginDataStore.kt b/app/src/main/java/foundation/e/apps/data/login/LoginDataStore.kt similarity index 94% 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..468cbc667 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 @@ -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.preference.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/login/LoginSourceCleanApk.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceCleanApk.kt similarity index 92% 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..a5f49569b 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,10 +15,10 @@ * 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.utils.enums.User +import foundation.e.apps.data.ResultSupreme +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/login/LoginSourceGPlay.kt b/app/src/main/java/foundation/e/apps/data/login/LoginSourceGPlay.kt similarity index 94% 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 c96106aae..5bb38c060 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,20 +15,20 @@ * 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.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.exceptions.GPlayValidationException +import foundation.e.apps.data.ResultSupreme +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.enums.User +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.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/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 94% 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..bbe9d7b7a 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,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.utils.enums.User +import foundation.e.apps.data.ResultSupreme +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/login/LoginViewModel.kt b/app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt similarity index 97% 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..25c54362e 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,14 +15,14 @@ * 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 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/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 87% 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..4b5a71052 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,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.google.gson.Gson -import foundation.e.apps.api.gplay.utils.AC2DMTask -import foundation.e.apps.api.gplay.utils.GPlayHttpClient -import foundation.e.apps.utils.enums.User +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.gplay.utils.AC2DMTask +import foundation.e.apps.data.gplay.utils.GPlayHttpClient import java.util.Properties import javax.inject.Inject import javax.inject.Singleton 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 95% 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..0d2c27eca 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,15 +15,15 @@ * 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.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.ResultSupreme +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.gplay.utils.AC2DMUtil +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/preference/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/preference/DataStoreManager.kt index 9be76a382..4294505ae 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/DataStoreManager.kt +++ b/app/src/main/java/foundation/e/apps/data/preference/DataStoreManager.kt @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.data.preference 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/preference/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/preference/DataStoreModule.kt index e30305e9b..c51b3d593 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/DataStoreModule.kt +++ b/app/src/main/java/foundation/e/apps/data/preference/DataStoreModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.data.preference 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/preference/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/preference/PreferenceManagerModule.kt index a6274f061..428daf195 100644 --- a/app/src/main/java/foundation/e/apps/utils/modules/PreferenceManagerModule.kt +++ b/app/src/main/java/foundation/e/apps/data/preference/PreferenceManagerModule.kt @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package foundation.e.apps.utils.modules +package foundation.e.apps.data.preference 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/updates/manager/UpdatesManagerImpl.kt b/app/src/main/java/foundation/e/apps/data/updates/UpdatesManagerImpl.kt similarity index 92% 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 0ee9eab62..d537ade94 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,24 +16,24 @@ * 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.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.cleanapk.ApkSignatureManager +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.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.data.preference.PreferenceManagerModule +import foundation.e.apps.install.pkg.PkgManagerModule import timber.log.Timber import javax.inject.Inject 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 87% 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..07dfe63b7 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,12 +16,12 @@ * 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.utils.enums.ResultStatus +import foundation.e.apps.data.enums.ResultStatus +import foundation.e.apps.data.fused.UpdatesDao +import foundation.e.apps.data.fused.data.FusedApp 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/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/manager/database/DatabaseModule.kt b/app/src/main/java/foundation/e/apps/di/DatabaseModule.kt similarity index 77% rename from app/src/main/java/foundation/e/apps/manager/database/DatabaseModule.kt rename to app/src/main/java/foundation/e/apps/di/DatabaseModule.kt index d2cf3fd03..63b5cd8f8 100644 --- a/app/src/main/java/foundation/e/apps/manager/database/DatabaseModule.kt +++ b/app/src/main/java/foundation/e/apps/di/DatabaseModule.kt @@ -1,4 +1,4 @@ -package foundation.e.apps.manager.database +package foundation.e.apps.di import android.content.Context import dagger.Module @@ -6,7 +6,8 @@ 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 foundation.e.apps.data.database.fusedDownload.FusedDatabase +import foundation.e.apps.data.fusedDownload.FusedDownloadDAO import javax.inject.Singleton @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 c506d4ff5..56d3d9393 100644 --- a/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt +++ b/app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt @@ -24,15 +24,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.CleanApkAppDetailsRetrofit -import foundation.e.apps.api.cleanapk.CleanApkAppsRepositoryImpl -import foundation.e.apps.api.cleanapk.CleanApkPWARepository -import foundation.e.apps.api.cleanapk.CleanApkRepository -import foundation.e.apps.api.cleanapk.CleanApkRetrofit -import foundation.e.apps.api.gplay.GplayStoreRepository -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.CleanApkAppDetailsRetrofit +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +import foundation.e.apps.data.cleanapk.repositories.CleanApkAppsRepositoryImpl +import foundation.e.apps.data.cleanapk.repositories.CleanApkPWARepository +import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository +import foundation.e.apps.data.gplay.GplayStoreRepository +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/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 94% 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..fc32fbf97 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,15 +16,15 @@ * 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.utils.enums.Origin -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.data.DownloadManager +import foundation.e.apps.data.enums.Origin +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.models.FusedDownload import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay 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 93% 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..23a6be9a9 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,13 +16,13 @@ * 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 import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.R -import foundation.e.apps.utils.modules.PreferenceManagerModule +import foundation.e.apps.data.preference.PreferenceManagerModule import javax.inject.Inject class NotificationManagerUtils @Inject constructor( 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 94% 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..9c99665ea 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,10 +25,10 @@ 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +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.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 90% 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 6d3faa62a..628ad0df1 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 @@ -13,10 +13,10 @@ 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fusedDownload.FusedDownloadRepository +import foundation.e.apps.data.fusedDownload.models.FusedDownload import kotlinx.coroutines.delay import javax.inject.Inject import javax.inject.Singleton @@ -25,7 +25,7 @@ import javax.inject.Singleton @OpenForTesting class PWAManagerModule @Inject constructor( @ApplicationContext private val context: Context, - private val databaseRepository: DatabaseRepository + private val fusedDownloadRepository: FusedDownloadRepository ) { companion object { @@ -97,7 +97,7 @@ class PWAManagerModule @Inject constructor( suspend fun installPWAApp(fusedDownload: FusedDownload) { // Update status fusedDownload.status = Status.DOWNLOADING - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) // Get bitmap and byteArray for icon val iconByteArray = Base64.decode(fusedDownload.iconByteArray, Base64.DEFAULT) @@ -120,7 +120,7 @@ class PWAManagerModule @Inject constructor( private suspend fun publishShortcut(fusedDownload: FusedDownload, bitmap: Bitmap, databaseID: Long) { // Update status fusedDownload.status = Status.INSTALLING - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) val intent = Intent().apply { action = VIEW_PWA @@ -143,8 +143,8 @@ class PWAManagerModule @Inject constructor( // Update status fusedDownload.status = Status.INSTALLED - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) delay(500) - databaseRepository.deleteDownload(fusedDownload) + fusedDownloadRepository.deleteDownload(fusedDownload) } } 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 94% 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..0a3fa6f5e 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,15 +16,15 @@ * 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch 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..918c93f16 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,16 +16,16 @@ * 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.faultyApps.FaultyAppRepository +import foundation.e.apps.data.fusedDownload.FusedManagerRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope 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 94% 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..076c05a8f 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,11 +31,11 @@ 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.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 foundation.e.apps.data.fused.FusedAPIImpl +import foundation.e.apps.data.fusedDownload.models.FusedDownload import kotlinx.coroutines.DelicateCoroutinesApi import timber.log.Timber import java.io.File 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 82% 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..21aa44c39 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,14 +15,14 @@ * 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fusedDownload.FusedDownloadRepository import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -47,20 +47,20 @@ class PWAPlayerStatusReceiver : BroadcastReceiver() { } @Inject - lateinit var databaseRepository: DatabaseRepository + lateinit var fusedDownloadRepository: FusedDownloadRepository override fun onReceive(context: Context?, intent: Intent?) { GlobalScope.launch { try { intent?.getStringExtra("SHORTCUT_ID")?.let { shortcutId -> - databaseRepository.getDownloadById(shortcutId)?.let { fusedDownload -> + fusedDownloadRepository.getDownloadById(shortcutId)?.let { fusedDownload -> when (intent.action) { ACTION_PWA_ADDED -> { fusedDownload.status = Status.INSTALLED - databaseRepository.updateDownload(fusedDownload) + fusedDownloadRepository.updateDownload(fusedDownload) } ACTION_PWA_REMOVED -> { - databaseRepository.deleteDownload(fusedDownload) + fusedDownloadRepository.deleteDownload(fusedDownload) } } } 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..c1724a58d 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.data.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 93% 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..ac561e3e5 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,9 +27,9 @@ 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.utils.modules.DataStoreModule +import foundation.e.apps.data.DownloadManager +import foundation.e.apps.data.fused.FusedAPIRepository +import foundation.e.apps.data.preference.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/updates/manager/UpdatesBroadcastReceiver.kt b/app/src/main/java/foundation/e/apps/install/updates/UpdatesBroadcastReceiver.kt similarity index 93% 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..a966bf97b 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,13 +15,13 @@ * 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 import android.content.Intent import androidx.work.ExistingPeriodicWorkPolicy -import foundation.e.apps.utils.modules.PreferenceManagerModule +import foundation.e.apps.data.preference.PreferenceManagerModule import timber.log.Timber class UpdatesBroadcastReceiver : BroadcastReceiver() { diff --git a/app/src/main/java/foundation/e/apps/updates/UpdatesNotifier.kt b/app/src/main/java/foundation/e/apps/install/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/install/updates/UpdatesNotifier.kt index 1b6a7a57b..e03ec3c7d 100644 --- a/app/src/main/java/foundation/e/apps/updates/UpdatesNotifier.kt +++ b/app/src/main/java/foundation/e/apps/install/updates/UpdatesNotifier.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package foundation.e.apps.updates +package foundation.e.apps.install.updates import android.app.Notification import android.app.NotificationChannel @@ -26,8 +26,8 @@ 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.R +import foundation.e.apps.ui.MainActivity object UpdatesNotifier { const val UPDATES_NOTIFICATION_CLICK_EXTRA = "updates_notification_click_extra" 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 93% 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..d2399e4cf 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,22 +19,22 @@ 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.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.ResultSupreme +import foundation.e.apps.data.cleanapk.CleanApkRetrofit +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.data.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.data.login.LoginSourceRepository +import foundation.e.apps.data.preference.DataStoreManager +import foundation.e.apps.data.updates.UpdatesManagerRepository +import foundation.e.apps.install.workmanager.InstallWorkManager import foundation.e.apps.utils.eventBus.AppEvent import foundation.e.apps.utils.eventBus.EventBus -import foundation.e.apps.utils.modules.DataStoreManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext 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 91% 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..85020e64e 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,20 +16,20 @@ * 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.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.data.fused.UpdatesDao +import foundation.e.apps.data.fusedDownload.FusedDownloadRepository +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.data.preference.DataStoreManager +import foundation.e.apps.install.updates.UpdatesNotifier import foundation.e.apps.utils.getFormattedString -import foundation.e.apps.utils.modules.DataStoreManager import kotlinx.coroutines.flow.transformWhile import timber.log.Timber import java.text.NumberFormat @@ -38,7 +38,7 @@ import javax.inject.Inject class AppInstallProcessor @Inject constructor( @ApplicationContext private val context: Context, - private val databaseRepository: DatabaseRepository, + private val fusedDownloadRepository: FusedDownloadRepository, private val fusedManagerRepository: FusedManagerRepository, private val dataStoreManager: DataStoreManager ) { @@ -59,7 +59,7 @@ class AppInstallProcessor @Inject constructor( try { Timber.d("Fused download name $fusedDownloadId") - fusedDownload = databaseRepository.getDownloadById(fusedDownloadId) + fusedDownload = fusedDownloadRepository.getDownloadById(fusedDownloadId) Timber.i(">>> dowork started for Fused download name " + fusedDownload?.name + " " + fusedDownloadId) fusedDownload?.let { @@ -127,7 +127,7 @@ class AppInstallProcessor @Inject constructor( private suspend fun isUpdateCompleted(): Boolean { val downloadListWithoutAnyIssue = - databaseRepository.getDownloadList() + fusedDownloadRepository.getDownloadList() .filter { !listOf( Status.INSTALLATION_ISSUE, @@ -159,7 +159,7 @@ class AppInstallProcessor @Inject constructor( Timber.i("===> doWork: Download started ${fusedDownload.name} ${fusedDownload.status}") } - databaseRepository.getDownloadFlowById(fusedDownload.id) + fusedDownloadRepository.getDownloadFlowById(fusedDownload.id) .transformWhile { emit(it) isInstallRunning(it) 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..aa838b785 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.fusedDownload.models.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 84% 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..9aa0ec8a9 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,12 +6,12 @@ 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.utils.modules.DataStoreModule +import foundation.e.apps.data.blockedApps.BlockedAppRepository +import foundation.e.apps.data.faultyApps.FaultyAppRepository +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.gplay.GPlayAPIRepository +import foundation.e.apps.data.preference.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..3ab4ce0d8 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.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.download.data.DownloadProgressLD 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 92% 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..fb76120bd 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,21 +40,22 @@ 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.data.enums.Status +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.LoginViewModel +import foundation.e.apps.data.login.exceptions.GPlayValidationException 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.utils.enums.Status +import foundation.e.apps.install.updates.UpdatesNotifier +import foundation.e.apps.install.workmanager.InstallWorkManager +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment +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.utils.CommonUtilsFunctions 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 kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter 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 91% 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..07ccbacc0 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,21 +40,22 @@ 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.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.R +import foundation.e.apps.data.blockedApps.BlockedAppRepository +import foundation.e.apps.data.ecloud.EcloudRepository +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.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.data.preference.DataStoreModule +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PkgManagerModule 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/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 96% 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..5f4970fac 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,28 +44,28 @@ 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.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.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.fused.data.FusedApp +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.GPlayLoginException 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.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.di.CommonUtilsModule.LIST_OF_NULL +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PkgManagerModule +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.ui.application.model.ApplicationScreenshotsRVAdapter +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment +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/application/ApplicationViewModel.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationViewModel.kt similarity index 87% 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..3f1889ae1 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,19 +24,19 @@ 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.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.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.download.data.DownloadProgressLD +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/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 90% 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..f5e2cacb5 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,10 +24,10 @@ 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.data.enums.Origin import foundation.e.apps.databinding.ApplicationScreenshotsListItemBinding -import foundation.e.apps.utils.enums.Origin +import foundation.e.apps.ui.application.ApplicationFragmentDirections class ApplicationScreenshotsRVAdapter( private val origin: Origin 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 92% 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..b5533935d 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,9 +26,9 @@ 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.data.enums.Origin import foundation.e.apps.databinding.ScreenshotListItemBinding -import foundation.e.apps.utils.enums.Origin class ScreenshotRVAdapter(private val list: List, private val origin: Origin) : RecyclerView.Adapter() { 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..eb65823ee 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,9 +25,9 @@ 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.databinding.FragmentScreenshotBinding +import foundation.e.apps.ui.application.model.DepthPageTransformer +import foundation.e.apps.ui.application.model.ScreenshotRVAdapter @AndroidEntryPoint class ScreenshotFragment : Fragment(R.layout.fragment_screenshot) { 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 94% 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..4013e7095 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,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.applicationlist +package foundation.e.apps.ui.applicationlist import androidx.recyclerview.widget.DiffUtil -import foundation.e.apps.api.fused.data.FusedApp -import foundation.e.apps.utils.modules.CommonUtilsModule.LIST_OF_NULL +import foundation.e.apps.data.fused.data.FusedApp +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/applicationlist/ApplicationListFragment.kt b/app/src/main/java/foundation/e/apps/ui/applicationlist/ApplicationListFragment.kt similarity index 93% 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..3d607d137 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,23 +31,23 @@ 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.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.enums.Status +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.GPlayLoginException 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.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.install.download.data.DownloadProgress +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.pkg.PkgManagerModule +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.ui.application.subFrags.ApplicationDialogFragment +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/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..e39ca0d9a 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,22 +36,22 @@ 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.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.enums.Origin +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.User +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.AppInfoFetchViewModel +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.PrivacyInfoViewModel +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 timber.log.Timber import javax.inject.Singleton 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 90% 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..b73b66db0 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,19 +16,19 @@ * 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.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +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.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/categories/AppsFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/AppsFragment.kt similarity index 91% 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..af0383c0d 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,14 +25,14 @@ 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.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.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentAppsBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.categories.model.CategoriesRVAdapter +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/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..c6badc4d1 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,8 +24,8 @@ 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.databinding.FragmentCategoriesBinding +import foundation.e.apps.ui.categories.model.CategoriesVPAdapter @AndroidEntryPoint class CategoriesFragment : Fragment(R.layout.fragment_categories) { 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 83% 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..73b76d791 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,20 +16,20 @@ * 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.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.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.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/categories/GamesFragment.kt b/app/src/main/java/foundation/e/apps/ui/categories/GamesFragment.kt similarity index 91% 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..8f8f11fdb 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,14 +25,14 @@ 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.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.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentGamesBinding -import foundation.e.apps.login.AuthObject -import foundation.e.apps.utils.exceptions.GPlayLoginException -import foundation.e.apps.utils.parentFragment.TimeoutFragment +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.categories.model.CategoriesRVAdapter +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/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 88% 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..e77176ba2 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,26 +29,26 @@ 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.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.enums.Status +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.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.data.login.exceptions.GPlayLoginException 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.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.di.CommonUtilsModule.safeNavigate +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.AppProgressViewModel +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.ui.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.ui.home.model.HomeChildRVAdapter +import foundation.e.apps.ui.home.model.HomeParentRVAdapter +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/home/HomeViewModel.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeViewModel.kt similarity index 86% 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..2fbea50a8 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,21 +16,21 @@ * 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.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +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.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/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 93% 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..1dc7933ab 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,19 +32,19 @@ 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.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.enums.Origin +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.enums.User +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.AppInfoFetchViewModel +import foundation.e.apps.ui.MainActivityViewModel +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 class HomeChildRVAdapter( private var fusedAPIInterface: FusedAPIInterface?, 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..808b4665f 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,12 +24,12 @@ 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.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 +import foundation.e.apps.ui.AppInfoFetchViewModel +import foundation.e.apps.ui.MainActivityViewModel class HomeParentRVAdapter( private val 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 91% 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 cbd0ab493..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.login.AuthObject -import foundation.e.apps.utils.exceptions.GPlayValidationException -import foundation.e.apps.utils.exceptions.UnknownSourceException +import foundation.e.apps.data.login.AuthObject +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 95% 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 447720787..c1e236c07 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 @@ -26,18 +26,18 @@ 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.R +import foundation.e.apps.data.enums.User +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.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 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.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.ui.MainActivityViewModel import timber.log.Timber /** 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..f9688f226 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,8 +11,8 @@ 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.databinding.FragmentAppPurchaseBinding +import foundation.e.apps.ui.MainActivityViewModel /** * A simple [Fragment] subclass. 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 94% 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..f97ec131c 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,23 +42,23 @@ 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.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.enums.Status +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.GPlayLoginException 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.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.install.download.data.DownloadProgress +import foundation.e.apps.install.pkg.PWAManagerModule +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.ui.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.ui.applicationlist.ApplicationListRVAdapter +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/search/SearchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt similarity index 89% 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..09f8b2d6a 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,13 +25,13 @@ 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.utils.exceptions.CleanApkException -import foundation.e.apps.utils.exceptions.GPlayException -import foundation.e.apps.utils.parentFragment.LoadingViewModel +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.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/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 96% 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..cdff64f52 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,15 +37,15 @@ 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.R -import foundation.e.apps.api.fused.UpdatesDao +import foundation.e.apps.data.enums.User +import foundation.e.apps.data.fused.UpdatesDao +import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.databinding.CustomPreferenceBinding -import foundation.e.apps.login.LoginViewModel -import foundation.e.apps.updates.manager.UpdatesWorkManager -import foundation.e.apps.utils.enums.User -import foundation.e.apps.utils.modules.CommonUtilsFunctions +import foundation.e.apps.install.updates.UpdatesWorkManager +import foundation.e.apps.ui.MainActivity +import foundation.e.apps.ui.MainActivityViewModel +import foundation.e.apps.utils.CommonUtilsFunctions import timber.log.Timber import javax.inject.Inject 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 95% 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..5aeda3fb1 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 @@ -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.preference.DataStoreModule import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope 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 91% 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..636e19f99 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 @@ -7,9 +7,9 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController import dagger.hilt.android.AndroidEntryPoint import foundation.e.apps.R +import foundation.e.apps.data.login.LoginViewModel import foundation.e.apps.databinding.FragmentSignInBinding -import foundation.e.apps.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/setup/signin/SignInViewModel.kt b/app/src/main/java/foundation/e/apps/ui/setup/signin/SignInViewModel.kt similarity index 85% 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..61d7c5757 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 @@ -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.preference.DataStoreModule import kotlinx.coroutines.launch import javax.inject.Inject 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 95% 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..e66022642 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,10 +31,10 @@ 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.data.login.LoginViewModel import foundation.e.apps.databinding.FragmentGoogleSigninBinding -import foundation.e.apps.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/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 84% 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..ef3ad3805 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,11 +1,11 @@ -package foundation.e.apps.setup.tos +package foundation.e.apps.ui.setup.tos import androidx.lifecycle.LiveData 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.preference.DataStoreModule import kotlinx.coroutines.launch import javax.inject.Inject 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 91% 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..4baf3adbf 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,31 +33,31 @@ 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.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.enums.ResultStatus +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fused.FusedAPIInterface +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.fusedDownload.models.FusedDownload +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.data.login.exceptions.GPlayLoginException import foundation.e.apps.databinding.FragmentUpdatesBinding -import foundation.e.apps.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.utils.enums.ResultStatus -import foundation.e.apps.utils.enums.Status +import foundation.e.apps.di.CommonUtilsModule.safeNavigate +import foundation.e.apps.install.download.data.DownloadProgress +import foundation.e.apps.install.pkg.PWAManagerModule +import foundation.e.apps.install.updates.UpdatesWorkManager +import foundation.e.apps.install.workmanager.InstallWorkManager.INSTALL_WORK_NAME +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.ui.application.subFrags.ApplicationDialogFragment +import foundation.e.apps.ui.applicationlist.ApplicationListRVAdapter +import foundation.e.apps.ui.parentFragment.TimeoutFragment 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.utils.toast import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.filter 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 86% 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..1db01bb0c 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,23 +16,23 @@ * 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.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.fused.FusedAPIRepository +import foundation.e.apps.data.fused.data.FusedApp +import foundation.e.apps.data.login.AuthObject +import foundation.e.apps.data.login.exceptions.CleanApkException +import foundation.e.apps.data.login.exceptions.GPlayException +import foundation.e.apps.data.preference.PreferenceManagerModule +import foundation.e.apps.data.updates.UpdatesManagerRepository +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 1509729b2..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 @@ -20,8 +20,8 @@ package foundation.e.apps.utils.eventBus -import foundation.e.apps.api.ResultSupreme -import foundation.e.apps.utils.enums.ResultStatus +import foundation.e.apps.data.ResultSupreme +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/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"> + app:argType="foundation.e.apps.data.enums.Origin" /> + app:argType="foundation.e.apps.data.enums.Origin" /> - () 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..179b4837a 100644 --- a/app/src/test/java/foundation/e/apps/installProcessor/FakeFusedManagerRepository.kt +++ b/app/src/test/java/foundation/e/apps/installProcessor/FakeFusedManagerRepository.kt @@ -18,11 +18,11 @@ 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.utils.enums.Status +import foundation.e.apps.data.enums.Status +import foundation.e.apps.data.fdroid.FdroidRepository +import foundation.e.apps.data.fusedDownload.FusedManagerRepository +import foundation.e.apps.data.fusedDownload.IFusedManager +import foundation.e.apps.data.fusedDownload.models.FusedDownload import kotlinx.coroutines.delay class FakeFusedManagerRepository( -- GitLab