Skip to content

Commit e16b87e

Browse files
zimegzimeg
authored
refactor(block-kit): inline BlockCompositions calls in element examples (#75)
1 parent 153822e commit e16b87e

18 files changed

Lines changed: 123 additions & 143 deletions

‎block-kit/src/main/java/elements/Button.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.markdownText;
4-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
5-
63
import com.slack.api.model.block.Blocks;
74
import com.slack.api.model.block.LayoutBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
86
import com.slack.api.model.block.element.BlockElements;
97
import com.slack.api.model.block.element.ButtonElement;
108
import java.util.List;
@@ -18,26 +16,29 @@ public class Button {
1816
* A regular interactive button.
1917
*/
2018
public static ButtonElement example01() {
21-
ButtonElement element = BlockElements.button(
22-
b -> b.text(plainText("Click Me")).value("click_me_123").actionId("button"));
19+
ButtonElement element = BlockElements.button(b -> b.text(BlockCompositions.plainText("Click Me"))
20+
.value("click_me_123")
21+
.actionId("button"));
2322
return element;
2423
}
2524

2625
/**
2726
* A button with a primary style attribute.
2827
*/
2928
public static ButtonElement example02() {
30-
ButtonElement element = BlockElements.button(b ->
31-
b.text(plainText("Save")).style("primary").value("click_me_123").actionId("button"));
29+
ButtonElement element = BlockElements.button(b -> b.text(BlockCompositions.plainText("Save"))
30+
.style("primary")
31+
.value("click_me_123")
32+
.actionId("button"));
3233
return element;
3334
}
3435

3536
/**
3637
* A link button.
3738
*/
3839
public static ButtonElement example03() {
39-
ButtonElement element =
40-
BlockElements.button(b -> b.text(plainText("Link Button")).url("https://docs.slack.dev/block-kit"));
40+
ButtonElement element = BlockElements.button(
41+
b -> b.text(BlockCompositions.plainText("Link Button")).url("https://docs.slack.dev/block-kit"));
4142
return element;
4243
}
4344

@@ -46,17 +47,17 @@ public static ButtonElement example03() {
4647
*/
4748
public static List<LayoutBlock> example05() {
4849
List<LayoutBlock> blocks = List.of(
49-
Blocks.section(s -> s.text(markdownText("This is a section block with a button."))
50-
.accessory(BlockElements.button(b -> b.text(plainText("Click Me"))
50+
Blocks.section(s -> s.text(BlockCompositions.markdownText("This is a section block with a button."))
51+
.accessory(BlockElements.button(b -> b.text(BlockCompositions.plainText("Click Me"))
5152
.value("click_me_123")
5253
.actionId("button")))),
5354
Blocks.actions(a -> a.blockId("actionblock789")
5455
.elements(List.of(
55-
BlockElements.button(b -> b.text(plainText("Primary Button"))
56+
BlockElements.button(b -> b.text(BlockCompositions.plainText("Primary Button"))
5657
.style("primary")
5758
.value("click_me_456")),
58-
BlockElements.button(b ->
59-
b.text(plainText("Link Button")).url("https://api.slack.com/block-kit"))))));
59+
BlockElements.button(b -> b.text(BlockCompositions.plainText("Link Button"))
60+
.url("https://api.slack.com/block-kit"))))));
6061
return blocks;
6162
}
6263
}

‎block-kit/src/main/java/elements/DatePicker.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.markdownText;
4-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
5-
63
import com.slack.api.model.block.Blocks;
74
import com.slack.api.model.block.SectionBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
86
import com.slack.api.model.block.element.BlockElements;
97

108
/**
@@ -17,10 +15,10 @@ public class DatePicker {
1715
*/
1816
public static SectionBlock example01() {
1917
SectionBlock block = Blocks.section(s -> s.blockId("section1234")
20-
.text(markdownText("Pick a date for the deadline."))
18+
.text(BlockCompositions.markdownText("Pick a date for the deadline."))
2119
.accessory(BlockElements.datePicker(d -> d.actionId("datepicker123")
2220
.initialDate("1990-04-28")
23-
.placeholder(plainText("Select a date")))));
21+
.placeholder(BlockCompositions.plainText("Select a date")))));
2422
return block;
2523
}
2624
}

