zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-05 07:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Fix RenderableViewManager inheritance hierarchy

Browse Source
This commit is contained in:
Mikael Sand
2018-10-15 05:26:45 +03:00
parent 31d1a7459a
commit 585acee281
1 changed files with 15 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/RenderableViewManager.java
+15 -62
View File
@@ -334,6 +334,10 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
super(SVGClass.RNSVGGroup); super(SVGClass.RNSVGGroup);
} }
GroupViewManager(SVGClass svgClass) {
super(svgClass);
}
@ReactProp(name = "font") @ReactProp(name = "font")
public void setFont(GroupView node, @Nullable ReadableMap font) { public void setFont(GroupView node, @Nullable ReadableMap font) {
node.setFont(font); node.setFont(font);
@@ -352,11 +356,15 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
} }
} }
static class TextViewManager extends RenderableViewManager { static class TextViewManager extends GroupViewManager {
TextViewManager() { TextViewManager() {
super(SVGClass.RNSVGText); super(SVGClass.RNSVGText);
} }
TextViewManager(SVGClass svgClass) {
super(svgClass);
}
@ReactProp(name = "textLength") @ReactProp(name = "textLength")
public void setTextLength(TextView node, Dynamic length) { public void setTextLength(TextView node, Dynamic length) {
node.setTextLength(length); node.setTextLength(length);
@@ -397,21 +405,11 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
node.setDeltaY(deltaY); node.setDeltaY(deltaY);
} }
@ReactProp(name = "positionX")
public void setPositionX(TextView node, Dynamic positionX) {
node.setPositionX(positionX);
}
@ReactProp(name = "x") @ReactProp(name = "x")
public void setX(TextView node, Dynamic positionX) { public void setX(TextView node, Dynamic positionX) {
node.setPositionX(positionX); node.setPositionX(positionX);
} }
@ReactProp(name = "positionY")
public void setPositionY(TextView node, Dynamic positionY) {
node.setPositionY(positionY);
}
@ReactProp(name = "y") @ReactProp(name = "y")
public void setY(TextView node, Dynamic positionY) { public void setY(TextView node, Dynamic positionY) {
node.setPositionY(positionY); node.setPositionY(positionY);
@@ -423,7 +421,7 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
} }
} }
static class TSpanViewManager extends RenderableViewManager { static class TSpanViewManager extends TextViewManager {
TSpanViewManager() { TSpanViewManager() {
super(SVGClass.RNSVGTSpan); super(SVGClass.RNSVGTSpan);
} }
@@ -432,49 +430,9 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
public void setContent(TSpanView node, @Nullable String content) { public void setContent(TSpanView node, @Nullable String content) {
node.setContent(content); node.setContent(content);
} }
@ReactProp(name = "rotate")
public void setRotate(TextView node, Dynamic rotate) {
node.setRotate(rotate);
}
@ReactProp(name = "dx")
public void setDeltaX(TextView node, Dynamic deltaX) {
node.setDeltaX(deltaX);
}
@ReactProp(name = "dy")
public void setDeltaY(TextView node, Dynamic deltaY) {
node.setDeltaY(deltaY);
}
@ReactProp(name = "positionX")
public void setPositionX(TextView node, Dynamic positionX) {
node.setPositionX(positionX);
}
@ReactProp(name = "x")
public void setX(TextView node, Dynamic positionX) {
node.setPositionX(positionX);
}
@ReactProp(name = "positionY")
public void setPositionY(TextView node, Dynamic positionY) {
node.setPositionY(positionY);
}
@ReactProp(name = "y")
public void setY(TextView node, Dynamic positionY) {
node.setPositionY(positionY);
}
@ReactProp(name = "font")
public void setFont(TextView node, @Nullable ReadableMap font) {
node.setFont(font);
}
} }
static class TextPathViewManager extends RenderableViewManager { static class TextPathViewManager extends TextViewManager {
TextPathViewManager() { TextPathViewManager() {
super(SVGClass.RNSVGTextPath); super(SVGClass.RNSVGTextPath);
} }
@@ -508,11 +466,6 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
public void setSharp(TextPathView node, @Nullable String midLine) { public void setSharp(TextPathView node, @Nullable String midLine) {
node.setSharp(midLine); node.setSharp(midLine);
} }
@ReactProp(name = "font")
public void setFont(TextView node, @Nullable ReadableMap font) {
node.setFont(font);
}
} }
static class ImageViewManager extends RenderableViewManager { static class ImageViewManager extends RenderableViewManager {
@@ -666,7 +619,7 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
} }
} }
static class ClipPathViewManager extends RenderableViewManager { static class ClipPathViewManager extends GroupViewManager {
ClipPathViewManager() { ClipPathViewManager() {
super(SVGClass.RNSVGClipPath); super(SVGClass.RNSVGClipPath);
} }
@@ -699,7 +652,7 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
} }
} }
static class SymbolManager extends RenderableViewManager { static class SymbolManager extends GroupViewManager {
SymbolManager() { SymbolManager() {
super(SVGClass.RNSVGSymbol); super(SVGClass.RNSVGSymbol);
} }
@@ -735,7 +688,7 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
} }
} }
static class PatternManager extends RenderableViewManager { static class PatternManager extends GroupViewManager {
PatternManager() { PatternManager() {
super(SVGClass.RNSVGPattern); super(SVGClass.RNSVGPattern);
} }
@@ -806,7 +759,7 @@ class RenderableViewManager extends ViewGroupManager<VirtualView> {
} }
} }
static class MaskManager extends RenderableViewManager { static class MaskManager extends GroupViewManager {
MaskManager() { MaskManager() {
super(SVGClass.RNSVGMask); super(SVGClass.RNSVGMask);
} }