diff --git a/android/src/main/java/com/horcrux/svg/ImageView.java b/android/src/main/java/com/horcrux/svg/ImageView.java index 524dd635..d3abd857 100644 --- a/android/src/main/java/com/horcrux/svg/ImageView.java +++ b/android/src/main/java/com/horcrux/svg/ImageView.java @@ -35,7 +35,6 @@ import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.react.views.imagehelper.ImageSource; import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper; import com.horcrux.svg.events.SvgLoadEvent; - import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -142,8 +141,9 @@ class ImageView extends RenderableView { @Override public void onNewResultImpl(Bitmap bitmap) { final EventDispatcher mEventDispatcher = - UIManagerHelper.getEventDispatcherForReactTag(mContext, getId()); - mEventDispatcher.dispatchEvent(new SvgLoadEvent( + UIManagerHelper.getEventDispatcherForReactTag(mContext, getId()); + mEventDispatcher.dispatchEvent( + new SvgLoadEvent( UIManagerHelper.getSurfaceId(ImageView.this), getId(), mContext, diff --git a/android/src/main/java/com/horcrux/svg/RenderableView.java b/android/src/main/java/com/horcrux/svg/RenderableView.java index ff842acc..7ee5e68b 100644 --- a/android/src/main/java/com/horcrux/svg/RenderableView.java +++ b/android/src/main/java/com/horcrux/svg/RenderableView.java @@ -388,21 +388,21 @@ public abstract class RenderableView extends VirtualView implements ReactHitSlop // prepare step 3 - combined layer canvas.saveLayer(null, dstInPaint); - if (mask.getMaskType() == MaskView.MaskType.LUMINANCE) { - // step 1 - luminance layer - // prepare maskPaint with luminanceToAlpha - // https://www.w3.org/TR/SVG11/filters.html#InterfaceSVGFEMergeElement:~:text=not%20applicable.%20A-,luminanceToAlpha,-operation%20is%20equivalent - Paint luminancePaint = new Paint(); - ColorMatrix luminanceToAlpha = - new ColorMatrix( - new float[]{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.2125f, 0.7154f, 0.0721f, 0, 0 - }); - luminancePaint.setColorFilter(new ColorMatrixColorFilter(luminanceToAlpha)); - canvas.saveLayer(null, luminancePaint); - } else { - canvas.saveLayer(null, paint); - } + if (mask.getMaskType() == MaskView.MaskType.LUMINANCE) { + // step 1 - luminance layer + // prepare maskPaint with luminanceToAlpha + // https://www.w3.org/TR/SVG11/filters.html#InterfaceSVGFEMergeElement:~:text=not%20applicable.%20A-,luminanceToAlpha,-operation%20is%20equivalent + Paint luminancePaint = new Paint(); + ColorMatrix luminanceToAlpha = + new ColorMatrix( + new float[] { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.2125f, 0.7154f, 0.0721f, 0, 0 + }); + luminancePaint.setColorFilter(new ColorMatrixColorFilter(luminanceToAlpha)); + canvas.saveLayer(null, luminancePaint); + } else { + canvas.saveLayer(null, paint); + } // calculate mask bounds float maskX = (float) relativeOnWidth(mask.mX); diff --git a/android/src/main/java/com/horcrux/svg/events/SvgLoadEvent.java b/android/src/main/java/com/horcrux/svg/events/SvgLoadEvent.java index e46c738d..9f50d18c 100644 --- a/android/src/main/java/com/horcrux/svg/events/SvgLoadEvent.java +++ b/android/src/main/java/com/horcrux/svg/events/SvgLoadEvent.java @@ -14,10 +14,16 @@ public class SvgLoadEvent extends Event { private final float height; private final String uri; - public SvgLoadEvent(int surfaceId, int viewId, ReactContext mContext, String uriString, float width, float height) { + public SvgLoadEvent( + int surfaceId, + int viewId, + ReactContext mContext, + String uriString, + float width, + float height) { super(surfaceId, viewId); ImageSource imageSource = new ImageSource(mContext, uriString); - this.uri = imageSource.getSource();; + this.uri = imageSource.getSource(); this.width = width; this.height = height; } diff --git a/apps/test-examples/App.js b/apps/test-examples/App.js index 7548dff6..e9211daf 100644 --- a/apps/test-examples/App.js +++ b/apps/test-examples/App.js @@ -24,5 +24,5 @@ import Test2276 from './src/Test2276'; import Test2327 from './src/Test2327'; export default function App() { - return ; + return ; } diff --git a/common/cpp/react/renderer/components/rnsvg/RNSVGImageState.h b/common/cpp/react/renderer/components/rnsvg/RNSVGImageState.h index ac571a49..2785f085 100644 --- a/common/cpp/react/renderer/components/rnsvg/RNSVGImageState.h +++ b/common/cpp/react/renderer/components/rnsvg/RNSVGImageState.h @@ -12,9 +12,9 @@ #include #ifdef ANDROID +#include #include #include -#include #endif namespace facebook { diff --git a/macos-example/__tests__/App.test.tsx b/macos-example/__tests__/App.test.tsx index 9eac6fbc..ef217ab4 100644 --- a/macos-example/__tests__/App.test.tsx +++ b/macos-example/__tests__/App.test.tsx @@ -7,7 +7,7 @@ import React from 'react'; import App from '../App'; // Note: import explicitly to use the types shipped with jest. -import {it} from '@jest/globals'; +import { it } from '@jest/globals'; // Note: test renderer must be required after react-native. import renderer from 'react-test-renderer'; diff --git a/tests-example/__tests__/App.test.tsx b/tests-example/__tests__/App.test.tsx index 9eac6fbc..ef217ab4 100644 --- a/tests-example/__tests__/App.test.tsx +++ b/tests-example/__tests__/App.test.tsx @@ -7,7 +7,7 @@ import React from 'react'; import App from '../App'; // Note: import explicitly to use the types shipped with jest. -import {it} from '@jest/globals'; +import { it } from '@jest/globals'; // Note: test renderer must be required after react-native. import renderer from 'react-test-renderer';