release 0.1 #30

Manually merged
noemi3 merged 150 commits from release/0.1 into master 2020-01-18 14:59:02 +00:00
3 changed files with 7 additions and 5 deletions
Showing only changes of commit 56c212156c - Show all commits

View File

@ -2,7 +2,9 @@ package wekan.wrapper.entity;
import com.google.gson.annotations.SerializedName;
public enum LabelColor {
public enum Color {
@SerializedName("white")
WHITE,
@SerializedName("green")
GREEN,
@SerializedName("yellow")

View File

@ -6,9 +6,9 @@ public class Label {
@SerializedName("_id")
private String id;
private String name;
private LabelColor color;
private Color color;
public Label(String id, String name, LabelColor color) {
public Label(String id, String name, Color color) {
this.id = id;
this.name = name;
this.color = color;
@ -22,7 +22,7 @@ public class Label {
return name;
}
public LabelColor getColor() {
public Color getColor() {
return color;
}

View File

@ -10,7 +10,7 @@ public class LabelPrototype {
* @param name The name of the new label
* @param color The color of the new label
*/
public LabelPrototype(String name, LabelColor color) {
public LabelPrototype(String name, Color color) {
label = new Label(null, name, color);
}
}