diff --git a/block-kit/src/main/java/elements/Button.java b/block-kit/src/main/java/elements/Button.java index 563d91d..ef507c3 100644 --- a/block-kit/src/main/java/elements/Button.java +++ b/block-kit/src/main/java/elements/Button.java @@ -1,10 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.LayoutBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; import com.slack.api.model.block.element.ButtonElement; import java.util.List; @@ -18,8 +16,9 @@ public class Button { * A regular interactive button. */ public static ButtonElement example01() { - ButtonElement element = BlockElements.button( - b -> b.text(plainText("Click Me")).value("click_me_123").actionId("button")); + ButtonElement element = BlockElements.button(b -> b.text(BlockCompositions.plainText("Click Me")) + .value("click_me_123") + .actionId("button")); return element; } @@ -27,8 +26,10 @@ public static ButtonElement example01() { * A button with a primary style attribute. */ public static ButtonElement example02() { - ButtonElement element = BlockElements.button(b -> - b.text(plainText("Save")).style("primary").value("click_me_123").actionId("button")); + ButtonElement element = BlockElements.button(b -> b.text(BlockCompositions.plainText("Save")) + .style("primary") + .value("click_me_123") + .actionId("button")); return element; } @@ -36,8 +37,8 @@ public static ButtonElement example02() { * A link button. */ public static ButtonElement example03() { - ButtonElement element = - BlockElements.button(b -> b.text(plainText("Link Button")).url("https://docs.slack.dev/block-kit")); + ButtonElement element = BlockElements.button( + b -> b.text(BlockCompositions.plainText("Link Button")).url("https://docs.slack.dev/block-kit")); return element; } @@ -46,17 +47,17 @@ public static ButtonElement example03() { */ public static List example05() { List blocks = List.of( - Blocks.section(s -> s.text(markdownText("This is a section block with a button.")) - .accessory(BlockElements.button(b -> b.text(plainText("Click Me")) + Blocks.section(s -> s.text(BlockCompositions.markdownText("This is a section block with a button.")) + .accessory(BlockElements.button(b -> b.text(BlockCompositions.plainText("Click Me")) .value("click_me_123") .actionId("button")))), Blocks.actions(a -> a.blockId("actionblock789") .elements(List.of( - BlockElements.button(b -> b.text(plainText("Primary Button")) + BlockElements.button(b -> b.text(BlockCompositions.plainText("Primary Button")) .style("primary") .value("click_me_456")), - BlockElements.button(b -> - b.text(plainText("Link Button")).url("https://api.slack.com/block-kit")))))); + BlockElements.button(b -> b.text(BlockCompositions.plainText("Link Button")) + .url("https://api.slack.com/block-kit")))))); return blocks; } } diff --git a/block-kit/src/main/java/elements/DatePicker.java b/block-kit/src/main/java/elements/DatePicker.java index be415d6..473c74e 100644 --- a/block-kit/src/main/java/elements/DatePicker.java +++ b/block-kit/src/main/java/elements/DatePicker.java @@ -1,10 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; /** @@ -17,10 +15,10 @@ public class DatePicker { */ public static SectionBlock example01() { SectionBlock block = Blocks.section(s -> s.blockId("section1234") - .text(markdownText("Pick a date for the deadline.")) + .text(BlockCompositions.markdownText("Pick a date for the deadline.")) .accessory(BlockElements.datePicker(d -> d.actionId("datepicker123") .initialDate("1990-04-28") - .placeholder(plainText("Select a date"))))); + .placeholder(BlockCompositions.plainText("Select a date"))))); return block; } } diff --git a/block-kit/src/main/java/elements/DatetimePicker.java b/block-kit/src/main/java/elements/DatetimePicker.java index 6019075..ada50db 100644 --- a/block-kit/src/main/java/elements/DatetimePicker.java +++ b/block-kit/src/main/java/elements/DatetimePicker.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.InputBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; /** @@ -15,10 +14,11 @@ public class DatetimePicker { * An input block with a datetime picker element. */ public static InputBlock example01() { - InputBlock block = - Blocks.input(i -> i.element(BlockElements.datetimePicker(d -> d.actionId("datetimepicker-action"))) - .hint(plainText(pt -> pt.text("This is some hint text").emoji(true))) - .label(plainText(pt -> pt.text("Start date").emoji(true)))); + InputBlock block = Blocks.input(i -> i.element( + BlockElements.datetimePicker(d -> d.actionId("datetimepicker-action"))) + .hint(BlockCompositions.plainText( + pt -> pt.text("This is some hint text").emoji(true))) + .label(BlockCompositions.plainText(pt -> pt.text("Start date").emoji(true)))); return block; } } diff --git a/block-kit/src/main/java/elements/EmailInput.java b/block-kit/src/main/java/elements/EmailInput.java index 0b1ae85..dec6419 100644 --- a/block-kit/src/main/java/elements/EmailInput.java +++ b/block-kit/src/main/java/elements/EmailInput.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.InputBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; /** @@ -16,9 +15,9 @@ public class EmailInput { */ public static InputBlock example01() { InputBlock block = Blocks.input(i -> i.blockId("input123") - .label(plainText("Email Address")) - .element(BlockElements.emailTextInput( - e -> e.actionId("email_text_input-action").placeholder(plainText("Enter an email"))))); + .label(BlockCompositions.plainText("Email Address")) + .element(BlockElements.emailTextInput(e -> e.actionId("email_text_input-action") + .placeholder(BlockCompositions.plainText("Enter an email"))))); return block; } } diff --git a/block-kit/src/main/java/elements/FeedbackButtons.java b/block-kit/src/main/java/elements/FeedbackButtons.java index d071533..f4abbe3 100644 --- a/block-kit/src/main/java/elements/FeedbackButtons.java +++ b/block-kit/src/main/java/elements/FeedbackButtons.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.ContextActionsBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.FeedbackButtonObject; import com.slack.api.model.block.element.BlockElements; import java.util.List; @@ -20,12 +19,12 @@ public static ContextActionsBlock example01() { ContextActionsBlock block = Blocks.contextActions(List.of(BlockElements.feedbackButtons(fb -> fb.actionId("feedback_buttons_1") .positiveButton(FeedbackButtonObject.builder() - .text(plainText("Good")) + .text(BlockCompositions.plainText("Good")) .value("positive_feedback") .accessibilityLabel("Mark this response as good") .build()) .negativeButton(FeedbackButtonObject.builder() - .text(plainText("Bad")) + .text(BlockCompositions.plainText("Bad")) .value("negative_feedback") .accessibilityLabel("Mark this response as bad") .build())))); diff --git a/block-kit/src/main/java/elements/FileInput.java b/block-kit/src/main/java/elements/FileInput.java index e4e9ff6..58feab0 100644 --- a/block-kit/src/main/java/elements/FileInput.java +++ b/block-kit/src/main/java/elements/FileInput.java @@ -1,8 +1,7 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; import com.slack.api.model.view.View; import com.slack.api.model.view.Views; @@ -23,7 +22,7 @@ public static View example01() { s -> s.type("plain_text").text("Submit").emoji(true))) .close(Views.viewClose(c -> c.type("plain_text").text("Cancel").emoji(true))) .blocks(List.of(Blocks.input(i -> i.blockId("input_block_id") - .label(plainText("Upload Files")) + .label(BlockCompositions.plainText("Upload Files")) .element(BlockElements.fileInput(f -> f.actionId("file_input_action_id_1") .filetypes(List.of("jpg", "png")) .maxFiles(5))))))); diff --git a/block-kit/src/main/java/elements/IconButton.java b/block-kit/src/main/java/elements/IconButton.java index 055f8bb..4b4b6b8 100644 --- a/block-kit/src/main/java/elements/IconButton.java +++ b/block-kit/src/main/java/elements/IconButton.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.ContextActionsBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; import java.util.List; @@ -17,7 +16,7 @@ public class IconButton { */ public static ContextActionsBlock example01() { ContextActionsBlock block = Blocks.contextActions(List.of(BlockElements.iconButton(ib -> ib.icon("trash") - .text(plainText("Delete")) + .text(BlockCompositions.plainText("Delete")) .actionId("delete_button") .value("delete_item")))); return block; diff --git a/block-kit/src/main/java/elements/Image.java b/block-kit/src/main/java/elements/Image.java index 723f1e3..6819a4d 100644 --- a/block-kit/src/main/java/elements/Image.java +++ b/block-kit/src/main/java/elements/Image.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.SlackFileObject; import com.slack.api.model.block.element.BlockElements; @@ -17,7 +16,7 @@ public class Image { */ public static SectionBlock example01() { SectionBlock block = Blocks.section(s -> s.blockId("section567") - .text(markdownText("This is a section block with an accessory image.")) + .text(BlockCompositions.markdownText("This is a section block with an accessory image.")) .accessory(BlockElements.image( i -> i.imageUrl("https://pbs.twimg.com/profile_images/625633822235693056/lNGUneLX_400x400.jpg") .altText("cute cat")))); @@ -29,7 +28,7 @@ public static SectionBlock example01() { */ public static SectionBlock example02() { SectionBlock block = Blocks.section(s -> s.blockId("section567") - .text(markdownText("This is a section block with an accessory image.")) + .text(BlockCompositions.markdownText("This is a section block with an accessory image.")) .accessory(BlockElements.image(i -> i.slackFile(SlackFileObject.builder() .url("https://files.slack.com/files-pri/T0123456-F0123456/xyz.png") .build()) @@ -42,7 +41,7 @@ public static SectionBlock example02() { */ public static SectionBlock example03() { SectionBlock block = Blocks.section(s -> s.blockId("section567") - .text(markdownText("This is a section block with an accessory image.")) + .text(BlockCompositions.markdownText("This is a section block with an accessory image.")) .accessory(BlockElements.image(i -> i.slackFile( SlackFileObject.builder().id("F01234567").build()) .altText("Slack file object.")))); diff --git a/block-kit/src/main/java/elements/MultiSelectMenu.java b/block-kit/src/main/java/elements/MultiSelectMenu.java index 048d570..c74010d 100644 --- a/block-kit/src/main/java/elements/MultiSelectMenu.java +++ b/block-kit/src/main/java/elements/MultiSelectMenu.java @@ -1,10 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.element.BlockElements; import java.util.List; @@ -19,20 +17,20 @@ public class MultiSelectMenu { */ public static SectionBlock example01() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick items from the list")) + .text(BlockCompositions.markdownText("Pick items from the list")) .accessory(BlockElements.multiStaticSelect(m -> m.actionId("text1234") - .placeholder(plainText("Select items")) + .placeholder(BlockCompositions.plainText("Select items")) .options(List.of( OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-0") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-1") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-2") .build()))))); return block; @@ -43,9 +41,9 @@ public static SectionBlock example01() { */ public static SectionBlock example02() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick items from the list")) + .text(BlockCompositions.markdownText("Pick items from the list")) .accessory(BlockElements.multiExternalSelect(m -> m.actionId("text1234") - .placeholder(plainText("Select items")) + .placeholder(BlockCompositions.plainText("Select items")) .minQueryLength(3)))); return block; } @@ -55,9 +53,9 @@ public static SectionBlock example02() { */ public static SectionBlock example03() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick users from the list")) + .text(BlockCompositions.markdownText("Pick users from the list")) .accessory(BlockElements.multiUsersSelect( - m -> m.actionId("text1234").placeholder(plainText("Select users"))))); + m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select users"))))); return block; } @@ -66,9 +64,9 @@ public static SectionBlock example03() { */ public static SectionBlock example04() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick conversations from the list")) + .text(BlockCompositions.markdownText("Pick conversations from the list")) .accessory(BlockElements.multiConversationsSelect( - m -> m.actionId("text1234").placeholder(plainText("Select conversations"))))); + m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select conversations"))))); return block; } @@ -77,9 +75,9 @@ public static SectionBlock example04() { */ public static SectionBlock example05() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick channels from the list")) + .text(BlockCompositions.markdownText("Pick channels from the list")) .accessory(BlockElements.multiChannelsSelect( - m -> m.actionId("text1234").placeholder(plainText("Select channels"))))); + m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select channels"))))); return block; } } diff --git a/block-kit/src/main/java/elements/NumberInput.java b/block-kit/src/main/java/elements/NumberInput.java index 6beda5e..0719870 100644 --- a/block-kit/src/main/java/elements/NumberInput.java +++ b/block-kit/src/main/java/elements/NumberInput.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.InputBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; /** @@ -17,7 +16,7 @@ public class NumberInput { public static InputBlock example01() { InputBlock block = Blocks.input(i -> i.element( BlockElements.numberInput(n -> n.decimalAllowed(false).actionId("number_input-action"))) - .label(plainText(pt -> pt.text("Label").emoji(true)))); + .label(BlockCompositions.plainText(pt -> pt.text("Label").emoji(true)))); return block; } } diff --git a/block-kit/src/main/java/elements/OverflowMenu.java b/block-kit/src/main/java/elements/OverflowMenu.java index 82edc31..7ab0d48 100644 --- a/block-kit/src/main/java/elements/OverflowMenu.java +++ b/block-kit/src/main/java/elements/OverflowMenu.java @@ -1,10 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.element.BlockElements; import java.util.List; @@ -19,27 +17,27 @@ public class OverflowMenu { */ public static SectionBlock example01() { SectionBlock block = Blocks.section(s -> s.blockId("section 890") - .text(markdownText("This is a section block with an overflow menu.")) + .text(BlockCompositions.markdownText("This is a section block with an overflow menu.")) .accessory(BlockElements.overflowMenu(o -> o.actionId("overflow") .options(List.of( OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-0") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-1") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-2") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-3") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-4") .build()))))); return block; diff --git a/block-kit/src/main/java/elements/PlainTextInput.java b/block-kit/src/main/java/elements/PlainTextInput.java index ffe0fba..9c5fea2 100644 --- a/block-kit/src/main/java/elements/PlainTextInput.java +++ b/block-kit/src/main/java/elements/PlainTextInput.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.InputBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; /** @@ -17,7 +16,7 @@ public class PlainTextInput { public static InputBlock example01() { InputBlock block = Blocks.input(i -> i.element(BlockElements.plainTextInput(pt -> pt.actionId("plain_text_input-action"))) - .label(plainText(l -> l.text("Label").emoji(true)))); + .label(BlockCompositions.plainText(l -> l.text("Label").emoji(true)))); return block; } } diff --git a/block-kit/src/main/java/elements/RadioButtons.java b/block-kit/src/main/java/elements/RadioButtons.java index 7737774..d417019 100644 --- a/block-kit/src/main/java/elements/RadioButtons.java +++ b/block-kit/src/main/java/elements/RadioButtons.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.element.BlockElements; import java.util.List; @@ -17,21 +16,22 @@ public class RadioButtons { * A section block with a radio buttons accessory. */ public static SectionBlock example01() { - SectionBlock block = Blocks.section(s -> s.text(plainText("Check out these rad radio buttons")) - .accessory(BlockElements.radioButtons(r -> r.actionId("this_is_an_action_id") - .initialOption(OptionObject.builder() - .value("A1") - .text(plainText("Radio 1")) - .build()) - .options(List.of( - OptionObject.builder() + SectionBlock block = + Blocks.section(s -> s.text(BlockCompositions.plainText("Check out these rad radio buttons")) + .accessory(BlockElements.radioButtons(r -> r.actionId("this_is_an_action_id") + .initialOption(OptionObject.builder() .value("A1") - .text(plainText("Radio 1")) - .build(), - OptionObject.builder() - .value("A2") - .text(plainText("Radio 2")) - .build()))))); + .text(BlockCompositions.plainText("Radio 1")) + .build()) + .options(List.of( + OptionObject.builder() + .value("A1") + .text(BlockCompositions.plainText("Radio 1")) + .build(), + OptionObject.builder() + .value("A2") + .text(BlockCompositions.plainText("Radio 2")) + .build()))))); return block; } } diff --git a/block-kit/src/main/java/elements/RichTextInput.java b/block-kit/src/main/java/elements/RichTextInput.java index 557164c..87a4630 100644 --- a/block-kit/src/main/java/elements/RichTextInput.java +++ b/block-kit/src/main/java/elements/RichTextInput.java @@ -1,8 +1,7 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.DispatchActionConfig; import com.slack.api.model.block.element.BlockElements; import com.slack.api.model.view.View; @@ -25,8 +24,8 @@ public static View example01() { .triggerActionsOn(List.of("on_character_entered")) .build()) .focusOnLoad(true) - .placeholder(plainText("Enter text")))) - .label(plainText(l -> l.text("Label").emoji(true))))))); + .placeholder(BlockCompositions.plainText("Enter text")))) + .label(BlockCompositions.plainText(l -> l.text("Label").emoji(true))))))); return view; } } diff --git a/block-kit/src/main/java/elements/SelectMenu.java b/block-kit/src/main/java/elements/SelectMenu.java index cae91e4..2115313 100644 --- a/block-kit/src/main/java/elements/SelectMenu.java +++ b/block-kit/src/main/java/elements/SelectMenu.java @@ -1,10 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.element.BlockElements; import java.util.List; @@ -19,20 +17,20 @@ public class SelectMenu { */ public static SectionBlock example01() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick an item from the dropdown list")) + .text(BlockCompositions.markdownText("Pick an item from the dropdown list")) .accessory(BlockElements.staticSelect(m -> m.actionId("text1234") - .placeholder(plainText("Select an item")) + .placeholder(BlockCompositions.plainText("Select an item")) .options(List.of( OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-0") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-1") .build(), OptionObject.builder() - .text(plainText("*this is plain_text text*")) + .text(BlockCompositions.plainText("*this is plain_text text*")) .value("value-2") .build()))))); return block; @@ -43,9 +41,9 @@ public static SectionBlock example01() { */ public static SectionBlock example02() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick an item from the dropdown list")) + .text(BlockCompositions.markdownText("Pick an item from the dropdown list")) .accessory(BlockElements.externalSelect(m -> m.actionId("text1234") - .placeholder(plainText("Select an item")) + .placeholder(BlockCompositions.plainText("Select an item")) .minQueryLength(3)))); return block; } @@ -55,9 +53,9 @@ public static SectionBlock example02() { */ public static SectionBlock example03() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick a user from the dropdown list")) + .text(BlockCompositions.markdownText("Pick a user from the dropdown list")) .accessory(BlockElements.usersSelect( - m -> m.actionId("text1234").placeholder(plainText("Select an item"))))); + m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select an item"))))); return block; } @@ -66,9 +64,9 @@ public static SectionBlock example03() { */ public static SectionBlock example04() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick a conversation from the dropdown list")) + .text(BlockCompositions.markdownText("Pick a conversation from the dropdown list")) .accessory(BlockElements.conversationsSelect( - m -> m.actionId("text1234").placeholder(plainText("Select an item"))))); + m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select an item"))))); return block; } @@ -77,9 +75,9 @@ public static SectionBlock example04() { */ public static SectionBlock example05() { SectionBlock block = Blocks.section(s -> s.blockId("section678") - .text(markdownText("Pick a channel from the dropdown list")) + .text(BlockCompositions.markdownText("Pick a channel from the dropdown list")) .accessory(BlockElements.channelsSelect( - m -> m.actionId("text1234").placeholder(plainText("Select an item"))))); + m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select an item"))))); return block; } } diff --git a/block-kit/src/main/java/elements/TimePicker.java b/block-kit/src/main/java/elements/TimePicker.java index be058c7..ce68638 100644 --- a/block-kit/src/main/java/elements/TimePicker.java +++ b/block-kit/src/main/java/elements/TimePicker.java @@ -1,10 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; /** @@ -17,11 +15,11 @@ public class TimePicker { */ public static SectionBlock example01() { SectionBlock block = Blocks.section(s -> s.blockId("section1234") - .text(markdownText("Pick a date for the deadline.")) + .text(BlockCompositions.markdownText("Pick a date for the deadline.")) .accessory(BlockElements.timePicker(t -> t.timezone("America/Los_Angeles") .actionId("timepicker123") .initialTime("11:40") - .placeholder(plainText("Select a time"))))); + .placeholder(BlockCompositions.plainText("Select a time"))))); return block; } } diff --git a/block-kit/src/main/java/elements/UrlInput.java b/block-kit/src/main/java/elements/UrlInput.java index cbdeef4..5d850ed 100644 --- a/block-kit/src/main/java/elements/UrlInput.java +++ b/block-kit/src/main/java/elements/UrlInput.java @@ -1,9 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.InputBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.element.BlockElements; /** @@ -15,9 +14,9 @@ public class UrlInput { * An input block with a URL input element. */ public static InputBlock example01() { - InputBlock block = - Blocks.input(i -> i.element(BlockElements.urlTextInput(u -> u.actionId("url_text_input-action"))) - .label(plainText(pt -> pt.text("Label").emoji(true)))); + InputBlock block = Blocks.input(i -> i.element( + BlockElements.urlTextInput(u -> u.actionId("url_text_input-action"))) + .label(BlockCompositions.plainText(pt -> pt.text("Label").emoji(true)))); return block; } } diff --git a/block-kit/src/main/java/elements/WorkflowButton.java b/block-kit/src/main/java/elements/WorkflowButton.java index 6a3c192..f0273d1 100644 --- a/block-kit/src/main/java/elements/WorkflowButton.java +++ b/block-kit/src/main/java/elements/WorkflowButton.java @@ -1,10 +1,8 @@ package elements; -import static com.slack.api.model.block.composition.BlockCompositions.markdownText; -import static com.slack.api.model.block.composition.BlockCompositions.plainText; - import com.slack.api.model.block.Blocks; import com.slack.api.model.block.SectionBlock; +import com.slack.api.model.block.composition.BlockCompositions; import com.slack.api.model.block.composition.WorkflowObject; import com.slack.api.model.block.element.BlockElements; import java.util.List; @@ -18,24 +16,24 @@ public class WorkflowButton { * A section block containing a workflow button element. */ public static SectionBlock example01() { - SectionBlock block = - Blocks.section(s -> s.text(markdownText("A message *with some bold text* and _some italicized text_.")) - .accessory(BlockElements.workflowButton(w -> w.text(plainText("Run Workflow")) - .actionId("workflowbutton123") - .workflow(WorkflowObject.builder() - .trigger(WorkflowObject.Trigger.builder() - .url("https://slack.com/shortcuts/Ft0123ABC456/xyz...zyx") - .customizableInputParameters(List.of( - WorkflowObject.Trigger.InputParameter.builder() - .name("input_parameter_a") - .value("Value for input param A") - .build(), - WorkflowObject.Trigger.InputParameter.builder() - .name("input_parameter_b") - .value("Value for input param B") - .build())) - .build()) - .build())))); + SectionBlock block = Blocks.section(s -> s.text( + BlockCompositions.markdownText("A message *with some bold text* and _some italicized text_.")) + .accessory(BlockElements.workflowButton(w -> w.text(BlockCompositions.plainText("Run Workflow")) + .actionId("workflowbutton123") + .workflow(WorkflowObject.builder() + .trigger(WorkflowObject.Trigger.builder() + .url("https://slack.com/shortcuts/Ft0123ABC456/xyz...zyx") + .customizableInputParameters(List.of( + WorkflowObject.Trigger.InputParameter.builder() + .name("input_parameter_a") + .value("Value for input param A") + .build(), + WorkflowObject.Trigger.InputParameter.builder() + .name("input_parameter_b") + .value("Value for input param B") + .build())) + .build()) + .build())))); return block; } }