From b648d1a95ce721c5401383ba409a2b06ef72c86d Mon Sep 17 00:00:00 2001 From: Mavlushechka Date: Sun, 30 Jan 2022 22:11:37 +0500 Subject: Remove seriesSize field --- .../telegram/user/keyboard/UserKeyboard.java | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/mavlushechka/animarfo/telegram/user/keyboard/UserKeyboard.java b/src/main/java/com/mavlushechka/animarfo/telegram/user/keyboard/UserKeyboard.java index 5b43f25..cb6d2af 100644 --- a/src/main/java/com/mavlushechka/animarfo/telegram/user/keyboard/UserKeyboard.java +++ b/src/main/java/com/mavlushechka/animarfo/telegram/user/keyboard/UserKeyboard.java @@ -14,8 +14,6 @@ import java.io.IOException; import java.util.ArrayList; public class UserKeyboard { - public static short seriesSize; - public static Keyboard getMain() { return new ReplyKeyboardMarkup( new String[]{"Поиск", "Онгоинги"}, @@ -60,25 +58,23 @@ public class UserKeyboard { seriesUrls.add(String.valueOf(dst)); } - InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup(); - seriesSize = (short) series.size(); - for (int i = 0; i < seriesSize; i++) { - if (i+2 < seriesSize) { + for (int i = 0; i < series.size(); i++) { + if (i + 2 < series.size()) { inlineKeyboardMarkup.addRow( - new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), - new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)), - new InlineKeyboardButton(series.get(i+2)).url(seriesUrls.get(i+2)) + new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), + new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)), + new InlineKeyboardButton(series.get(i+2)).url(seriesUrls.get(i+2)) ); i += 2; - } else if (i+1 < seriesSize) { + } else if (i + 1 < series.size()) { inlineKeyboardMarkup.addRow( - new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), - new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)) + new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), + new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)) ); i++; } else { inlineKeyboardMarkup.addRow( - new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)) + new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)) ); } } -- cgit v1.2.3