diff --git a/README.md b/README.md index 111953df..cc7281b6 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,9 @@ recipe data is stored locally and can be accessed without the Internet connectio ## Status 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, -information about each of the recipes. Moreover, you can create a recipe from the app! +Displays the list of recipes, some information about each of the recipes, even recipe creation is +available! +The list of shopping lists is also available, each shopping list can be viewed and modified. ## Screenshots @@ -37,7 +38,7 @@ information about each of the recipes. Moreover, you can create a recipe from th There are three ways: 1. Install it with Google Play 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 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 03db79cf..a67b3507 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,8 +17,8 @@ plugins { android { defaultConfig { applicationId = "gq.kirmanak.mealient" - versionCode = 31 - versionName = "0.4.2" + versionCode = 32 + versionName = "0.4.3" testInstrumentationRunner = "gq.kirmanak.mealient.MealientTestRunner" testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true") resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de") diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/IngredientsSection.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/IngredientsSection.kt index f0238125..783583df 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/IngredientsSection.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/IngredientsSection.kt @@ -92,11 +92,21 @@ private fun IngredientListItem( onCheckedChange = { isChecked = it }, ) - Text( - text = item.display, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurface, - ) + Column { + Text( + text = item.display, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + + if (item.note.isNotBlank()) { + Text( + text = item.note, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } } } diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModelTest.kt b/app/src/test/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModelTest.kt index bbc938b8..bced6fd4 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModelTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModelTest.kt @@ -41,7 +41,7 @@ class ShareRecipeViewModelTest : BaseUnitTest() { @Test 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()) } coEvery { shareRecipeRepo.saveRecipeByURL(any()) } returns "result" diff --git a/fastlane/metadata/android/en-US/changelogs/32.txt b/fastlane/metadata/android/en-US/changelogs/32.txt new file mode 100644 index 00000000..5887ad86 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/32.txt @@ -0,0 +1 @@ +Display notes under each recipe ingredient. \ No newline at end of file