From 7f355dd19d86ee097aaeeaf30a5bd0dc4a0a86e8 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Tue, 19 Sep 2023 06:16:13 -0700 Subject: [PATCH] Back out "Disable Fresco integration for now (#5101)" (#5159) Summary: Back out "Disable Fresco integration for now (https://github.com/facebook/flipper/issues/5101)" Original commit changeset: 42b95c21eb04 This is now working again with Fresco 3.1.0 --- Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/facebook/flipper/pull/5159). * https://github.com/facebook/flipper/issues/5160 * __->__ https://github.com/facebook/flipper/issues/5159 * https://github.com/facebook/flipper/issues/5158 Pull Request resolved: https://github.com/facebook/flipper/pull/5159 Reviewed By: antonk52 Differential Revision: D49411925 Pulled By: passy fbshipit-source-id: 34a422e60102de56fb6588e05cf4729a30e0e112 --- .../flipper/sample/RootComponentSpec.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java index 203537070..5c8a703a1 100644 --- a/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java +++ b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java @@ -8,8 +8,10 @@ package com.facebook.flipper.sample; import android.content.Intent; +import android.net.Uri; import com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity; import com.facebook.flipper.sample.network.NetworkClient; +import com.facebook.fresco.vito.litho.FrescoVitoImage2; import com.facebook.litho.ClickEvent; import com.facebook.litho.Column; import com.facebook.litho.Component; @@ -122,14 +124,12 @@ public class RootComponentSpec { .marginDip(YogaEdge.ALL, 10) .textSizeSp(20) .clickHandler(RootComponent.triggerCrash(c))) - // TODO: Re-enable once we have a new Litho v0.48.0-compatible version of Fresco. - /*.child( - FrescoVitoImage2.create(c) - .uri(Uri.parse("https://fbflipper.com/img/icon.png")) - .marginDip(YogaEdge.ALL, 10) - .widthDip(150) - .heightDip(150))*/ - + .child( + FrescoVitoImage2.create(c) + .uri(Uri.parse("https://fbflipper.com/img/icon.png")) + .marginDip(YogaEdge.ALL, 10) + .widthDip(150) + .heightDip(150)) .build(); return VerticalScroll.create(c).childComponent(col).build();