diff options
-rwxr-xr-x | src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java | 2 | ||||
-rw-r--r-- | src/main/java/com/mavlushechka/animarfo/telegram/user/keyboard/UserKeyboard.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java index c66bbfa..6c219b9 100755 --- a/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java +++ b/src/main/java/com/mavlushechka/animarfo/telegram/user/callbackquery/UsersCallbackQuery.java @@ -44,7 +44,7 @@ public class UsersCallbackQuery { Anime[] anime = Anime.list; byte index = Anime.index; Keyboard anidub = UserKeyboard.getAnidub(); - if (UserKeyboard.seriesSize > 0) { + if (UserKeyboard.size > 0) { Bot.TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(anidub)); } else { Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я не смог найти серии для этого аниме... :(")); 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 8ceed57..d10daa6 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,6 +14,8 @@ import java.io.IOException; import java.util.ArrayList; public class UserKeyboard { + public static short size; + public static Keyboard getMain() { return new ReplyKeyboardMarkup( new String[]{"Поиск", "Онгоинги"}, @@ -56,15 +58,16 @@ public class UserKeyboard { series.add(Jsoup.parse(String.valueOf(seriesTemp)).text()); } - for (int i = 0; i < series.size(); i++) { - if (i + 2 < series.size()) { + size = (short) series.size(); + for (int i = 0; i < size; i++) { + if (i + 2 < 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)) ); i += 2; - } else if (i + 1 < series.size()) { + } else if (i + 1 < size) { inlineKeyboardMarkup.addRow( new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)), new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1)) |