atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix displaying recipe ingredient note twice (#197)

Browse Source 
* Update README.md

* Bump version to 35

* Cleanup dependencies

* Bump versions of dependencies

* Save isFood/disableAmount flags to db

* Fix displaying ingredient note twice

* Remove whitespace after note is extracted
This commit is contained in:
Kirill Kamakin
2024-01-14 11:44:21 +01:00
committed by GitHub
parent c8f1f477cc
commit 7c02a8341d
17 changed files with 100 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
database/src/main/kotlin/gq/kirmanak/mealient/database/AppDb.kt
View File

@@ -1,11 +1,17 @@
package gq.kirmanak.mealient.database
import androidx.room.*
import androidx.room.Database
import androidx.room.RoomDatabase
import androidx.room.TypeConverters
import gq.kirmanak.mealient.database.recipe.RecipeDao
import gq.kirmanak.mealient.database.recipe.entity.*
import gq.kirmanak.mealient.database.recipe.entity.RecipeEntity
import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity
import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity
import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity
import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
@Database(
version = 11,
version = 12,
entities = [
RecipeSummaryEntity::class,
RecipeEntity::class,

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

@@ -25,4 +25,6 @@ data class RecipeIngredientEntity(
@ColumnInfo(name = "recipe_ingredient_quantity") val quantity: Double?,
@ColumnInfo(name = "recipe_ingredient_display") val display: String,
@ColumnInfo(name = "recipe_ingredient_title") val title: String?,
@ColumnInfo(name = "recipe_ingredient_is_food") val isFood: Boolean,
@ColumnInfo(name = "recipe_ingredient_disable_amount") val disableAmount: Boolean,
)