Canteen offers are now grouped; TODO: add a divider to separate different offers. Also, add prices

app/src/main/java/com/denizk0461/studip/adapter/CanteenOfferPageAdapter.kt

@@ -7,8 +7,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.denizk0461.studip.databinding.ItemScrollablePageBinding
 import com.denizk0461.studip.model.CanteenOffer
+import com.denizk0461.studip.model.CanteenOfferGroup
+import com.denizk0461.studip.model.CanteenOfferGroupElement
 
-class CanteenOfferPageAdapter(private var offers: List<CanteenOffer>, private var daysCovered: Int, private var prefsRegex: Regex) : RecyclerView.Adapter<CanteenOfferPageAdapter.CanteenOfferPageViewHolder>() {
+class CanteenOfferPageAdapter(private var offers: List<CanteenOfferGroup>, private var daysCovered: Int, private var prefsRegex: Regex) : RecyclerView.Adapter<CanteenOfferPageAdapter.CanteenOfferPageViewHolder>() {
 
     class CanteenOfferPageViewHolder(val binding: ItemScrollablePageBinding) : RecyclerView.ViewHolder(binding.root)
 
@@ -31,30 +33,19 @@ class CanteenOfferPageAdapter(private var offers: List<CanteenOffer>, private va
 
             // TODO second filter needs to be worked on; it shouldn't filter out something if two options are selected and only one is met
 //            Log.d("eek!5", prefsRegex.toString())
-            val filteredForDate = offers.filter { it.dateId == position }
 
-            val filteredForPreferences = if (prefsRegex.toString() == "ffffffffff") {
-                // show all elements and skip filtering
-                filteredForDate
-            } else {
-                filteredForDate.filter {
-                    Log.d("eek!5", "${it.title}: - ${prefsRegex} vs ${it.dietaryPreferences}")
-                    prefsRegex.matches(it.dietaryPreferences)
-                }
-            }
 //                .filter { it.dietaryPreferences == prefs.deconstruct() }
 
 //            val filtered2 = filtered
 //            offers
 
 
-
-            adapter = CanteenOfferItemAdapter(filteredForPreferences) // TODO check if empty
+            adapter = CanteenOfferItemAdapter(offers.filter { it.dateId == position }) // TODO check if empty
             scheduleLayoutAnimation()
         }
     }
 
-    fun setNewItems(items: List<CanteenOffer>, daysCovered: Int) {
+    fun setNewItems(items: List<CanteenOfferGroup>, daysCovered: Int) {
         this.daysCovered = daysCovered
         offers = items
         notifyDataSetChanged()