From 92bf83200b969f9d0edc73ec37da8b66d4c92d42 Mon Sep 17 00:00:00 2001 From: rhenwinch Date: Fri, 8 Dec 2023 23:33:01 +0800 Subject: [PATCH] v1.3.1 --- .idea/androidTestResultsUserPreferences.xml | 14 ++ .idea/deploymentTargetDropDown.xml | 17 +- .idea/gradle.xml | 5 +- app/build.gradle | 19 +- app/release/app-release.apk | Bin 7516952 -> 11063876 bytes app/release/output-metadata.json | 4 +- .../com/flixclusive/FlixclusiveApplication.kt | 13 +- .../java/com/flixclusive/common/Constants.kt | 3 +- .../data/api/GithubConfigService.kt | 4 + .../flixclusive/data/api/TMDBApiService.kt | 10 +- .../data/config/ConfigurationProviderImpl.kt | 54 ++++++ .../repository/ProvidersRepositoryImpl.kt | 105 +++++++++++ ...pl.kt => VideoDataSourceRepositoryImpl.kt} | 34 ++-- .../usecase/ModifyProvidersUseCaseImpl.kt | 32 ---- .../usecase/VideoDataProviderUseCaseImpl.kt | 28 +-- .../main/java/com/flixclusive/di/AppModule.kt | 61 +++++-- .../com/flixclusive/di/AppSettingsModule.kt | 5 + .../com/flixclusive/di/CoroutinesModule.kt | 26 +-- .../java/com/flixclusive/di/NetworkModule.kt | 57 +++++- .../java/com/flixclusive/di/UseCaseModule.kt | 30 +-- .../domain/config/ConfigurationProvider.kt | 2 + .../domain/model/config/AppConfig.kt | 4 +- .../domain/model/config/ProviderStatus.kt | 6 + .../model/provider/SourceProviderDetails.kt | 1 + .../flixclusive/domain/model/tmdb/FilmType.kt | 10 +- .../domain/preferences/AppSettings.kt | 106 +++++++++++ .../preferences/AppSettingsSerialiazer.kt | 84 --------- .../preferences/ProviderConfiguration.kt | 9 + .../domain/repository/ProvidersRepository.kt | 19 ++ ...sitory.kt => VideoDataSourceRepository.kt} | 5 +- .../domain/usecase/ModifyProvidersUseCase.kt | 12 -- .../com/flixclusive/domain/utils/TMDBUtils.kt | 16 +- .../viewmodels/player/BasePlayerViewModel.kt | 8 +- .../common/composables/film/FilmCover.kt | 2 + .../common/composables/film/FilmEpisode.kt | 2 + .../common/composables/film/FilmHeader.kt | 2 + .../mobile/screens/home/content/HomeHeader.kt | 3 + .../episodes_sheet/SheetEpisodeItem.kt | 2 + .../preferences/about/AboutMobileScreen.kt | 116 +++++++++++- .../common/TopBarWithNavigationIcon.kt | 56 +++--- .../content/PreferencesRootMobileScreen.kt | 6 +- .../preferences/providers/ProviderItemCard.kt | 37 +++- .../providers/ProvidersListScreen.kt | 6 +- .../providers/ProvidersListViewModel.kt | 31 +++- .../RecentlyWatchedMobileScreen.kt | 37 ++-- .../settings/SettingsMobileScreen.kt | 29 ++- .../settings/SettingsMobileScreenViewModel.kt | 2 + ...ettingsDialog.kt => BaseSettingsDialog.kt} | 4 +- .../advanced/AdvancedDialogWrapper.kt | 34 ++++ .../advanced/dialog/AdvancedDialogDoH.kt | 93 ++++++++++ .../subtitles/SubtitlePreview.kt | 6 +- .../subtitles/SubtitleSettingsDialog.kt | 70 +------ .../dialog/SubtitleDialogEdgeType.kt | 6 +- .../SubtitleDialogFontBackgroundColor.kt | 2 +- .../dialog/SubtitleDialogFontColor.kt | 2 +- .../dialog/SubtitleDialogFontStyle.kt | 6 +- .../subtitles/dialog/SubtitleDialogSize.kt | 8 +- .../video_player/dialog/VideoPlayerQuality.kt | 4 +- .../watchlist/WatchlistMobileScreen.kt | 35 ++-- .../content/SearchInitialContentViewModel.kt | 6 +- .../splash_screen/SplashMobileActivity.kt | 18 +- .../splash_screen/SplashMobileScreen.kt | 3 +- .../screens/update/UpdateMobileActivity.kt | 13 +- .../presentation/tv/common/FilmCardTv.kt | 2 + .../presentation/tv/common/FilmTvOverview.kt | 2 + .../tv/screens/film/FilmTvEpisodesScreen.kt | 2 + .../tv/screens/film/FilmTvScreen.kt | 2 + .../FilmEmphasisBackground.kt | 2 + .../ImmersiveHomeBackground.kt | 2 + .../presentation/utils/FormatterUtils.kt | 14 +- .../presentation/utils/ImageRequestCreator.kt | 1 - .../presentation/utils/PlayerUiUtils.kt | 2 +- .../presentation/utils/ToastExtensions.kt | 2 +- app/src/main/res/drawable/time_circle.xml | 13 +- app/src/main/res/values/strings.xml | 6 + .../TMDBAndFilmRepositoryBaseTest.kt | 132 -------------- .../usecase/VideoDataProviderUseCaseTest.kt | 150 --------------- providers/build.gradle.kts | 1 + .../providers/ExampleInstrumentedTest.kt | 24 --- .../providers/extractors/mixdrop/MixDrop.kt | 4 +- .../providers/extractors/upcloud/UpCloud.kt | 4 +- .../providers/interfaces/SourceProvider.kt | 5 +- .../models/common/SearchResultItem.kt | 1 + .../providers/models/common/VideoData.kt | 3 +- .../lookmovie/LookMovieMediaDetail.kt | 40 ++++ .../lookmovie/LookMovieSearchResponse.kt | 45 +++++ .../SuperStreamMediaDetailResponse.kt | 43 +---- .../SuperStreamSubtitleResponse.kt | 13 +- .../providers/sources/flixhq/FlixHQ.kt | 18 +- .../providers/sources/lookmovie/LookMovie.kt | 128 +++++++++++++ .../sources/superstream/SuperStream.kt | 25 ++- .../sources/superstream/SuperStreamCommon.kt | 9 +- .../providers/utils/StringExtensions.kt | 24 +++ .../providers/utils/network/DoHProviders.kt | 172 ++++++++++++++++++ .../utils/{ => network}/OkHttpUtils.kt | 42 ++++- .../providers/BaseSourceProviderTest.kt | 114 ++++++++++++ .../providers/sources/FlixHQTest.kt | 40 ---- .../providers/sources/LookMovieTest.kt | 16 ++ .../providers/sources/SuperStreamTest.kt | 61 ------- 99 files changed, 1688 insertions(+), 920 deletions(-) create mode 100644 app/src/main/java/com/flixclusive/data/repository/ProvidersRepositoryImpl.kt rename app/src/main/java/com/flixclusive/data/repository/{FilmSourcesRepositoryImpl.kt => VideoDataSourceRepositoryImpl.kt} (86%) delete mode 100644 app/src/main/java/com/flixclusive/data/usecase/ModifyProvidersUseCaseImpl.kt create mode 100644 app/src/main/java/com/flixclusive/domain/model/config/ProviderStatus.kt create mode 100644 app/src/main/java/com/flixclusive/domain/preferences/AppSettings.kt create mode 100644 app/src/main/java/com/flixclusive/domain/preferences/ProviderConfiguration.kt create mode 100644 app/src/main/java/com/flixclusive/domain/repository/ProvidersRepository.kt rename app/src/main/java/com/flixclusive/domain/repository/{FilmSourcesRepository.kt => VideoDataSourceRepository.kt} (69%) delete mode 100644 app/src/main/java/com/flixclusive/domain/usecase/ModifyProvidersUseCase.kt rename app/src/main/java/com/flixclusive/presentation/mobile/screens/preferences/settings/dialog_groups/{video_player/VideoPlayerSettingsDialog.kt => BaseSettingsDialog.kt} (98%) create mode 100644 app/src/main/java/com/flixclusive/presentation/mobile/screens/preferences/settings/dialog_groups/advanced/AdvancedDialogWrapper.kt create mode 100644 app/src/main/java/com/flixclusive/presentation/mobile/screens/preferences/settings/dialog_groups/advanced/dialog/AdvancedDialogDoH.kt delete mode 100644 app/src/test/java/com/flixclusive/TMDBAndFilmRepositoryBaseTest.kt delete mode 100644 app/src/test/java/com/flixclusive/usecase/VideoDataProviderUseCaseTest.kt delete mode 100644 providers/src/androidTest/java/com/flixclusive/providers/ExampleInstrumentedTest.kt create mode 100644 providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieMediaDetail.kt create mode 100644 providers/src/main/java/com/flixclusive/providers/models/providers/lookmovie/LookMovieSearchResponse.kt create mode 100644 providers/src/main/java/com/flixclusive/providers/sources/lookmovie/LookMovie.kt create mode 100644 providers/src/main/java/com/flixclusive/providers/utils/StringExtensions.kt create mode 100644 providers/src/main/java/com/flixclusive/providers/utils/network/DoHProviders.kt rename providers/src/main/java/com/flixclusive/providers/utils/{ => network}/OkHttpUtils.kt (66%) create mode 100644 providers/src/test/java/com/flixclusive/providers/sources/LookMovieTest.kt diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml index 95c77272..76904ec9 100644 --- a/.idea/androidTestResultsUserPreferences.xml +++ b/.idea/androidTestResultsUserPreferences.xml @@ -3,6 +3,20 @@