86 Commits

Author SHA1 Message Date
2e163f8354 Dependency Updates 2025-08-31 18:24:41 -06:00
d10622c382 1.0.0 - Material you rework 2025-08-31 02:24:26 -06:00
2d4214562a Added the profile feature 2025-08-05 10:51:31 -06:00
571db144c4 Fixed a bug with favourites 2025-08-01 13:57:52 -06:00
1b4323c2bb Convert to my app, so I can continue a fork! 2025-07-31 18:33:10 -06:00
mroetsc
dc4ba51896 Fixed Shopping List API paths for compatibility with Mealie 2.0 2025-05-17 10:34:24 +02:00
Erik
b68cf9a1ae Various addtions to ShoppingList page (#325)
* Improve design of ShoppingListItems

* Improve scrolling behaviour of ShoppingListItemEditor

* Add search functionality to food and unit fields in ShoppingListItemEditor

* Add functionality to display plurals of units in shopping lists

* Fix tests

* Ensure editor displays correctly when switching to food mode.

- Fixed a bug causing the editor to display incorrectly when switching to food mode while at the bottom of the screen

* Fix regressions caused in 5dff173

- Fixed a regression introducing incorrect scrolling behaviour when editing items at the bottom of the page
- Fixed a regression causing the add button to not be hidden

* Prefill fields in ShoppingListItemEditorFoodRow if possible

* Remove unnecessary trigger for bringIntoView function

- Remove unnecessary trigger for bringIntoView function of ShoppingListItemEditor

* Display showAddButton dynamically

* Add support for food plurals

* Extract plural functionality to function

* Remember filtering options

* Use ExposedDropdownMenu instead of DropdownMenu

- Updated selection of foods and units to use ExposedDropdownMenu
- Updated composeBom to 2024.09.02
- Updated composeBom to 2024.09.02 to increment androidx.compose.material3 to 1.3.0 needed for androidx.compose.material3.MenuAnchorType

* Only allow one edit menu to be open at a time
2024-09-29 08:22:50 +02:00
Erik
7c825970ea Group items in shopping lists based on labels (#319)
* Add data classes to hold food label information

- Created `GetFoodLabelResponse` data class to represent food label details
- Updated `GetFoodResponse` to include `label` property of type `GetFoodLabelResponse`

* Add backend to sort items in shopping lists by label

* Add UI code to sort items in shopping lists by label

* Use label from ShoppingListItem instead of Food

* Use list for ShoppingListItems and labels storage

* Fix incorrect routing code

* Only add DefaultLabel if there are items with a label

* Small improvements to comments and formatting
2024-09-07 22:01:02 +02:00
Kirill Kamakin
5819d0c03d Fix incompatibility with Mealie v1.11.0 (#302)
* Allow dateUpdated field to contain time zone

* Remove unused dateUpdated field

* Update version code
2024-08-04 14:52:40 +00:00
Kirill Kamakin
86e70e03d0 Implement the dialog to add a new shopping list (#280)
* Add endpoint to create new shopping lists

* Initialize editing of lists names

* Implement adding new lists

* Fix invalid password for demo

* Use StateFlow to avoid lost state updates

* Refactor the list update to support empty lists

* Hide add new list button if there's a new list

* Scroll to the newly added list or item

* Replace deprecated Divider

* Move new field name input to dialog

* Display a modal dialog instead of bottom sheet

* Reduce unnecessary recompositions

* Do not hide button since it is overlapped by dialog

* Extract Composable for editable items

* Remove unused imports

* Add UI for removing and editing shopping lists

* Implement editing list name and removing lists

* Fix initial cursor state when editing name

* Add capitalization of list names

* Fix color of divider in dark mode
2024-07-27 18:12:00 +00:00
Kirill Kamakin
bfdf89ae1c Migrate Hilt plugin to KSP (#274) 2024-06-30 15:01:44 +00:00
Kirill Kamakin
c03c65a96b Add Kotlinx Kover test coverage calculator (#199)
* Add Kotlin Kover

* Add AuthKtorConfiguration tests

* Ensure at least 25% code coverage

* Exclude Previews from code coverage

* Specify Kover report path for SonarQube

* Add Kover xml report task

* Extract sonar to a separate step

* Add some exclusions and minimum coverage

* Exclude Hilt-generated classes

* Add shopping list view model tests

* Reduce the coverage requirement
2024-02-17 10:43:36 +01:00
Kirill Kamakin
7c02a8341d Fix displaying recipe ingredient note twice (#197)
* 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
2024-01-14 10:44:21 +00:00
Kirill Kamakin
c8f1f477cc Fix transition when base URL is actually incorrect (#196) 2024-01-13 11:18:12 +00:00
Kirill Kamakin
de4df95a0e Complete migration to Compose (#194)
* Migrate disclaimer screen to Compose

* Migrate base URL screen to Compose

* Migrate base URL screen to Compose

* Migrate authentication screen to Compose

* Initialize add recipe screen

* Remove unused resources

* Display add recipe operation result

* Add delete icon to ingredients and instructions

* Allow navigating between fields on add recipe

* Allow navigating between fields on authentication screen

* Allow to proceed from keyboard on base url screen

* Use material icons for recipe item

* Expose base URL as flow

* Initialize Compose navigation

* Allow sending logs again

* Allow to override navigation and top bar per screen

* Add additional logs

* Migrate share recipe screen to Compose

* Fix unit tests

* Restore recipe list tests

* Ensure authentication is shown after URL input

* Add autofill to authentication

* Complete first set up test

* Use image vector from Icons instead of drawable

* Add transition animations

* Fix logging host in Host header

* Do not fail test if login token is used
2024-01-13 10:28:10 +00:00
Kirill Kamakin
94f12820bc Ensure authentication token is always sent when it exists (#193)
* Ensure auth token is sent if it is present

* Allow using login token for other requests while API token is created

* Update version code
2023-12-28 10:05:20 +00:00
Kirill Kamakin
36a72b63de Implement sending logs to developer (#190)
* Save logs to a file

* Send logs via email

* Enable network logs in release builds

* Remove useless chooser title

* Append to logs file and ignore I/O errors

* Ensure email and password are not logged

* Ensure base URL is never logged

* Add logs disclaimer
2023-12-10 11:49:03 +00:00
Kirill Kamakin
3941ceb743 Fix building minified variant (#178) 2023-11-11 08:36:17 +00:00
Kirill Kamakin
941d45328e Add linked ingredients to recipe step (#177)
* Add Compose to app module

* Move Theme to ui module

* Add Coil image loader

* Use Compose for recipe screen

* Save instruction to ingredient relation to DB

* Display ingredients as server formats them

* Display linked ingredients under each step

* Fix ingredients padding

* Show recipe full screen

* Fix recipe screen UI issues

* Hide keyboard on recipe navigation

* Fix loading recipes from DB with no instructions or ingredients

* Add instructions section title

* Add ingredients section title

* Remove unused view holders
2023-11-07 20:47:01 +01:00
Kirill Kamakin
5ed1acb678 Simplify network layer (#175)
* Use Ktor for network requests

* Remove V0 version

* Remove Retrofit dependency

* Fix url

* Update versions of dependencies

* Revert kotlinx-datetime

Due to https://github.com/Kotlin/kotlinx-datetime/issues/304

* Rename leftovers

* Remove OkHttp

* Remove unused manifest

* Remove unused Hilt module

* Fix building empty image URLs

* Use OkHttp as engine for Ktor

* Reduce visibility of internal classes

* Fix first set up test

* Store only auth token, not header

* Remove UnitInfo/FoodInfo/VersionInfo/NewShoppingListItemInfo

* Remove RecipeSummaryInfo and ShoppingListsInfo

* Remove FullShoppingListInfo

* Remove ParseRecipeURLInfo

* Remove FullRecipeInfo

* Sign out if access token does not work

* Rename getVersionInfo method

* Update version name
2023-11-05 15:01:19 +01:00
Kirill Kamakin
be51a5c00a Implement adding and modifying shopping list items (#165)
* Add dismissed shopping list item preview

* Implement editing of note and quantity

* Add new editor row for food

* Implement loading units and foods

* Display dropdown for foods

* Display dropdown for units

* Implement updating food and units

* Create secondary editor state constructor

* Display "Add" button

* Combine editing state to an object

* Implement showing editor for new items

* Implement saving new items

* Log final screen state

* Fix ordering of foods

* Show keyboard when editing starts

* Add bottom padding to the list

* Show new items above checked
2023-07-22 18:02:45 +02:00
Kirill Kamakin
3ae784df97 Implement deletion of shopping list items (#163)
* Disable unstable Gradle features

* Implement deletion of shopping list items

* Hide deleted items even before they're deleted

* Check/uncheck items locally while the BE is updated
2023-07-15 21:55:06 +02:00
Kirill Kamakin
79dee6a9ad Allow users to trust self-signed certificates (#160)
* Implement CERT-Store

* Trust user-added certificates

* Improve code readability

* Implement saving self-signed certs to storage

* Create interface for TrustedCertificatesStore

* Remove unused code

* Make datasource implementation internal

* Bump app version to 29 (0.4.0)

---------

Co-authored-by: fz72 <fz72@gmx.de>
2023-07-04 22:53:05 +02:00
Kirill Kamakin
2375be0329 Reduce memory footprint of Hilt (#159)
* Remove @Singleton where it is not needed

* Use @AssistedFactory where possible
2023-07-04 18:22:16 +02:00
Kirill Kamakin
1e5e727e92 Implement shopping lists screen (#129)
* Initialize shopping lists feature

* Start shopping lists screen with Compose

* Add icon to shopping list name

* Add shopping lists to menu

* Set max size for the list

* Replace compose-adapter with accompanist

* Remove unused fields from shopping lists response

* Show list of shopping lists from BE

* Hide shopping lists if Mealie is 0.5.6

* Add shopping list item click listener

* Create material app theme for Compose

* Use shorter names

* Load shopping lists by pages and save to db

* Make page handling logic match recipes

* Add swipe to refresh to shopping lists

* Extract SwipeToRefresh Composable

* Make LazyPagingColumn generic

* Show refresh only when mediator is refreshing

* Do not refresh automatically

* Allow controlling Activity state from modules

* Implement navigating to shopping list screen

* Move Compose libraries setup to a plugin

* Implement loading full shopping list info

* Move Storage classes to database module

* Save shopping list items to DB

* Use separate names for separate ids

* Do only one DB version update

* Use unique names for all columns

* Display shopping list items

* Move OperationUiState to ui module

* Subscribe to shopping lists updates

* Indicate progress with progress bar

* Use strings from resources

* Format shopping list item quantities

* Hide unit/food/note/quantity if they are not set

* Implement updating shopping list item checked state

* Remove unnecessary null checks

* Disable checkbox when it is being updated

* Split shopping list screen into composables

* Show items immediately if they are saved

* Fix showing "list is empty" before the items

* Show Snackbar when error happens

* Reduce shopping list items paddings

* Remove shopping lists when URL is changed

* Add error/empty state handling to shopping lists

* Fix empty error state

* Fix tests compilation

* Add margin between text and button

* Add divider between checked and unchecked items

* Move divider to the item

* Refresh the shopping lists on authentication

* Use retry when necessary

* Remove excessive logging

* Fix pages bounds check

* Move FlowExtensionsTest

* Update Compose version

* Fix showing loading indicator for shopping lists

* Add Russian translation

* Fix SDK version lint check

* Rename parameter to match interface

* Add DB migration TODO

* Get rid of DB migrations

* Do not use pagination with shopping lists

* Cleanup after the pagination removal

* Load shopping list items

* Remove shopping lists storage

* Rethrow CancellationException in LoadingHelper

* Add pull-to-refresh on shopping list screen

* Extract LazyColumnWithLoadingState

* Split refresh errors and loading state

* Reuse LazyColumnWithLoadingState for shopping list items

* Remove paging-compose dependency

* Refresh shopping list items on authentication

* Disable missing translation lint check

* Update Compose and Kotlin versions

* Fix order of checked items

* Hide useless information from a shopping list item
2023-07-03 15:07:19 +02:00
Kirill Kamakin
67eb1eca8b Simplify getBaseUrl method 2022-12-22 18:43:18 +01:00
Kirill Kamakin
feb9110f47 Remove Exception name from error messages 2022-12-21 22:41:36 +01:00
Kirill Kamakin
d74ce4bb2a Improve Base URL interceptor error reporting 2022-12-21 22:36:16 +01:00
Kirill Kamakin
913ac84310 Fix authentication with API token on v0.5.6 2022-12-16 21:27:17 +01:00
Kirill Kamakin
9ab86e7be3 Initialize recipe removal feature 2022-12-16 17:56:03 +01:00
Kirill Kamakin
2fa43f57b7 Update favorite status on icon click 2022-12-16 17:24:34 +01:00
Kirill Kamakin
aefb974cb3 Save isFavorite flag to DB for recipes 2022-12-16 17:24:33 +01:00
Kirill Kamakin
c66198f56e Add base URL interceptor test 2022-12-12 20:19:09 +01:00
Kirill Kamakin
57ce307cf5 Configure port through base url interceptor 2022-12-12 20:11:07 +01:00
Kirill Kamakin
f1ee255c9f Revert "Fix binding set of interceptors twice in release"
This reverts commit 31089eb499.
2022-12-11 20:32:02 +01:00
Kirill Kamakin
f6c0e862fc Set base url through Interceptor 2022-12-11 20:22:36 +01:00
Kirill Kamakin
31089eb499 Fix binding set of interceptors twice in release 2022-12-11 17:58:59 +01:00
Kirill Kamakin
dd313def96 Replace Authenticator with Interceptor 2022-12-11 17:03:09 +01:00
Kirill Kamakin
c99f9fea88 Create API token when signing in 2022-12-11 16:25:12 +01:00
Kirill Kamakin
a560db8bb6 Revert "Support invalidation in MealieAuthenticator"
This reverts commit 9c48f1b563.
2022-12-11 11:29:50 +01:00
Kirill Kamakin
9c48f1b563 Support invalidation in MealieAuthenticator 2022-12-11 10:17:13 +01:00
Kirill Kamakin
ac20105b9b Create OkHttp authenticator without token invalidation 2022-12-10 10:32:13 +01:00
Kirill Kamakin
9adf37ae33 Move token invalidation to auth interceptor 2022-12-10 09:30:38 +01:00
Kirill Kamakin
54d0c895a9 Extract Authorization header to an interceptor 2022-12-10 08:15:46 +01:00
Kirill Kamakin
915fd77daa Create impl package in datasource 2022-12-10 07:40:53 +01:00
Kirill Kamakin
a18984bda0 Implement displaying ingredient sections 2022-12-04 19:25:36 +01:00
Kirill Kamakin
a628912557 Parse ingredient amounts from V1 response 2022-12-04 18:47:27 +01:00
Kirill Kamakin
4826478a2a Implement saving recipes by URLs 2022-11-28 21:22:24 +01:00
Kirill Kamakin
980ffd54cb Link "testing" as test dependency 2022-11-12 14:06:57 +01:00
Kirill Kamakin
5b9cf78317 Fix TestExtensions package name 2022-11-12 13:57:27 +01:00