Skip to content

Commit 53cf0a5

Browse files
committed
Property updates
1 parent 6cd5509 commit 53cf0a5

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ repositories {
3434

3535
dependencies {
3636
compile fileTree(dir: 'libs', include: ['*.jar'])
37-
compile "com.facebook.react:react-native:0.15.+"
37+
compile "com.facebook.react:react-native:0.16.+"
3838
compile "com.github.jakob-grabner:Circle-Progress-View:1.2.8"
3939
}

index.android.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ CirclesAndroid.propTypes = {
4545
textScale: PropTypes.number,
4646
textSize: PropTypes.number,
4747
unit: PropTypes.string,
48+
unitVisible: PropTypes.bool,
4849
unitScale: PropTypes.number,
4950
unitSize: PropTypes.number,
5051
animated: PropTypes.bool,

src/main/java/com/kwaak/reacttwo/CirclesManager.java

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public String getName() {
3232

3333
@Override
3434
public CirclesView createViewInstance(ThemedReactContext context) {
35-
//CirclesView c = new CirclesView(context);
3635
return new CirclesView(context);
3736
}
3837

@@ -45,11 +44,6 @@ public void setBarColors(CirclesView view, ReadableArray val) {
4544
view.setBarColor(vals);
4645
}
4746

48-
@ReactProp(name = "contourColor", defaultInt = 0)
49-
public void setContourColor(CirclesView view, int val) {
50-
view.setContourColor(val);
51-
}
52-
5347
@ReactProp(name = "barWidth", defaultInt = 0)
5448
public void setBarWidth(CirclesView view, int val) {
5549
view.setBarWidth(val);
@@ -120,16 +114,6 @@ public void setStartAngle(CirclesView view, int val) {
120114
view.setStartAngle(val);
121115
}
122116

123-
@ReactProp(name = "textScale", defaultFloat = 0)
124-
public void setTextScale(CirclesView view, float val) {
125-
view.setTextScale(val);
126-
}
127-
128-
@ReactProp(name = "textSize", defaultInt = 0)
129-
public void setTextSize(CirclesView view, int val) {
130-
view.setTextSize(val);
131-
}
132-
133117
@ReactProp(name = "unit")
134118
public void setUnit(CirclesView view, @Nullable String val) {
135119
view.setUnit(val);
@@ -140,16 +124,36 @@ public void setUnitScale(CirclesView view, float val) {
140124
view.setUnitScale(val);
141125
}
142126

143-
@ReactProp(name = "text")
144-
public void setText(CirclesView view, @Nullable String val) {
145-
view.setText(val);
127+
@ReactProp(name = "unitVisible", defaultBoolean = false)
128+
public void setUnitVisible(CirclesView view, boolean val) {
129+
view.setUnitVisible(val);
130+
}
131+
132+
@ReactProp(name = "unitColor")
133+
public void setUnitColor(CirclesView view, @Nullable String val) {
134+
view.setUnitColor(Color.parseColor(val));
146135
}
147136

148137
@ReactProp(name = "unitSize", defaultInt = 0)
149138
public void setUnitSize(CirclesView view, int val) {
150139
view.setUnitSize(val);
151140
}
152141

142+
@ReactProp(name = "textScale", defaultFloat = 0)
143+
public void setTextScale(CirclesView view, float val) {
144+
view.setTextScale(val);
145+
}
146+
147+
@ReactProp(name = "textSize", defaultInt = 0)
148+
public void setTextSize(CirclesView view, int val) {
149+
view.setTextSize(val);
150+
}
151+
152+
@ReactProp(name = "text")
153+
public void setText(CirclesView view, @Nullable String val) {
154+
view.setText(val);
155+
}
156+
153157
@ReactProp(name = "textMode")
154158
public void setTextMode(CirclesView view, @Nullable String val) {
155159
if(val.equalsIgnoreCase("text"))
@@ -165,13 +169,6 @@ public void setAnimated(CirclesView view, boolean val) {
165169
_animated = val;
166170
}
167171

168-
/*
169-
Not implemented:
170-
android.graphics.Paint.Cap public void setBarStrokeCap(CirclesView view, )
171-
android.graphics.Shader public void setRimShader(CirclesView view, )
172-
android.graphics.Paint.Cap public void setSpinnerStrokeCap(CirclesView view, )
173-
*/
174-
175172
@Override
176173
public Map<String,Integer> getCommandsMap() {
177174
return MapBuilder.of(

0 commit comments

Comments
 (0)