Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 679ca1d8 authored by Bhavuk Jain's avatar Bhavuk Jain
Browse files

Add changes for category wrapper 

This CL aims at adding a wrapper over wallpaper categories that can be
used by individual picker fragment to access the fetched categories
using the new logic. This would allow us to disable fetching categories
according to the older logic.

Bug: 361417085
Flag: com.android.wallpaper.refactor_wallpaper_category_flag
Test: Tested manually
Change-Id: Ib2b769436addce49a6d493bb38540be6011e8bc2
parent 3029d30d

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

+10 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ import com.android.wallpaper.picker.category.domain.interactor.implementations.C 
import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCategoriesLoadingStatusInteractor

import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory

import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory

import com.android.wallpaper.picker.category.wrapper.DefaultWallpaperCategoryWrapper

import com.android.wallpaper.picker.category.wrapper.WallpaperCategoryWrapper

import com.android.wallpaper.picker.common.preview.ui.binder.ThemePickerWorkspaceCallbackBinder

import com.android.wallpaper.picker.common.preview.ui.binder.WorkspaceCallbackBinder

import com.android.wallpaper.picker.customization.ui.binder.CustomizationOptionsBinder
@@ -86,9 +88,15 @@ abstract class ThemePickerAppModule { 
    @Binds

    @Singleton

    abstract fun bindCreativeCategoryInteractor(

        impl: CreativeCategoryInteractorImpl,

        impl: CreativeCategoryInteractorImpl

    ): CreativeCategoryInteractor



    @Binds

    @Singleton

    abstract fun bindWallpaperCategoryWrapper(

        impl: DefaultWallpaperCategoryWrapper

    ): WallpaperCategoryWrapper



    @Binds

    @Singleton

    abstract fun bindCustomizationInjector(impl: ThemePickerInjector): CustomizationInjector
@@ -122,7 +130,7 @@ abstract class ThemePickerAppModule { 
    @Binds

    @Singleton

    abstract fun bindLoadingStatusInteractor(

        impl: DefaultCategoriesLoadingStatusInteractor,

        impl: DefaultCategoriesLoadingStatusInteractor

    ): CategoriesLoadingStatusInteractor



    @Binds

tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt

+7 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewMode 
import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel

import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor

import com.android.wallpaper.module.logging.UserEventLogger

import com.android.wallpaper.picker.category.wrapper.WallpaperCategoryWrapper

import com.android.wallpaper.picker.customization.data.repository.WallpaperColorsRepository

import com.android.wallpaper.testing.TestInjector

import javax.inject.Inject
@@ -25,7 +26,7 @@ open class TestCustomizationInjector 
@Inject

constructor(

    private val customPrefs: TestDefaultCustomizationPreferences,

    private val themesUserEventLogger: ThemesUserEventLogger

    private val themesUserEventLogger: ThemesUserEventLogger,

) : TestInjector(themesUserEventLogger), CustomizationInjector {

    /////////////////

    // CustomizationInjector implementations
@@ -43,7 +44,7 @@ constructor( 


    override fun getWallpaperColorResources(

        wallpaperColors: WallpaperColors,

        context: Context

        context: Context,

    ): WallpaperColorResources {

        throw UnsupportedOperationException("not implemented")

    }
@@ -79,4 +80,8 @@ constructor( 
    override fun getUserEventLogger(): UserEventLogger {

        return themesUserEventLogger

    }



    override fun getWallpaperCategoryWrapper(): WallpaperCategoryWrapper {

        return super.fakeWallpaperCategoryWrapper

    }

}

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

+9 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.wallpaper.module.logging.TestUserEventLogger 
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.wrapper.WallpaperCategoryWrapper

import com.android.wallpaper.picker.common.preview.ui.binder.ThemePickerWorkspaceCallbackBinder

import com.android.wallpaper.picker.common.preview.ui.binder.WorkspaceCallbackBinder

import com.android.wallpaper.picker.customization.ui.binder.CustomizationOptionsBinder
@@ -55,6 +56,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.FakeDefaultRequester

import com.android.wallpaper.testing.FakeWallpaperCategoryWrapper

import com.android.wallpaper.testing.TestPartnerProvider

import com.android.wallpaper.util.converter.DefaultWallpaperModelFactory

import com.android.wallpaper.util.converter.WallpaperModelFactory
@@ -100,6 +102,12 @@ abstract class ThemePickerTestModule { 
    @Singleton

    abstract fun bindEffectsController(impl: FakeEffectsController): EffectsController



    @Binds

    @Singleton

    abstract fun bindWallpaperCategoryWrapper(

        impl: FakeWallpaperCategoryWrapper

    ): WallpaperCategoryWrapper



    @Binds

    @Singleton

    abstract fun bindImageEffectDialogUtil(
@@ -164,7 +172,7 @@ abstract class ThemePickerTestModule { 
        fun provideColorCustomizationManager(): ColorCustomizationManager {

            return ColorCustomizationManager.getInstance(

                ApplicationProvider.getApplicationContext(),

                OverlayManagerCompat(ApplicationProvider.getApplicationContext())

                OverlayManagerCompat(ApplicationProvider.getApplicationContext()),

            )

        }