Skip to content

Commit 6e96e59

Browse files
committed
revert: split implementation for oldarch and newarch
1 parent 193ab4c commit 6e96e59

File tree

4 files changed

+22
-132
lines changed

4 files changed

+22
-132
lines changed

android/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@ android {
3636
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
3737
}
3838

39-
sourceSets {
40-
main {
41-
if (isNewArchitectureEnabled()) {
42-
java.srcDirs += ['src/newarch']
43-
} else {
44-
java.srcDirs += ['src/oldarch']
45-
}
46-
}
47-
}
48-
4939
buildTypes {
5040
release {
5141
minifyEnabled false

android/src/newarch/java/com/reactnativefastshadow/FastShadowViewManager.java renamed to android/src/main/java/com/reactnativefastshadow/FastShadowViewManager.java

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,50 +9,62 @@
99
import com.facebook.react.uimanager.annotations.ReactProp;
1010
import com.facebook.react.views.view.ReactViewGroup;
1111
import com.facebook.react.views.view.ReactViewManager;
12-
import com.facebook.react.module.annotations.ReactModule;
1312

14-
@ReactModule(name = FastShadowViewManagerImpl.NAME)
1513
public class FastShadowViewManager extends ReactViewManager {
1614

15+
public static final String NAME = "FastShadowView";
16+
1717
@Override
1818
@NonNull
1919
public String getName() {
20-
return FastShadowViewManagerImpl.NAME;
20+
return FastShadowViewManager.NAME;
2121
}
2222

2323
@Override
2424
public FastShadowView createViewInstance(ThemedReactContext context) {
25-
return FastShadowViewManagerImpl.createViewInstance(context);
25+
return new FastShadowView(context);
2626
}
2727

2828
@Override
2929
public void onDropViewInstance(@NonNull ReactViewGroup view) {
3030
super.onDropViewInstance(view);
31-
FastShadowViewManagerImpl.onDropViewInstance(view);
31+
((FastShadowView) view).releaseShadow();
3232
}
3333

3434
@ReactProp(name = "shadowColor", customType = "Color", defaultInt = Color.BLACK)
3535
public void setShadowColor(FastShadowView view, int color) {
36-
FastShadowViewManagerImpl.setShadowColor(view, color);
36+
view.setColor(color);
3737
}
3838

3939
@ReactProp(name = "shadowOpacity", defaultFloat = 0)
4040
public void setShadowOpacity(FastShadowView view, float opacity) {
41-
FastShadowViewManagerImpl.setShadowOpacity(view, opacity);
41+
view.setOpacity(opacity);
4242
}
4343

4444
@ReactProp(name = "shadowRadius", defaultFloat = 3)
4545
public void setShadowRadius(FastShadowView view, float radius) {
46-
FastShadowViewManagerImpl.setShadowRadius(view, radius);
46+
view.setRadius(radius);
4747
}
4848

4949
@ReactProp(name = "shadowOffset")
5050
public void setShadowOffset(FastShadowView view, ReadableMap offset) {
51-
FastShadowViewManagerImpl.setShadowOffset(view, offset);
51+
if (offset == null) {
52+
view.resetOffset();
53+
} else {
54+
view.setOffset(
55+
(float) offset.getDouble("width"),
56+
(float) offset.getDouble("height")
57+
);
58+
}
5259
}
5360

5461
@ReactProp(name = "cornerRadii")
5562
public void setCornerRadii(FastShadowView view, ReadableMap borderRadius) {
56-
FastShadowViewManagerImpl.setCornerRadii(view, borderRadius);
63+
view.setCornerRadii(new float[]{
64+
(float) borderRadius.getDouble("topLeft"),
65+
(float) borderRadius.getDouble("topRight"),
66+
(float) borderRadius.getDouble("bottomRight"),
67+
(float) borderRadius.getDouble("bottomLeft")
68+
});
5769
}
5870
}

android/src/main/java/com/reactnativefastshadow/FastShadowViewManagerImpl.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

android/src/oldarch/java/com/reactnativefastshadow/FastShadowViewManager.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)