Remove FrescoVitoComponents.Implementation

Reviewed By: defHLT Differential Revision: D58672017 fbshipit-source-id: b056f34c604d8840e9a3f553219856094bfd5e8e
facebook · Jun 21, 2024 · aeddabe · aeddabe
1 parent f2f29f3
commit aeddabe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/vito/init/src/main/java/com/facebook/fresco/vito/init/FrescoVito.kt b/vito/init/src/main/java/com/facebook/fresco/vito/init/FrescoVito.kt
@@ -26,6 +26,7 @@ import com.facebook.fresco.vito.nativecode.NativeCircularBitmapRounding
 import com.facebook.fresco.vito.provider.components.FrescoVitoComponents
 import com.facebook.fresco.vito.provider.impl.DefaultFrescoVitoProvider
 import com.facebook.fresco.vito.provider.impl.NoOpCallerContextVerifier
+import com.facebook.fresco.vito.provider.setup.FrescoVitoSetup
 import com.facebook.imagepipeline.core.ImagePipeline
 import com.facebook.imagepipeline.core.ImagePipelineFactory
 import com.facebook.imagepipeline.image.ImageInfo
@@ -94,7 +95,7 @@ class FrescoVito {
  * @param providerImplementation the provider implementation to be used
  */
  @Synchronized
- fun initialize(providerImplementation: FrescoVitoComponents.Implementation) {
+ fun initialize(providerImplementation: FrescoVitoSetup) {
  if (isInitialized) {
  return
  }

diff --git a/...ovider/src/main/java/com/facebook/fresco/vito/provider/components/FrescoVitoComponents.kt b/...ovider/src/main/java/com/facebook/fresco/vito/provider/components/FrescoVitoComponents.kt
@@ -17,7 +17,7 @@ import java.lang.RuntimeException
 
 object FrescoVitoComponents : FrescoVitoSetup {
 
- private var _implementation: Implementation? = null
+ private var _implementation: FrescoVitoSetup? = null
 
  @Synchronized
  override fun getController(): FrescoController2 = getImplementation().getController()
@@ -46,13 +46,13 @@ object FrescoVitoComponents : FrescoVitoSetup {
  // You can use #resetImplementation() if you must manually tear down Vito.
  @JvmStatic
  @Synchronized
- fun getImplementation(): Implementation {
+ fun getImplementation(): FrescoVitoSetup {
  return _implementation ?: throw RuntimeException("Fresco context provider must be set")
  }
 
  @JvmStatic
  @Synchronized
- fun setImplementation(implementation: Implementation) {
+ fun setImplementation(implementation: FrescoVitoSetup) {
  // We do not allow to re-initialize Vito directly.
  // You can use #resetImplementation() if you must manually tear down Vito.
  if (_implementation != null) {
@@ -62,6 +62,4 @@ object FrescoVitoComponents : FrescoVitoSetup {
  }
  _implementation = implementation
  }
-
- interface Implementation : FrescoVitoSetup
 }
diff --git a/...rovider/src/main/java/com/facebook/fresco/vito/provider/impl/DefaultFrescoVitoProvider.kt b/...rovider/src/main/java/com/facebook/fresco/vito/provider/impl/DefaultFrescoVitoProvider.kt
@@ -26,7 +26,7 @@ import com.facebook.fresco.vito.drawable.ArrayVitoDrawableFactory
 import com.facebook.fresco.vito.drawable.BitmapDrawableFactory
 import com.facebook.fresco.vito.draweesupport.DrawableFactoryWrapper
 import com.facebook.fresco.vito.options.ImageOptionsDrawableFactory
-import com.facebook.fresco.vito.provider.components.FrescoVitoComponents
+import com.facebook.fresco.vito.provider.setup.FrescoVitoSetup
 import com.facebook.imagepipeline.core.ImagePipeline
 import com.facebook.imagepipeline.core.ImagePipelineFactory
 import com.facebook.imagepipeline.image.ImageInfo
@@ -43,7 +43,7 @@ class DefaultFrescoVitoProvider(
  vitoImagePerfListener: VitoImagePerfListener,
  debugOverlayFactory: DebugOverlayFactory2 = NoOpDebugOverlayFactory2(),
  imagePerfListenerSupplier: Supplier<ControllerListener2<ImageInfo>>? = null,
-) : FrescoVitoComponents.Implementation {
+) : FrescoVitoSetup {
 
  private val frescoController: FrescoController2
 

diff --git a/...ovider/src/main/java/com/facebook/fresco/vito/provider/impl/kotlin/KFrescoVitoProvider.kt b/...ovider/src/main/java/com/facebook/fresco/vito/provider/impl/kotlin/KFrescoVitoProvider.kt
@@ -19,8 +19,8 @@ import com.facebook.fresco.vito.core.impl.KFrescoController
 import com.facebook.fresco.vito.core.impl.VitoImagePipelineImpl
 import com.facebook.fresco.vito.draweesupport.DrawableFactoryWrapper
 import com.facebook.fresco.vito.options.ImageOptionsDrawableFactory
-import com.facebook.fresco.vito.provider.components.FrescoVitoComponents
 import com.facebook.fresco.vito.provider.impl.NoOpCallerContextVerifier
+import com.facebook.fresco.vito.provider.setup.FrescoVitoSetup
 import com.facebook.imagepipeline.core.ImagePipeline
 import com.facebook.imagepipeline.core.ImagePipelineFactory
 import java.util.concurrent.Executor
@@ -33,7 +33,7 @@ class KFrescoVitoProvider(
  private val lightweightBackgroundExecutor: Executor,
  private val callerContextVerifier: CallerContextVerifier = NoOpCallerContextVerifier,
  private val debugOverlayHandler: DebugOverlayHandler? = null
-) : FrescoVitoComponents.Implementation {
+) : FrescoVitoSetup {
 
  private val _imagePipeline: VitoImagePipeline by lazy {
  VitoImagePipelineImpl(frescoImagePipeline, imagePipelineUtils)