‎block-kit/src/main/java/elements/DatetimePicker.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
4-
53
import com.slack.api.model.block.Blocks;
64
import com.slack.api.model.block.InputBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
76
import com.slack.api.model.block.element.BlockElements;
87

98
/**
@@ -15,10 +14,11 @@ public class DatetimePicker {
1514
* An input block with a datetime picker element.
1615
*/
1716
public static InputBlock example01() {
18-
InputBlock block =
19-
Blocks.input(i -> i.element(BlockElements.datetimePicker(d -> d.actionId("datetimepicker-action")))
20-
.hint(plainText(pt -> pt.text("This is some hint text").emoji(true)))
21-
.label(plainText(pt -> pt.text("Start date").emoji(true))));
17+
InputBlock block = Blocks.input(i -> i.element(
18+
BlockElements.datetimePicker(d -> d.actionId("datetimepicker-action")))
19+
.hint(BlockCompositions.plainText(
20+
pt -> pt.text("This is some hint text").emoji(true)))
21+
.label(BlockCompositions.plainText(pt -> pt.text("Start date").emoji(true))));
2222
return block;
2323
}
2424
}

‎block-kit/src/main/java/elements/EmailInput.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
4-
53
import com.slack.api.model.block.Blocks;
64
import com.slack.api.model.block.InputBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
76
import com.slack.api.model.block.element.BlockElements;
87

98
/**
@@ -16,9 +15,9 @@ public class EmailInput {
1615
*/
1716
public static InputBlock example01() {
1817
InputBlock block = Blocks.input(i -> i.blockId("input123")
19-
.label(plainText("Email Address"))
20-
.element(BlockElements.emailTextInput(
21-
e -> e.actionId("email_text_input-action").placeholder(plainText("Enter an email")))));
18+
.label(BlockCompositions.plainText("Email Address"))
19+
.element(BlockElements.emailTextInput(e -> e.actionId("email_text_input-action")
20+
.placeholder(BlockCompositions.plainText("Enter an email")))));
2221
return block;
2322
}
2423
}

‎block-kit/src/main/java/elements/FeedbackButtons.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
4-
53
import com.slack.api.model.block.Blocks;
64
import com.slack.api.model.block.ContextActionsBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
76
import com.slack.api.model.block.composition.FeedbackButtonObject;
87
import com.slack.api.model.block.element.BlockElements;
98
import java.util.List;
@@ -20,12 +19,12 @@ public static ContextActionsBlock example01() {
2019
ContextActionsBlock block =
2120
Blocks.contextActions(List.of(BlockElements.feedbackButtons(fb -> fb.actionId("feedback_buttons_1")
2221
.positiveButton(FeedbackButtonObject.builder()
23-
.text(plainText("Good"))
22+
.text(BlockCompositions.plainText("Good"))
2423
.value("positive_feedback")
2524
.accessibilityLabel("Mark this response as good")
2625
.build())
2726
.negativeButton(FeedbackButtonObject.builder()
28-
.text(plainText("Bad"))
27+
.text(BlockCompositions.plainText("Bad"))
2928
.value("negative_feedback")
3029
.accessibilityLabel("Mark this response as bad")
3130
.build()))));

‎block-kit/src/main/java/elements/FileInput.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
4-
53
import com.slack.api.model.block.Blocks;
4+
import com.slack.api.model.block.composition.BlockCompositions;
65
import com.slack.api.model.block.element.BlockElements;
76
import com.slack.api.model.view.View;
87
import com.slack.api.model.view.Views;
@@ -23,7 +22,7 @@ public static View example01() {
2322
s -> s.type("plain_text").text("Submit").emoji(true)))
2423
.close(Views.viewClose(c -> c.type("plain_text").text("Cancel").emoji(true)))
2524
.blocks(List.of(Blocks.input(i -> i.blockId("input_block_id")
26-
.label(plainText("Upload Files"))
25+
.label(BlockCompositions.plainText("Upload Files"))
2726
.element(BlockElements.fileInput(f -> f.actionId("file_input_action_id_1")
2827
.filetypes(List.of("jpg", "png"))
2928
.maxFiles(5)))))));

