Display ingredient notes (#182)
* Display ingredient note * Add changelog * Update README.md
This commit is contained in:
@@ -25,8 +25,9 @@ recipe data is stored locally and can be accessed without the Internet connectio
|
|||||||
## Status
|
## Status
|
||||||
|
|
||||||
Current version is a very early alpha which supports a small subset of the Mealie capabilities.
|
Current version is a very early alpha which supports a small subset of the Mealie capabilities.
|
||||||
It supports both API of older Mealie 0.5.6 and newer 1.0.0. Displays the list of recipes,
|
Displays the list of recipes, some information about each of the recipes, even recipe creation is
|
||||||
information about each of the recipes. Moreover, you can create a recipe from the app!
|
available!
|
||||||
|
The list of shopping lists is also available, each shopping list can be viewed and modified.
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
@@ -37,7 +38,7 @@ information about each of the recipes. Moreover, you can create a recipe from th
|
|||||||
There are three ways:
|
There are three ways:
|
||||||
1. Install it with Google Play using the badge above.
|
1. Install it with Google Play using the badge above.
|
||||||
2. Install it with F-droid using the badge above.
|
2. Install it with F-droid using the badge above.
|
||||||
3. Download the latest apk from the releases page
|
3. Download the latest apk from the releases page.
|
||||||
|
|
||||||
## Contribution
|
## Contribution
|
||||||
|
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ plugins {
|
|||||||
android {
|
android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "gq.kirmanak.mealient"
|
applicationId = "gq.kirmanak.mealient"
|
||||||
versionCode = 31
|
versionCode = 32
|
||||||
versionName = "0.4.2"
|
versionName = "0.4.3"
|
||||||
testInstrumentationRunner = "gq.kirmanak.mealient.MealientTestRunner"
|
testInstrumentationRunner = "gq.kirmanak.mealient.MealientTestRunner"
|
||||||
testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true")
|
testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true")
|
||||||
resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de")
|
resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de")
|
||||||
|
|||||||
@@ -92,11 +92,21 @@ private fun IngredientListItem(
|
|||||||
onCheckedChange = { isChecked = it },
|
onCheckedChange = { isChecked = it },
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Column {
|
||||||
Text(
|
Text(
|
||||||
text = item.display,
|
text = item.display,
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
color = MaterialTheme.colorScheme.onSurface,
|
color = MaterialTheme.colorScheme.onSurface,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (item.note.isNotBlank()) {
|
||||||
|
Text(
|
||||||
|
text = item.note,
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class ShareRecipeViewModelTest : BaseUnitTest() {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `when repo returns result expect saveResult to show progress before result`() = runTest {
|
fun `when repo returns result expect saveResult to show progress before result`() = runTest {
|
||||||
val deferredActual = async(Dispatchers.Default) {
|
val deferredActual = async(Dispatchers.Unconfined) {
|
||||||
subject.saveResult.asFlow().take(3).toList(mutableListOf())
|
subject.saveResult.asFlow().take(3).toList(mutableListOf())
|
||||||
}
|
}
|
||||||
coEvery { shareRecipeRepo.saveRecipeByURL(any()) } returns "result"
|
coEvery { shareRecipeRepo.saveRecipeByURL(any()) } returns "result"
|
||||||
|
|||||||
1
fastlane/metadata/android/en-US/changelogs/32.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/32.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Display notes under each recipe ingredient.
|
||||||
Reference in New Issue
Block a user