Canteen items are now individually clickable to signal that they are separate items; BUG: filtering does not work anymore

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

@@ -38,7 +38,8 @@ class CanteenOfferItemAdapter(private val offers: List<CanteenOfferGroup>) : Rec
                 LayoutInflater.from(holder.binding.root.context),
             )
 
-            line.content.text = offer.title
+            line.textContent.text = offer.title
+            line.textPrice.text = offer.price
             val indices = arrayListOf<Int>()
             offer.dietaryPreferences.filterIndexed { index, char ->
                 if (char == 't') {

app/src/main/java/com/denizk0461/studip/fragment/CanteenFragment.kt

@@ -127,8 +127,6 @@ class CanteenFragment : Fragment() {
 
         val prefsRegex = getPrefRegex()
 
-
-
         val filteredForPreferences = if (prefsRegex.toString() == "ffffffffff") {
             // show all elements and skip filtering
             this
@@ -139,13 +137,13 @@ class CanteenFragment : Fragment() {
             }
         }
 
-        val a = filteredForPreferences.map {
-            CanteenOfferGroupElement(
-                it.title,
-                it.price,
-                it.dietaryPreferences,
-            )
-        }
+//        val a = filteredForPreferences.map {
+//            CanteenOfferGroupElement(
+//                it.title,
+//                it.price,
+//                it.dietaryPreferences,
+//            )
+//        }
         val b = filteredForPreferences.map { offer ->
             CanteenOfferGroup(
                 offer.date,

app/src/main/res/layout/fragment_settings.xml

@@ -156,10 +156,10 @@
                 <!-- App version -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/button_app_version"
-                    android:background="@drawable/layout_ripple"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
+                    android:background="@drawable/layout_ripple"
                     android:clickable="true"
                     android:focusable="true"
                     android:paddingHorizontal="16dp"

app/src/main/res/layout/item_canteen.xml

@@ -15,8 +15,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp">
+            android:layout_height="wrap_content">
+<!--            android:padding="16dp"-->
 
             <TextView
                 android:id="@+id/text_category"
@@ -26,7 +26,9 @@
                 android:fontFamily="@font/lato_bolditalic"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginTop="16dp"
+                android:layout_marginHorizontal="16dp"/>
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/line_container"
@@ -37,7 +39,8 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:orientation="vertical"
-                android:layout_marginTop="8dp">
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="16dp">
 
 <!--                <TextView-->
 <!--                    android:id="@+id/temp_content"-->

app/src/main/res/layout/item_canteen_line.xml

@@ -3,7 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:background="@drawable/layout_ripple"
+    android:clickable="true"
+    android:focusable="true"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="2dp">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/image_view_container"
@@ -15,13 +20,22 @@
         app:layout_constraintStart_toStartOf="parent"/>
 
     <TextView
-        android:id="@+id/content"
+        android:id="@+id/text_content"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_view_container"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toStartOf="@+id/text_price"/>
+
+    <TextView
+        android:id="@+id/text_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:fontFamily="@font/lato_bolditalic"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>