summaryrefslogtreecommitdiff
path: root/src/main/java/files/MyKeyboard.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/files/MyKeyboard.java')
-rw-r--r--src/main/java/files/MyKeyboard.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/files/MyKeyboard.java b/src/main/java/files/MyKeyboard.java
index 6212542..060ceb5 100644
--- a/src/main/java/files/MyKeyboard.java
+++ b/src/main/java/files/MyKeyboard.java
@@ -12,6 +12,8 @@ import java.io.IOException;
import java.util.ArrayList;
public class MyKeyboard {
+ public static short seriesSize;
+
public static Keyboard getMain() {
return new ReplyKeyboardMarkup(
new String[]{"Поиск аниме"},
@@ -23,11 +25,11 @@ public class MyKeyboard {
.selective(true);
}
- public static Keyboard getCarousel(String typeOfAnime) {
+ public static Keyboard getCarousel() {
InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup();
inlineKeyboardMarkup.addRow(new InlineKeyboardButton("Смотреть / Скачать").callbackData("watchOrDownload"));
- inlineKeyboardMarkup.addRow(new InlineKeyboardButton("Пред.").callbackData("previous" + typeOfAnime), new InlineKeyboardButton("След.").callbackData("next" + typeOfAnime));
+ inlineKeyboardMarkup.addRow(new InlineKeyboardButton("Пред.").callbackData("previous"), new InlineKeyboardButton("След.").callbackData("next"));
return inlineKeyboardMarkup;
}
@@ -40,7 +42,7 @@ public class MyKeyboard {
Anime[] anime = Anime.list;
Anime thisAnime = anime[Anime.indexOfAnime];
- Elements seriesList = Parse.getPage(thisAnime.getUrl()).select("div[class=tabs-b video-box]").next().select("span");
+ Elements seriesList = Parser.getPage(thisAnime.getUrl()).select("div[class=tabs-b video-box]").next().select("span");
ArrayList<String> series = new ArrayList<>();
ArrayList<String> seriesUrls = new ArrayList<>();
@@ -58,15 +60,16 @@ public class MyKeyboard {
}
InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup();
- for (int i = 0; i < series.size(); i++) {
- if (i+2 < series.size()) {
+ seriesSize = (short) series.size();
+ for (int i = 0; i < seriesSize; i++) {
+ if (i+2 < seriesSize) {
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 < seriesSize) {
inlineKeyboardMarkup.addRow(
new InlineKeyboardButton(series.get(i)).url(seriesUrls.get(i)),
new InlineKeyboardButton(series.get(i+1)).url(seriesUrls.get(i+1))