Implement displaying ingredient sections

app/src/main/java/gq/kirmanak/mealient/data/recipes/network/FullRecipeInfo.kt

@@ -18,6 +18,7 @@ data class RecipeIngredientInfo(
     val quantity: Double?,
     val unit: String?,
     val food: String?,
+    val title: String?,
 )
 
 data class RecipeInstructionInfo(

app/src/main/java/gq/kirmanak/mealient/extensions/ModelMappings.kt

@@ -52,6 +52,7 @@ fun RecipeIngredientInfo.toRecipeIngredientEntity(remoteId: String) = RecipeIngr
     unit = unit,
     food = food,
     quantity = quantity,
+    title = title,
 )
 
 fun RecipeInstructionInfo.toRecipeInstructionEntity(remoteId: String) = RecipeInstructionEntity(
@@ -129,6 +130,7 @@ fun GetRecipeIngredientResponseV0.toRecipeIngredientInfo() = RecipeIngredientInf
     unit = null,
     food = null,
     quantity = 1.0,
+    title = null,
 )
 
 fun GetRecipeInstructionResponseV0.toRecipeInstructionInfo() = RecipeInstructionInfo(
@@ -153,6 +155,7 @@ fun GetRecipeIngredientResponseV1.toRecipeIngredientInfo() = RecipeIngredientInf
     unit = unit?.name,
     food = food?.name,
     quantity = quantity,
+    title = title,
 )
 
 fun GetRecipeInstructionResponseV1.toRecipeInstructionInfo() = RecipeInstructionInfo(

app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeIngredientsAdapter.kt

@@ -3,6 +3,7 @@ package gq.kirmanak.mealient.ui.recipes.info
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
+import androidx.core.view.isGone
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -54,6 +55,8 @@ class RecipeIngredientsAdapter private constructor(
 
         fun bind(item: RecipeIngredientEntity) {
             logger.v { "bind() called with: item = $item" }
+            binding.sectionGroup.isGone = item.title.isNullOrBlank()
+            binding.title.text = item.title.orEmpty()
             binding.checkBox.text = if (disableAmounts) {
                 item.note
             } else {

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

@@ -5,12 +5,41 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
+	<androidx.constraintlayout.widget.Group
+		android:id="@+id/section_group"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:visibility="gone"
+		app:constraint_referenced_ids="title, title_divider"
+		tools:visibility="visible" />
+
+	<TextView
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="@dimen/margin_small"
+		android:textAppearance="?textAppearanceHeadline6"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Meat a very long and weird title that someone might have for some reason" />
+
+	<View
+		android:id="@+id/title_divider"
+		android:layout_width="0dp"
+		android:layout_height="1dp"
+		android:alpha="0.3"
+		android:background="?colorOnSurface"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/title" />
+
 	<CheckBox
 		android:id="@+id/checkBox"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/title_divider"
 		tools:text="900 g braising steak/stew meat, cubed into 2.5cm pieces" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt

@@ -100,6 +100,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     val BREAD_INGREDIENT = RecipeIngredientInfo(
@@ -107,6 +108,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     private val MILK_INGREDIENT = RecipeIngredientInfo(
@@ -114,6 +116,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     val MIX_INSTRUCTION = RecipeInstructionInfo(
@@ -168,6 +171,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     val CAKE_BREAD_RECIPE_INGREDIENT_ENTITY = RecipeIngredientEntity(
@@ -176,6 +180,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     val FULL_CAKE_INFO_ENTITY = FullRecipeEntity(
@@ -203,6 +208,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     private val PORRIDGE_SUGAR_RECIPE_INGREDIENT_ENTITY = RecipeIngredientEntity(
@@ -211,6 +217,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     private val PORRIDGE_MIX_RECIPE_INSTRUCTION_ENTITY = RecipeInstructionEntity(
@@ -306,6 +313,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     val SUGAR_RECIPE_INGREDIENT_RESPONSE_V1 = GetRecipeIngredientResponseV1(
@@ -313,6 +321,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     val MILK_RECIPE_INGREDIENT_INFO = RecipeIngredientInfo(
@@ -320,6 +329,7 @@ object RecipeImplTestData {
         quantity = 1.0,
         unit = null,
         food = null,
+        title = null,
     )
 
     val MIX_RECIPE_INSTRUCTION_RESPONSE_V0 = GetRecipeInstructionResponseV0("Mix the ingredients")

database/schemas/gq.kirmanak.mealient.database.AppDb/7.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 7,
-    "identityHash": "2383ca8fe2fbd04ddaec6d7680de62ad",
+    "identityHash": "d2679aea13d3c18e58c537164f70e249",
     "entities": [
       {
         "tableName": "recipe_summaries",
@@ -95,7 +95,7 @@
       },
       {
         "tableName": "recipe_ingredient",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`local_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `recipe_id` TEXT NOT NULL, `note` TEXT NOT NULL, `food` TEXT, `unit` TEXT, `quantity` REAL)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`local_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `recipe_id` TEXT NOT NULL, `note` TEXT NOT NULL, `food` TEXT, `unit` TEXT, `quantity` REAL, `title` TEXT)",
         "fields": [
           {
             "fieldPath": "localId",
@@ -132,6 +132,12 @@
             "columnName": "quantity",
             "affinity": "REAL",
             "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -179,7 +185,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2383ca8fe2fbd04ddaec6d7680de62ad')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd2679aea13d3c18e58c537164f70e249')"
     ]
   }
 }

database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeIngredientEntity.kt

@@ -12,6 +12,7 @@ data class RecipeIngredientEntity(
     @ColumnInfo(name = "food") val food: String?,
     @ColumnInfo(name = "unit") val unit: String?,
     @ColumnInfo(name = "quantity") val quantity: Double?,
+    @ColumnInfo(name = "title") val title: String?,
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -24,6 +25,7 @@ data class RecipeIngredientEntity(
         if (food != other.food) return false
         if (unit != other.unit) return false
         if (quantity != other.quantity) return false
+        if (title != other.title) return false
 
         return true
     }
@@ -33,7 +35,8 @@ data class RecipeIngredientEntity(
         result = 31 * result + note.hashCode()
         result = 31 * result + (food?.hashCode() ?: 0)
         result = 31 * result + (unit?.hashCode() ?: 0)
-        result = 31 * result + quantity.hashCode()
+        result = 31 * result + (quantity?.hashCode() ?: 0)
+        result = 31 * result + (title?.hashCode() ?: 0)
         return result
     }
 }

datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeResponseV1.kt

@@ -24,6 +24,7 @@ data class GetRecipeIngredientResponseV1(
     @SerialName("unit") val unit: GetRecipeIngredientUnitResponseV1?,
     @SerialName("food") val food: GetRecipeIngredientFoodResponseV1?,
     @SerialName("quantity") val quantity: Double?,
+    @SerialName("title") val title: String?,
 )
 
 @Serializable