‎block-kit/src/main/java/elements/IconButton.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
4-
53
import com.slack.api.model.block.Blocks;
64
import com.slack.api.model.block.ContextActionsBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
76
import com.slack.api.model.block.element.BlockElements;
87
import java.util.List;
98

@@ -17,7 +16,7 @@ public class IconButton {
1716
*/
1817
public static ContextActionsBlock example01() {
1918
ContextActionsBlock block = Blocks.contextActions(List.of(BlockElements.iconButton(ib -> ib.icon("trash")
20-
.text(plainText("Delete"))
19+
.text(BlockCompositions.plainText("Delete"))
2120
.actionId("delete_button")
2221
.value("delete_item"))));
2322
return block;

‎block-kit/src/main/java/elements/Image.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.markdownText;
4-
53
import com.slack.api.model.block.Blocks;
64
import com.slack.api.model.block.SectionBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
76
import com.slack.api.model.block.composition.SlackFileObject;
87
import com.slack.api.model.block.element.BlockElements;
98

@@ -17,7 +16,7 @@ public class Image {
1716
*/
1817
public static SectionBlock example01() {
1918
SectionBlock block = Blocks.section(s -> s.blockId("section567")
20-
.text(markdownText("This is a section block with an accessory image."))
19+
.text(BlockCompositions.markdownText("This is a section block with an accessory image."))
2120
.accessory(BlockElements.image(
2221
i -> i.imageUrl("https://pbs.twimg.com/profile_images/625633822235693056/lNGUneLX_400x400.jpg")
2322
.altText("cute cat"))));
@@ -29,7 +28,7 @@ public static SectionBlock example01() {
2928
*/
3029
public static SectionBlock example02() {
3130
SectionBlock block = Blocks.section(s -> s.blockId("section567")
32-
.text(markdownText("This is a section block with an accessory image."))
31+
.text(BlockCompositions.markdownText("This is a section block with an accessory image."))
3332
.accessory(BlockElements.image(i -> i.slackFile(SlackFileObject.builder()
3433
.url("https://files.slack.com/files-pri/T0123456-F0123456/xyz.png")
3534
.build())
@@ -42,7 +41,7 @@ public static SectionBlock example02() {
4241
*/
4342
public static SectionBlock example03() {
4443
SectionBlock block = Blocks.section(s -> s.blockId("section567")
45-
.text(markdownText("This is a section block with an accessory image."))
44+
.text(BlockCompositions.markdownText("This is a section block with an accessory image."))
4645
.accessory(BlockElements.image(i -> i.slackFile(
4746
SlackFileObject.builder().id("F01234567").build())
4847
.altText("Slack file object."))));

‎block-kit/src/main/java/elements/MultiSelectMenu.java‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.markdownText;
4-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
5-
63
import com.slack.api.model.block.Blocks;
74
import com.slack.api.model.block.SectionBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
86
import com.slack.api.model.block.composition.OptionObject;
97
import com.slack.api.model.block.element.BlockElements;
108
import java.util.List;
@@ -19,20 +17,20 @@ public class MultiSelectMenu {
1917
*/
2018
public static SectionBlock example01() {
2119
SectionBlock block = Blocks.section(s -> s.blockId("section678")
22-
.text(markdownText("Pick items from the list"))
20+
.text(BlockCompositions.markdownText("Pick items from the list"))
2321
.accessory(BlockElements.multiStaticSelect(m -> m.actionId("text1234")
24-
.placeholder(plainText("Select items"))
22+
.placeholder(BlockCompositions.plainText("Select items"))
2523
.options(List.of(
2624
OptionObject.builder()
27-
.text(plainText("*this is plain_text text*"))
25+
.text(BlockCompositions.plainText("*this is plain_text text*"))
2826
.value("value-0")
2927
.build(),
3028
OptionObject.builder()
31-
.text(plainText("*this is plain_text text*"))
29+
.text(BlockCompositions.plainText("*this is plain_text text*"))
3230
.value("value-1")
3331
.build(),
3432
OptionObject.builder()
35-
.text(plainText("*this is plain_text text*"))
33+
.text(BlockCompositions.plainText("*this is plain_text text*"))
3634
.value("value-2")
3735
.build())))));
3836
return block;
@@ -43,9 +41,9 @@ public static SectionBlock example01() {
4341
*/
4442
public static SectionBlock example02() {
4543
SectionBlock block = Blocks.section(s -> s.blockId("section678")
46-
.text(markdownText("Pick items from the list"))
44+
.text(BlockCompositions.markdownText("Pick items from the list"))
4745
.accessory(BlockElements.multiExternalSelect(m -> m.actionId("text1234")
48-
.placeholder(plainText("Select items"))
46+
.placeholder(BlockCompositions.plainText("Select items"))
4947
.minQueryLength(3))));
5048
return block;
5149
}
@@ -55,9 +53,9 @@ public static SectionBlock example02() {
5553
*/
5654
public static SectionBlock example03() {
5755
SectionBlock block = Blocks.section(s -> s.blockId("section678")
58-
.text(markdownText("Pick users from the list"))
56+
.text(BlockCompositions.markdownText("Pick users from the list"))
5957
.accessory(BlockElements.multiUsersSelect(
60-
m -> m.actionId("text1234").placeholder(plainText("Select users")))));
58+
m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select users")))));
6159
return block;
6260
}
6361

@@ -66,9 +64,9 @@ public static SectionBlock example03() {
6664
*/
6765
public static SectionBlock example04() {
6866
SectionBlock block = Blocks.section(s -> s.blockId("section678")
69-
.text(markdownText("Pick conversations from the list"))
67+
.text(BlockCompositions.markdownText("Pick conversations from the list"))
7068
.accessory(BlockElements.multiConversationsSelect(
71-
m -> m.actionId("text1234").placeholder(plainText("Select conversations")))));
69+
m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select conversations")))));
7270
return block;
7371
}
7472

@@ -77,9 +75,9 @@ public static SectionBlock example04() {
7775
*/
7876
public static SectionBlock example05() {
7977
SectionBlock block = Blocks.section(s -> s.blockId("section678")
80-
.text(markdownText("Pick channels from the list"))
78+
.text(BlockCompositions.markdownText("Pick channels from the list"))
8179
.accessory(BlockElements.multiChannelsSelect(
82-
m -> m.actionId("text1234").placeholder(plainText("Select channels")))));
80+
m -> m.actionId("text1234").placeholder(BlockCompositions.plainText("Select channels")))));
8381
return block;
8482
}
8583
}

‎block-kit/src/main/java/elements/NumberInput.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package elements;
22

3-
import static com.slack.api.model.block.composition.BlockCompositions.plainText;
4-
53
import com.slack.api.model.block.Blocks;
64
import com.slack.api.model.block.InputBlock;
5+
import com.slack.api.model.block.composition.BlockCompositions;
76
import com.slack.api.model.block.element.BlockElements;
87

98
/**
@@ -17,7 +16,7 @@ public class NumberInput {
1716
public static InputBlock example01() {
1817
InputBlock block = Blocks.input(i -> i.element(
1918
BlockElements.numberInput(n -> n.decimalAllowed(false).actionId("number_input-action")))
20-
.label(plainText(pt -> pt.text("Label").emoji(true))));
19+
.label(BlockCompositions.plainText(pt -> pt.text("Label").emoji(true))));
2120
return block;
2221
}
2322
}

0 commit comments

Comments
 (0)