From 56cdc4c5ee9c23667f800ea51fdf70c36346061b Mon Sep 17 00:00:00 2001 From: denizk0461 Date: Mon, 17 Apr 2023 14:32:07 +0200 Subject: [PATCH] Canteen name will now be fetched as well; fixed an error that displayed the offers of the next day in CanteenFragment.kt --- .../studip/adapter/CanteenOfferPageAdapter.kt | 2 +- .../main/java/com/denizk0461/studip/data/StwParser.kt | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/denizk0461/studip/adapter/CanteenOfferPageAdapter.kt b/app/src/main/java/com/denizk0461/studip/adapter/CanteenOfferPageAdapter.kt index 3def8fc..d342a7a 100644 --- a/app/src/main/java/com/denizk0461/studip/adapter/CanteenOfferPageAdapter.kt +++ b/app/src/main/java/com/denizk0461/studip/adapter/CanteenOfferPageAdapter.kt @@ -28,7 +28,7 @@ class CanteenOfferPageAdapter(private var offers: List, private va layoutManager = LinearLayoutManager(holder.binding.root.context, LinearLayoutManager.VERTICAL, false) - val filtered = offers.filter { it.dateId == position + 1 } + val filtered = offers.filter { it.dateId == position } adapter = CanteenOfferItemAdapter(filtered) // TODO check if empty scheduleLayoutAnimation() } diff --git a/app/src/main/java/com/denizk0461/studip/data/StwParser.kt b/app/src/main/java/com/denizk0461/studip/data/StwParser.kt index f4f1923..c40a3c6 100644 --- a/app/src/main/java/com/denizk0461/studip/data/StwParser.kt +++ b/app/src/main/java/com/denizk0461/studip/data/StwParser.kt @@ -1,5 +1,6 @@ package com.denizk0461.studip.data +import android.util.Log import com.denizk0461.studip.db.EventRepository import com.denizk0461.studip.model.* import org.jsoup.Jsoup @@ -46,8 +47,10 @@ class StwParser { dateId = 0 val doc = Jsoup.connect(url).get() + val t = doc.getElementsByClass("pane-title")[1].text() - repo.insert(OfferCanteen(canteenId, "TEMP")) // TODO canteen name + repo.insert(OfferCanteen(canteenId, t)) // TODO canteen name + Log.d("eek!3", t) // STEP: get each day doc.getElementsByClass("food-plan").forEach { dayPlan -> @@ -126,7 +129,10 @@ class StwParser { getElementsByAttributeValue("src", preference).isNotEmpty() private fun Element.getFilteredText(): String { - var text = html().replace("&", "&") + var text = html() + .replace("&", "&") + .replace(">", ">") + .replace("<", "<") while (text.contains("")) { text = text.substring(0 until text.indexOf("")) + text.substring(text.indexOf("")+6 until text.length)