Merge "Add dependencies for curated photos in themepicker" into main (6dbab881) · Commits · e / os / android_packages_apps_ThemePicker

src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -48,10 +48,12 @@ import com.android.wallpaper.module.logging.UserEventLogger
		import com.android.wallpaper.picker.category.domain.interactor.CategoriesLoadingStatusInteractor
		import com.android.wallpaper.picker.category.domain.interactor.CategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.CreativeCategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.CuratedPhotosInteractor
		import com.android.wallpaper.picker.category.domain.interactor.ThirdPartyCategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.implementations.CategoryInteractorImpl
		import com.android.wallpaper.picker.category.domain.interactor.implementations.CreativeCategoryInteractorImpl
		import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCategoriesLoadingStatusInteractor
		import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCuratedPhotosInteractorImpl
		import com.android.wallpaper.picker.category.domain.interactor.implementations.ThirdPartyCategoryInteractorImpl
		import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory
		import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory
		@@ -107,6 +109,12 @@ abstract class ThemePickerAppModule {
		impl: DefaultWallpaperCategoryWrapper
		): WallpaperCategoryWrapper

		@Binds
		@Singleton
		abstract fun bindCuratedPhotosInteractor(
		impl: DefaultCuratedPhotosInteractorImpl
		): CuratedPhotosInteractor

		@Binds
		@Singleton
		abstract fun bindCustomizationInjector(impl: ThemePickerInjector): CustomizationInjector

tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import com.android.wallpaper.module.logging.UserEventLogger
		import com.android.wallpaper.modules.ThemePickerAppModule
		import com.android.wallpaper.network.Requester
		import com.android.wallpaper.picker.category.domain.interactor.CategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.CuratedPhotosInteractor
		import com.android.wallpaper.picker.category.domain.interactor.ThirdPartyCategoryInteractor
		import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory
		import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory
		@@ -62,6 +63,7 @@ import com.android.wallpaper.picker.di.modules.MainDispatcher
		import com.android.wallpaper.picker.preview.ui.util.DefaultImageEffectDialogUtil
		import com.android.wallpaper.picker.preview.ui.util.ImageEffectDialogUtil
		import com.android.wallpaper.testing.FakeCategoryInteractor
		import com.android.wallpaper.testing.FakeCuratedPhotosInteractorImpl
		import com.android.wallpaper.testing.FakeDefaultRequester
		import com.android.wallpaper.testing.FakeThirdPartyCategoryInteractor
		import com.android.wallpaper.testing.FakeWallpaperCategoryWrapper
		@@ -138,6 +140,12 @@ abstract class ThemePickerTestModule {
		@Singleton
		abstract fun bindCategoryInteractor(impl: FakeCategoryInteractor): CategoryInteractor

		@Binds
		@Singleton
		abstract fun bindCuratedPhotosInteractor(
		impl: FakeCuratedPhotosInteractorImpl
		): CuratedPhotosInteractor

		@Binds @Singleton abstract fun bindInjector(impl: TestCustomizationInjector): Injector

		@Binds