Refactored SimpleForm

Author: ScarletRedMan

README.md

@@ -29,9 +29,8 @@ SimpleFormHandler handler = (p, button) -> {
 
 form.setContent("This is a text")
     .addContent("\nThis is addition :3")
-    .addButton("Test button", handler)
-    .addButton("Same button but with image", ImageType.PATH, "textures/items/diamond", handler)
-    .addButton("Button without handler");
+    .add(new Button("Test button", handler))
+    .add(new Button("Same button but with image", Button.Icon.texture("textures/items/diamond"), handler));
 
 //We can set handler for null result
 form.setNoneHandler(p -> {

src/main/java/ru/contentforge/formconstructor/form/SimpleForm.java

@@ -3,9 +3,7 @@
 import com.google.gson.annotations.SerializedName;
 import lombok.Getter;
 import ru.contentforge.formconstructor.form.element.Button;
-import ru.contentforge.formconstructor.form.element.ImageType;
 import ru.contentforge.formconstructor.form.handler.NoneHandler;
-import ru.contentforge.formconstructor.form.handler.SimpleFormHandler;
 import ru.contentforge.formconstructor.form.response.SimpleFormResponse;
 
 import java.util.ArrayList;
@@ -41,7 +39,7 @@ public SimpleForm(String title, String content, NoneHandler noneHandler, Collect
         this.noneHandler = noneHandler;
 
         if(buttons == null) return;
-        for(Button button: buttons) addButton(button);
+        for(Button button: buttons) add(button);
     }
 
     public SimpleForm setTitle(String title) {
@@ -59,30 +57,18 @@ public SimpleForm addContent(String addition){
         return this;
     }
 
-    public SimpleForm addButton(SimpleFormHandler handler){
-        return addButton("", handler);
-    }
-
-    public SimpleForm addButton(String text, SimpleFormHandler handler){
-        return addButton(text, ImageType.PATH, "", handler);
-    }
-
-    public SimpleForm addButton(String text, ImageType imageType, String path, SimpleFormHandler handler){
-        return addButton(new Button(text, imageType, path, handler));
-    }
-
-    public SimpleForm addButton(Button button){
+    public SimpleForm add(Button button){
         buttons.add(button);
         return this;
     }
 
-    public SimpleForm addButtons(Button... buttons){
-        for(Button button: buttons) addButton(button);
+    public SimpleForm add(Button... buttons){
+        for(Button button: buttons) add(button);
         return this;
     }
 
-    public SimpleForm addButtons(Collection<Button> buttons){
-        for(Button button: buttons) addButton(button);
+    public SimpleForm add(Collection<Button> buttons){
+        for(Button button: buttons) add(button);
         return this;
     }
 

src/main/java/ru/contentforge/formconstructor/form/element/Button.java

@@ -2,34 +2,47 @@
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Getter;
-import ru.contentforge.formconstructor.form.handler.SimpleFormHandler;
+import ru.contentforge.formconstructor.form.handler.ButtonClickHandler;
 
 @Getter
 public class Button extends FormElement {
 
-    @SerializedName("image") protected ImageButton image;
-    protected transient SimpleFormHandler handler;
+    @SerializedName("image") protected Icon image;
+    protected transient ButtonClickHandler handler;
 
-    public Button(){
-        this("");
+    public Button(String name, ButtonClickHandler handler){
+        this(name, Icon.texture(""), handler);
     }
 
-    public Button(String name){
-        this(name, null);
-    }
+    public Button(String name, Icon icon, ButtonClickHandler handler) {
+        super(name);
 
-    public Button(String name, SimpleFormHandler handler){
-        this(name, ImageType.PATH, "", handler);
+        this.handler = handler;
+        this.image = icon;
     }
 
-    public Button(String name, ImageType imageType, String image){
-        this(name, imageType, image, null);
-    }
+    public static class Icon {
 
-    public Button(String name, ImageType imageType, String image, SimpleFormHandler handler) {
-        super(name);
+        @SerializedName("type") protected Type type;
+        @SerializedName("data") protected String path;
 
-        this.handler = handler;
-        this.image = new ImageButton(imageType, image);
+        private Icon(Type type, String path){
+            this.path = path;
+            this.type = type;
+        }
+
+        public static Icon texture(String path) {
+            return new Icon(Type.PATH, path);
+        }
+
+        public static Icon url(String url) {
+            return new Icon(Type.URL, url);
+        }
+
+        public enum Type {
+
+            @SerializedName("path") PATH,
+            @SerializedName("url") URL,
+        }
     }
 }

src/main/java/ru/contentforge/formconstructor/form/element/ImageButton.java

@@ -3,7 +3,7 @@
 import cn.nukkit.Player;
 import ru.contentforge.formconstructor.form.element.Button;
 
-public interface SimpleFormHandler extends FormHandler {
+public interface ButtonClickHandler extends FormHandler {
 
     void handle(Player player, Button button);
 }

src/main/java/ru/contentforge/formconstructor/form/element/ImageType.java

@@ -2,9 +2,9 @@
 
 import cn.nukkit.Player;
 import ru.contentforge.formconstructor.form.element.Button;
-import ru.contentforge.formconstructor.form.handler.SimpleFormHandler;
+import ru.contentforge.formconstructor.form.handler.ButtonClickHandler;
 
-public class SimpleFormResponse extends Response<SimpleFormHandler> {
+public class SimpleFormResponse extends Response<ButtonClickHandler> {
 
     protected Button button;