New flutter version

Fix handling of kcal amount extraction from json

.flutter

@@ -0,0 +1 @@
+Subproject commit 17025dd88227cd9532c33fa78f5250d548d87e9a

.gitignore

@@ -41,3 +41,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+assets/icon_base.xcf

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".flutter"]
+	path = .flutter
+	url = https://github.com/flutter/flutter.git

COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

android/app/build.gradle

@@ -5,11 +5,22 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "de.swgross.calorimeter"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -20,21 +31,25 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "de.swgross.calorimeter"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
+        versionCode = 4
+        versionName = "1.0.4"
+    }
+
+	signingConfigs {
+        release {
+            keyAlias = keystoreProperties['keyAlias']
+            keyPassword = keystoreProperties['keyPassword']
+            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword = keystoreProperties['storePassword']
+        }
     }
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.debug
+            signingConfig = signingConfigs.release
         }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     <application
         android:label="Calorimeter"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"

android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

l10n.yaml

@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart

lib/food_entry/enter_food_widget.dart

@@ -1,12 +1,13 @@
-import 'package:calorimeter/utils/enter_food_controller.dart';
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:calorimeter/storage/storage.dart';
 import 'package:flutter/material.dart';
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/utils/row_with_spacers_widget.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class EnterFoodWidget extends StatefulWidget {
-  final Function(BuildContext context, FoodEntry entry) onAdd;
+  final Function(BuildContext context, FoodEntryState entry) onAdd;
 
   const EnterFoodWidget({super.key, required this.onAdd});
 
@@ -18,7 +19,7 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
   late TextEditingController nameController;
   late TextEditingController massController;
   late TextEditingController kcalPerMassController;
-  late Map<String, double> suggestions;
+  late Map<String, int> suggestions;
 
   @override
   void initState() {
@@ -32,90 +33,87 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<EnterFoodController>(
-      builder: (context, food, child) {
-        nameController.text = food.name;
-        kcalPerMassController.text = food.kcalPer100g;
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: RowWidget(
+        Autocomplete<String>(
+            optionsViewOpenDirection: OptionsViewOpenDirection.down,
+            fieldViewBuilder: (context, controller, focusNode, onSubmitted) {
+              nameController = controller;
+              return TextFormField(
+                controller: controller,
+                focusNode: focusNode,
+                decoration: InputDecoration(
+                  label: Text(AppLocalizations.of(context)!.name),
+                ),
+              );
+            },
+            optionsBuilder: (TextEditingValue textEditingValue) {
+              if (textEditingValue.text == '') {
+                return const Iterable<String>.empty();
+              }
 
-        return Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8.0),
-          child: RowWidget(
-            Autocomplete<String>(
-                optionsViewOpenDirection: OptionsViewOpenDirection.down,
-                fieldViewBuilder:
-                    (context, controller, focusNode, onSubmitted) {
-                  nameController = controller;
-                  return TextFormField(
-                    controller: controller,
-                    focusNode: focusNode,
-                    decoration: const InputDecoration(
-                      label: Text("Name"),
-                    ),
-                  );
+              return suggestions.keys.where(
+                (name) {
+                  return name
+                      .toLowerCase()
+                      .contains(textEditingValue.text.toLowerCase());
                 },
-                optionsBuilder: (TextEditingValue textEditingValue) {
-                  if (textEditingValue.text == '') {
-                    return const Iterable<String>.empty();
-                  }
-
-                  return suggestions.keys.where(
-                    (name) {
-                      return name
-                          .toLowerCase()
-                          .contains(textEditingValue.text.toLowerCase());
-                    },
-                  );
-                },
-                onSelected: (selectedFood) {
-                  double kcalPerMassForSelectedFood =
-                      suggestions[selectedFood]!;
-                  context
-                      .read<EnterFoodController>()
-                      .set(selectedFood, kcalPerMassForSelectedFood.toString());
-                }),
-            TextField(
-              textAlign: TextAlign.end,
-              decoration: const InputDecoration(
-                label: Align(
-                    alignment: Alignment.centerRight, child: Text("Menge")),
-              ),
-              keyboardType: TextInputType.number,
-              controller: massController,
-              onSubmitted: (value) => onSubmitAction(),
-            ),
-            TextField(
-              textAlign: TextAlign.end,
-              decoration: const InputDecoration(
-                  label: Align(
-                      alignment: Alignment.centerRight,
-                      child: Text("kcal pro"))),
-              keyboardType: TextInputType.number,
-              controller: kcalPerMassController,
-              onSubmitted: (value) => onSubmitAction(),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(left: 16.0),
-              child: ElevatedButton(
-                  style: ElevatedButton.styleFrom(
-                    padding: EdgeInsets.zero,
-                  ),
-                  onPressed: () => onSubmitAction(),
-                  child: const Icon(Icons.add)),
+              );
+            },
+            onSelected: (selectedFood) {
+              int kcalPerMassForSelectedFood = suggestions[selectedFood]!;
+              setState(() {
+                nameController.text = selectedFood;
+                kcalPerMassController.text =
+                    kcalPerMassForSelectedFood.toString();
+              });
+            }),
+        TextField(
+          textAlign: TextAlign.end,
+          decoration: InputDecoration(
+            label: Align(
+              alignment: Alignment.centerRight,
+              child: Text(AppLocalizations.of(context)!.amountPer),
             ),
           ),
-        );
-      },
+          keyboardType: TextInputType.number,
+          controller: massController,
+          onSubmitted: (value) => onSubmitAction(),
+        ),
+        TextField(
+          textAlign: TextAlign.end,
+          decoration: InputDecoration(
+              label: Align(
+            alignment: Alignment.centerRight,
+            child: Text(AppLocalizations.of(context)!.kcalper),
+          )),
+          keyboardType: TextInputType.number,
+          controller: kcalPerMassController,
+          onSubmitted: (value) => onSubmitAction(),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(left: 16.0),
+          child: ElevatedButton(
+              style: ElevatedButton.styleFrom(
+                padding: EdgeInsets.zero,
+              ),
+              onPressed: () => onSubmitAction(),
+              child: const Icon(Icons.add)),
+        ),
+      ),
     );
   }
 
   void onSubmitAction() {
-    double massAsNumber = 0.0;
-    double kcalPerMassAsNumber = 0.0;
+    int massAsNumber = 0;
+    int kcalPerMassAsNumber = 0;
 
     try {
-      massAsNumber = double.parse(massController.text.replaceAll(",", "."));
+      massAsNumber = int.parse(massController.text.replaceAll(",", "."));
     } catch (e) {
-      var snackbar = const SnackBar(content: Text("Menge muss eine Zahl sein"));
+      var snackbar = SnackBar(
+          content: Text(AppLocalizations.of(context)!.errAmountNotANumber));
       ScaffoldMessenger.of(context).clearSnackBars();
       ScaffoldMessenger.of(context).showSnackBar(snackbar);
       return;
@@ -123,21 +121,28 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
 
     try {
       kcalPerMassAsNumber =
-          double.parse(kcalPerMassController.text.replaceAll(",", "."));
+          int.parse(kcalPerMassController.text.replaceAll(",", "."));
     } catch (e) {
-      var snackbar =
-          const SnackBar(content: Text("'kcal pro 100g' muss eine Zahl sein"));
-      ScaffoldMessenger.of(context).clearSnackBars();
+      var snackbar = SnackBar(
+          content: Text(AppLocalizations.of(context)!.errKcalNotANumber));
+      ScaffoldMessenger.of(context).removeCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(snackbar);
       return;
     }
 
-    var entry = FoodEntry(
-        name: nameController.text,
-        mass: massAsNumber,
-        kcalPerMass: kcalPerMassAsNumber);
+    var entry = FoodEntryState(
+      name: nameController.text,
+      mass: massAsNumber,
+      kcalPer100: kcalPerMassAsNumber,
+      waitingForNetwork: false,
+      isSelected: false,
+    );
 
     widget.onAdd(context, entry);
-    context.read<EnterFoodController>().set("", "");
+    setState(() {
+      nameController.text = "";
+      massController.text = "";
+      kcalPerMassController.text = "";
+    });
   }
 }

lib/food_entry/food_entry_bloc.dart

@@ -1,102 +1,352 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
+import 'package:barcode_scan2/barcode_scan2.dart';
+import 'package:calorimeter/food_scan/food_fact_lookup.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:calorimeter/storage/storage.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:uuid/uuid.dart';
 
-class FoodEntryBloc extends Bloc<FoodEvent, FoodEntryState> {
-  final FoodEntryState initialState;
+class FoodEntryBloc extends Bloc<FoodEvent, GlobalEntryState> {
+  final GlobalEntryState initialState;
   final FoodStorage storage;
-  final DateTime forDate;
 
-  FoodEntryBloc(
-      {required this.initialState,
-      required this.forDate,
-      required this.storage})
+  FoodEntryBloc({required this.initialState, required this.storage})
       : super(initialState) {
+    on<PageBeingInitialized>(handlePageBeingInitialized);
     on<FoodEntryEvent>(handleFoodEntryEvent);
-    on<FoodDeletionEvent>(deleteFood);
-    on<PageChangedEvent>(updateEntries);
+    on<FoodChangedEvent>(handleFoodChangedEvent);
+    on<FoodDeletionEvent>(handleDeleteFoodEvent);
+    on<BarcodeAboutToBeScanned>(handleBarcodeScannedEvent);
+    on<FoodEntryTapped>(handleFoodEntryTapped);
+  }
+  void handlePageBeingInitialized(
+      PageBeingInitialized event, Emitter<GlobalEntryState> emit) async {
+    var newList = await storage.getEntriesForDate(event.forDate);
+    state.foodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: state.foodEntries));
   }
 
   void handleFoodEntryEvent(
-      FoodEntryEvent event, Emitter<FoodEntryState> emit) async {
-    FoodEntryState newState = FoodEntryState.from(state);
-    newState.addEntry(event.entry);
+      FoodEntryEvent event, Emitter<GlobalEntryState> emit) async {
+    var entriesForDate = state.foodEntries[event.forDate];
+    entriesForDate ??= [];
 
-    await storage.writeEntriesForDate(forDate, newState.foodEntries);
+    entriesForDate.add(event.entry);
+
+    await storage.writeEntriesForDate(event.forDate, entriesForDate);
     storage.addFoodEntryToLookupDatabase(event.entry);
 
-    emit(newState);
+    // this is just checking if writing to the database worked
+    // can be optimized out by just emitting newState
+    var newList = await storage.getEntriesForDate(event.forDate);
+
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
   }
 
-  void deleteFood(FoodDeletionEvent event, Emitter<FoodEntryState> emit) async {
-    state.foodEntries.removeWhere((entry) => entry.id == event.entryID);
+  void handleFoodChangedEvent(
+      FoodChangedEvent event, Emitter<GlobalEntryState> emit) async {
+    var entriesForDate = state.foodEntries[event.forDate];
+    if (entriesForDate == null) return;
 
-    await storage.writeEntriesForDate(forDate, state.foodEntries);
+    var index = entriesForDate.indexWhere((entry) {
+      return entry.id == event.newEntry.id;
+    });
 
-    emit(FoodEntryState.from(state));
+    entriesForDate.removeAt(index);
+    entriesForDate.insert(index, event.newEntry);
+
+    await storage.writeEntriesForDate(event.forDate, entriesForDate);
+    storage.addFoodEntryToLookupDatabase(event.newEntry);
+
+    // this is just checking if writing to the database worked
+    // can be optimized out by just emitting newState
+    var newList = await storage.getEntriesForDate(event.forDate);
+
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
   }
 
-  void updateEntries(
-      PageChangedEvent event, Emitter<FoodEntryState> emit) async {
-    var entries = await storage.getEntriesForDate(event.changedToDate);
-    var newState = FoodEntryState(foodEntries: entries);
-    emit(newState);
+  void handleDeleteFoodEvent(
+      FoodDeletionEvent event, Emitter<GlobalEntryState> emit) async {
+    var entriesForDate = state.foodEntries[event.forDate];
+    if (entriesForDate == null) return;
+
+    entriesForDate.removeWhere((entry) => entry.id == event.entryID);
+
+    await storage.writeEntriesForDate(event.forDate, entriesForDate);
+
+    // this is just checking if writing to the database worked
+    // can be optimized out by just emitting newState
+    var newList = await storage.getEntriesForDate(event.forDate);
+
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: newList});
+
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
+  }
+
+  void handleBarcodeScannedEvent(
+      BarcodeAboutToBeScanned event, Emitter<GlobalEntryState> emit) async {
+    ScanResult scanResult = ScanResult();
+    try {
+      scanResult = await BarcodeScanner.scan();
+    } on PlatformException catch (e) {
+      if (e.code == BarcodeScanner.cameraAccessDenied) {
+        emit(GlobalEntryState(
+            foodEntries: state.foodEntries,
+            appError:
+                GlobalAppError(GlobalAppErrorType.errCameraPermissionDenied)));
+      }
+      return;
+    }
+
+    var entriesForDate = state.foodEntries[event.forDate];
+    if (entriesForDate == null) return;
+
+    var client = FoodFactLookupClient();
+
+    if (scanResult.type == ResultType.Cancelled) {
+      return;
+    }
+    if (scanResult.type == ResultType.Error) {
+      emit(GlobalEntryState(
+          foodEntries: state.foodEntries,
+          appError: GlobalAppError(GlobalAppErrorType.errGeneralError)));
+      return;
+    }
+    var responseFuture = client.retrieveFoodInfo(scanResult.rawContent);
+
+    var newEntryWaiting = FoodEntryState(
+      kcalPer100: 0,
+      name: "",
+      mass: 0,
+      waitingForNetwork: true,
+      isSelected: false,
+    );
+
+    entriesForDate.add(newEntryWaiting);
+    var newFoodEntries = state.foodEntries;
+    newFoodEntries.addAll({event.forDate: entriesForDate});
+    emit(GlobalEntryState(foodEntries: newFoodEntries));
+
+    await responseFuture.then((response) async {
+      var index = entriesForDate
+          .indexWhere((entryState) => entryState.id == newEntryWaiting.id);
+
+      // element not found (was deleted previously)
+      if (index == -1) {
+        return;
+      }
+
+      if (response.status == FoodFactResponseStatus.barcodeNotFound) {
+        entriesForDate.removeWhere((entry) => entry.id == newEntryWaiting.id);
+        var newFoodEntries = state.foodEntries;
+        newFoodEntries.addAll({event.forDate: entriesForDate});
+
+        emit(GlobalEntryState(
+            foodEntries: newFoodEntries,
+            appError: GlobalAppError(GlobalAppErrorType.errbarcodeNotFound)));
+        return;
+      }
+      if (response.status ==
+          FoodFactResponseStatus.foodFactServerNotReachable) {
+        entriesForDate.removeWhere((entry) => entry.id == newEntryWaiting.id);
+        var newFoodEntries = state.foodEntries;
+        newFoodEntries.addAll({event.forDate: entriesForDate});
+
+        emit(GlobalEntryState(
+            foodEntries: newFoodEntries,
+            appError:
+                GlobalAppError(GlobalAppErrorType.errServerNotReachable)));
+        return;
+      }
+
+      var newEntryFinishedWaiting = FoodEntryState(
+        name: response.food?.name ?? "",
+        mass: response.food?.mass ?? 0,
+        kcalPer100: response.food?.kcalPer100g ?? 0,
+        waitingForNetwork: false,
+        isSelected: false,
+      );
+
+      entriesForDate.removeAt(index);
+      entriesForDate.insert(index, newEntryFinishedWaiting);
+
+      await storage.writeEntriesForDate(event.forDate, entriesForDate);
+      storage.addFoodEntryToLookupDatabase(newEntryFinishedWaiting);
+
+      var entriesFromStorage = await storage.getEntriesForDate(event.forDate);
+      var newFoodEntries = state.foodEntries;
+      newFoodEntries.addAll({event.forDate: entriesFromStorage});
+
+      emit(GlobalEntryState(foodEntries: newFoodEntries));
+    });
+  }
+
+  void handleFoodEntryTapped(
+      FoodEntryTapped event, Emitter<GlobalEntryState> emit) async {
+    var entriesForDate = state.foodEntries[event.forDate];
+    if (entriesForDate == null) return;
+
+    var oldStateOfTappedEntry = event.entry.isSelected;
+
+    for (var entry in entriesForDate) {
+      entry.isSelected = false;
+    }
+
+    var selectedEntry = entriesForDate.firstWhere((entry) {
+      return entry.id == event.entry.id;
+    });
+
+    selectedEntry.isSelected = !oldStateOfTappedEntry;
+
+    emit(GlobalEntryState(foodEntries: state.foodEntries));
   }
 }
 
-class FoodEvent {}
+class FoodEvent {
+  final DateTime forDate;
+
+  FoodEvent({required this.forDate});
+}
+
+class PageBeingInitialized extends FoodEvent {
+  PageBeingInitialized({required super.forDate});
+}
 
 class FoodEntryEvent extends FoodEvent {
-  final FoodEntry entry;
+  final FoodEntryState entry;
 
-  FoodEntryEvent({required this.entry});
+  FoodEntryEvent({required this.entry, required super.forDate});
+}
+
+class FoodChangedEvent extends FoodEvent {
+  final FoodEntryState newEntry;
+
+  FoodChangedEvent({required this.newEntry, required super.forDate});
 }
 
 class FoodDeletionEvent extends FoodEvent {
   final String entryID;
 
-  FoodDeletionEvent({required this.entryID});
+  FoodDeletionEvent({required this.entryID, required super.forDate});
 }
 
-class PageChangedEvent extends FoodEvent {
-  final DateTime changedToDate;
+class BarcodeAboutToBeScanned extends FoodEvent {
+  BarcodeAboutToBeScanned({required super.forDate});
+}
 
-  PageChangedEvent({required this.changedToDate});
+class FoodEntryTapped extends FoodEvent {
+  final FoodEntryState entry;
+
+  FoodEntryTapped({required this.entry, required super.forDate});
+}
+
+class PermissionException extends FoodEvent {
+  PermissionException({required super.forDate});
+}
+
+/// This is the state for one date/page
+class GlobalEntryState {
+  final Map<DateTime, List<FoodEntryState>> foodEntries;
+  final GlobalAppError? appError;
+
+  GlobalEntryState({required this.foodEntries, this.appError});
+
+  factory GlobalEntryState.init() {
+    return GlobalEntryState(foodEntries: {});
+  }
+
+  static from(GlobalEntryState state) {
+    return GlobalEntryState(foodEntries: state.foodEntries);
+  }
+
+  bool addEntry(FoodEntryState entry, DateTime date) {
+    var list = foodEntries[date];
+
+    if (list == null) {
+      return false;
+    }
+
+    list.add(entry);
+
+    return true;
+  }
 }
 
 class FoodEntryState {
-  final List<FoodEntry> foodEntries;
-
-  FoodEntryState({required this.foodEntries});
-
-  factory FoodEntryState.init() {
-    return FoodEntryState(foodEntries: []);
-  }
-
-  static from(FoodEntryState state) {
-    List<FoodEntry> newList = List.from(state.foodEntries);
-    return FoodEntryState(foodEntries: newList);
-  }
-
-  void addEntry(FoodEntry entry) {
-    foodEntries.add(entry);
-  }
-}
-
-class FoodEntry {
-  final String name;
-  final double mass;
-  final double kcalPerMass;
   final String id;
+  final String name;
+  final int mass;
+  final int kcalPer100;
+  final bool waitingForNetwork;
+  bool isSelected;
 
-  FoodEntry({
+  factory FoodEntryState({
+    required name,
+    required mass,
+    required kcalPer100,
+    required waitingForNetwork,
+    required isSelected,
+  }) {
+    return FoodEntryState.withID(
+      id: const Uuid().v1(),
+      name: name,
+      mass: mass,
+      kcalPer100: kcalPer100,
+      waitingForNetwork: waitingForNetwork,
+      isSelected: isSelected,
+    );
+  }
+
+  FoodEntryState.withID({
+    required this.id,
     required this.name,
     required this.mass,
-    required this.kcalPerMass,
-  }) : id = const Uuid().v1();
+    required this.kcalPer100,
+    required this.waitingForNetwork,
+    required this.isSelected,
+  });
 
   @override
   String toString() {
-    return '$id,$name,$mass,$kcalPerMass';
+    //we use quotation marks around the name because the name might contain
+    //commas and we want to store it in a csv file
+    return '$id,"$name",$mass,$kcalPer100';
+  }
+}
+
+enum GlobalAppErrorType {
+  errGeneralError,
+  errbarcodeNotFound,
+  errServerNotReachable,
+  errCameraPermissionDenied
+}
+
+class GlobalAppError {
+  final GlobalAppErrorType type;
+
+  GlobalAppError(this.type);
+
+  String toErrorString(BuildContext context) {
+    switch (type) {
+      case GlobalAppErrorType.errGeneralError:
+        return AppLocalizations.of(context)!.errGeneralBarcodeError;
+      case GlobalAppErrorType.errbarcodeNotFound:
+        return AppLocalizations.of(context)!.errBarcodeNotFound;
+      case GlobalAppErrorType.errServerNotReachable:
+        return AppLocalizations.of(context)!.errServerNotReachable;
+      case GlobalAppErrorType.errCameraPermissionDenied:
+        return AppLocalizations.of(context)!.errPermissionNotGranted;
+    }
   }
 }

lib/food_entry/food_entry_widget.dart

@@ -1,35 +1,38 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:flutter/material.dart';
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/utils/row_with_spacers_widget.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class FoodEntryWidget extends StatefulWidget {
-  final FoodEntry entry;
+  final FoodEntryState entry;
   final Function(BuildContext context, String id) onDelete;
+  final Function(BuildContext context, FoodEntryState entry) onChange;
+  final Function(BuildContext context, FoodEntryState entry) onTap;
 
-  const FoodEntryWidget(
-      {super.key, required this.entry, required this.onDelete});
+  const FoodEntryWidget({
+    super.key,
+    required this.entry,
+    required this.onDelete,
+    required this.onChange,
+    required this.onTap,
+  });
 
   @override
   State<FoodEntryWidget> createState() => _FoodEntryWidgetState();
 }
 
 class _FoodEntryWidgetState extends State<FoodEntryWidget> {
-  late bool showCancelAndDelete;
-
   @override
   void initState() {
-    showCancelAndDelete = false;
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () {
-        setState(() {
-          showCancelAndDelete = !showCancelAndDelete;
-        });
-      },
+      onTap: () => widget.onTap(context, widget.entry),
       child: Stack(
         children: [
           Positioned.fill(
@@ -38,43 +41,65 @@ class _FoodEntryWidgetState extends State<FoodEntryWidget> {
                 child: Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 8.0),
                   child: RowWidget(
-                    Text(widget.entry.name),
-                    Text(widget.entry.mass.ceil().toString(),
-                        textAlign: TextAlign.end),
-                    Text(widget.entry.kcalPerMass.ceil().toString(),
-                        textAlign: TextAlign.end),
+                    widget.entry.waitingForNetwork
+                        ? const Center(child: CircularProgressIndicator())
+                        : Text(widget.entry.name),
+                    widget.entry.waitingForNetwork
+                        ? Container()
+                        : Text(widget.entry.mass.ceil().toString(),
+                            textAlign: TextAlign.end),
                     Opacity(
-                      opacity: showCancelAndDelete ? 0.0 : 1.0,
-                      child: Text(
-                          (widget.entry.mass * widget.entry.kcalPerMass / 100)
-                              .ceil()
-                              .toString(),
-                          textAlign: TextAlign.end),
+                      opacity: widget.entry.isSelected ? 0.0 : 1.0,
+                      child: widget.entry.waitingForNetwork
+                          ? Container()
+                          : Text(widget.entry.kcalPer100.ceil().toString(),
+                              textAlign: TextAlign.end),
+                    ),
+                    Opacity(
+                      opacity: widget.entry.isSelected ? 0.0 : 1.0,
+                      child: widget.entry.waitingForNetwork
+                          ? Container()
+                          : Text(
+                              (widget.entry.mass *
+                                      widget.entry.kcalPer100 /
+                                      100)
+                                  .ceil()
+                                  .toString(),
+                              textAlign: TextAlign.end),
                     ),
                   ),
                 ),
               ),
               Opacity(
-                  opacity: showCancelAndDelete ? 0.66 : 0.0,
+                  opacity: widget.entry.isSelected ? 0.66 : 0.0,
                   child: Container(
                       color: Theme.of(context).colorScheme.secondary)),
             ]),
           ),
           Opacity(
-            opacity: showCancelAndDelete ? 1.0 : 0.0,
+            opacity: widget.entry.isSelected ? 1.0 : 0.0,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
                 SizedBox(
                   child: IconButton(
-                    padding: const EdgeInsets.all(0.0),
-                    icon: const Icon(Icons.cancel),
-                    onPressed: showCancelAndDelete
-                        ? () => setState(() {
-                              showCancelAndDelete = false;
-                            })
-                        : null,
-                  ),
+                      padding: const EdgeInsets.all(0.0),
+                      icon: const Icon(Icons.edit),
+                      onPressed: widget.entry.isSelected
+                          ? () async {
+                              widget.onTap(context, widget.entry);
+                              await showDialog(
+                                context: context,
+                                builder: (dialogContext) {
+                                  return FoodEntryChangeDialog(
+                                      entry: widget.entry,
+                                      onChange: (context, entry) {
+                                        widget.onChange(context, entry);
+                                      });
+                                },
+                              );
+                            }
+                          : null),
                 ),
                 SizedBox(
                   child: IconButton(
@@ -82,7 +107,7 @@ class _FoodEntryWidgetState extends State<FoodEntryWidget> {
                       iconSize: 24,
                       icon: const Icon(Icons.delete),
                       color: Colors.redAccent,
-                      onPressed: showCancelAndDelete
+                      onPressed: widget.entry.isSelected
                           ? () => widget.onDelete(context, widget.entry.id)
                           : null),
                 ),
@@ -94,3 +119,125 @@ class _FoodEntryWidgetState extends State<FoodEntryWidget> {
     );
   }
 }
+
+class FoodEntryChangeDialog extends StatefulWidget {
+  final FoodEntryState entry;
+  final Function(BuildContext context, FoodEntryState entry) onChange;
+
+  const FoodEntryChangeDialog(
+      {required this.entry, super.key, required this.onChange});
+
+  @override
+  State<FoodEntryChangeDialog> createState() => _FoodEntryChangeDialogState();
+}
+
+class _FoodEntryChangeDialogState extends State<FoodEntryChangeDialog> {
+  late TextEditingController nameController;
+  late TextEditingController massController;
+  late TextEditingController kcalPer100Controller;
+
+  static const textFieldVerticalPadding = 16.0;
+  static const textFieldHorizontalPadding = 16.0;
+
+  @override
+  void initState() {
+    nameController = TextEditingController();
+    nameController.text = widget.entry.name;
+
+    massController = TextEditingController();
+    massController.text = widget.entry.mass.toString();
+
+    kcalPer100Controller = TextEditingController();
+    kcalPer100Controller.text = widget.entry.kcalPer100.toString();
+
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(
+                vertical: textFieldVerticalPadding,
+                horizontal: textFieldHorizontalPadding),
+            child: TextField(
+              onSubmitted: (val) => _onSubmitAction(),
+              controller: nameController,
+              decoration: InputDecoration(
+                label: Text(AppLocalizations.of(context)!.name),
+              ),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(
+                vertical: textFieldVerticalPadding,
+                horizontal: textFieldHorizontalPadding),
+            child: TextField(
+              onSubmitted: (val) => _onSubmitAction(),
+              controller: massController,
+              decoration: InputDecoration(
+                label: Text(AppLocalizations.of(context)!.amountPer),
+              ),
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(
+                vertical: textFieldVerticalPadding,
+                horizontal: textFieldHorizontalPadding),
+            child: TextField(
+              onSubmitted: (val) => _onSubmitAction(),
+              controller: kcalPer100Controller,
+              decoration: InputDecoration(
+                label: Text(AppLocalizations.of(context)!.kcalper),
+              ),
+            ),
+          )
+        ],
+      ),
+      actions: [
+        IconButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            icon: const Icon(Icons.cancel)),
+        IconButton(
+          onPressed: () => _onSubmitAction(),
+          icon: const Icon(Icons.check),
+        )
+      ],
+    );
+  }
+
+  void _onSubmitAction() {
+    int mass;
+    int kcalPer100;
+
+    try {
+      mass = int.parse(massController.text);
+    } catch (e) {
+      mass = 0;
+    }
+
+    try {
+      kcalPer100 = int.parse(kcalPer100Controller.text);
+    } catch (e) {
+      kcalPer100 = 0;
+    }
+
+    var newEntry = FoodEntryState.withID(
+      id: widget.entry.id,
+      name: nameController.text,
+      mass: mass,
+      kcalPer100: kcalPer100,
+      waitingForNetwork: widget.entry.waitingForNetwork,
+      isSelected: false,
+    );
+
+    widget.onChange(context, newEntry);
+
+    Navigator.of(context).pop();
+  }
+}

lib/food_scan/food_fact_lookup.dart

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'dart:convert';
 import 'dart:developer';
 import 'dart:io';
@@ -45,13 +47,50 @@ class FoodFactLookupClient {
 class FoodFactModel {
   final String name;
   final int kcalPer100g;
+  final int mass;
 
-  FoodFactModel({required this.name, required this.kcalPer100g});
+  FoodFactModel({
+    required this.name,
+    required this.mass,
+    required this.kcalPer100g,
+  });
 
   factory FoodFactModel.fromJson(Map<String, dynamic> json) {
+    int kcalPer100gForModel = 0;
+    int kcalPer100g = 0;
+    int kcalPer100gPrepared = 0;
+
+    try {
+      kcalPer100g = (json['product']['nutriments']['energy-kcal_100g'] as num)
+          .toDouble()
+          .ceil();
+      kcalPer100gForModel = kcalPer100g;
+    } catch (e) {
+      try {
+        kcalPer100gPrepared =
+            (json['product']['nutriments']['energy-kcal_prepared_100g'] as num)
+                .toDouble()
+                .ceil();
+        kcalPer100gForModel = kcalPer100gPrepared;
+      } catch (e) {
+        kcalPer100gForModel = 0;
+      }
+    }
+
+    String quantityString = json['product']['product_quantity'] ?? "0";
+    double quantity;
+
+    try {
+      quantity = double.parse(quantityString);
+    } catch (e) {
+      quantity = 0;
+    }
+
     return FoodFactModel(
-        name: json['product']['product_name'],
-        kcalPer100g: json['product']['nutriments']['energy-kcal_100g']);
+      name: json['product']['product_name'] ?? "",
+      kcalPer100g: kcalPer100gForModel,
+      mass: quantity.ceil(),
+    );
   }
 }
 

lib/l10n/app_de.arb

@@ -0,0 +1,18 @@
+{
+  "ok": "OK",
+  "name": "Name",
+  "amount": "Menge",
+  "amountPer": "Menge in 100 g/ml",
+  "kcalper": "kcal pro 100 g/ml",
+  "kcalToday": "kcal heute",
+  "menu": "Menü",
+  "settings": "Einstellungen",
+  "yourSettings": "Deine persönlichen Einstellungen",
+  "dayLimit": "Kalorienlimit pro Tag",
+  "errAmountNotANumber": "Menge muss eine Zahl sein",
+  "errKcalNotANumber": "kcal muss eine Zahl sein",
+  "errGeneralBarcodeError": "Fehler beim Scannen des Barcodes",
+  "errBarcodeNotFound": "Barcode konnte nicht gefunden werden.",
+  "errServerNotReachable": "OpenFoodFacts-Server konnte nicht erreicht werden.",
+  "errPermissionNotGranted": "Kamera-Berechtigung muss aktiviert werden."
+}

lib/l10n/app_en.arb

@@ -0,0 +1,18 @@
+{
+  "ok": "OK",
+  "name": "Name",
+  "amount": "Amount",
+  "amountPer": "Amount in 100 g/ml",
+  "kcalper": "kcal per 100 g/ml",
+  "kcalToday": "kcal today",
+  "menu": "Menu",
+  "settings": "Settings",
+  "yourSettings": "Your personal settings",
+  "dayLimit": "Calorie limit per day",
+  "errAmountNotANumber": "Amount must be a number",
+  "errKcalNotANumber": "kcal must be a number",
+  "errGeneralBarcodeError": "Error while scanning the barcode.",
+  "errBarcodeNotFound": "Barcode could not be found.",
+  "errServerNotReachable": "OpenFoodFacts server could not be reached.",
+  "errPermissionNotGranted": "Permission to use camera must be given."
+}

lib/main.dart

@@ -1,15 +1,28 @@
-import 'package:calorimeter/perdate/perdate_widget.dart';
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
+import 'package:calorimeter/food_entry/food_entry_bloc.dart';
+import 'package:calorimeter/perdate/perdate_pageview_controller.dart';
 import 'package:calorimeter/storage/storage.dart';
+import 'package:calorimeter/utils/date_time_helper.dart';
 import 'package:calorimeter/utils/settings_bloc.dart';
 import 'package:calorimeter/utils/theme_bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:go_router/go_router.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+List<FoodEntryState> entriesForToday = [];
+DateTime timeNow = DateTime.now();
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+
   var storage = await FoodStorage.create();
   await storage.buildFoodLookupDatabase();
+
+  timeNow = DateTimeHelper.now();
+  entriesForToday = await storage.getEntriesForDate(timeNow);
+
   var kcalLimit = await storage.readLimit();
   var brightness = await storage.readBrightness();
 
@@ -38,6 +51,13 @@ class MainApp extends StatelessWidget {
     return SafeArea(
       child: MultiBlocProvider(
         providers: [
+          BlocProvider(
+            create: (context) => FoodEntryBloc(
+              storage: storage,
+              initialState:
+                  GlobalEntryState(foodEntries: {timeNow: entriesForToday}),
+            ),
+          ),
           BlocProvider(
             create: (context) => SettingsDataBloc(
                 SettingsState(kcalLimit: kcalLimit),
@@ -56,14 +76,22 @@ class MainApp extends StatelessWidget {
               newBrightness = Brightness.dark;
             }
 
-            return MaterialApp(
-              home: PerDateWidget(date: DateTime.now()),
-              localizationsDelegates: const [
-                GlobalMaterialLocalizations.delegate,
-                GlobalWidgetsLocalizations.delegate,
-                GlobalCupertinoLocalizations.delegate,
-              ],
-              supportedLocales: const [
+            return MaterialApp.router(
+              routerConfig: GoRouter(
+                routes: [
+                  GoRoute(
+                    path: '/',
+                    builder: (context, state) {
+                      return PerDatePageViewController(
+                        initialDate: DateTimeHelper.now(),
+                      );
+                    },
+                  ),
+                ],
+              ),
+              localizationsDelegates: AppLocalizations.localizationsDelegates,
+              supportedLocales: [
+                Locale('en'),
                 Locale('de'),
               ],
               theme: ThemeData(

lib/perdate/entry_list.dart

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:calorimeter/food_entry/enter_food_widget.dart';
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/food_entry/food_entry_widget.dart';
@@ -5,10 +7,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class FoodEntryList extends StatelessWidget {
-  final List<FoodEntry> entries;
+  final List<FoodEntryState> entries;
+  final DateTime date;
 
   const FoodEntryList({
     required this.entries,
+    required this.date,
     super.key,
   });
 
@@ -17,6 +21,7 @@ class FoodEntryList extends StatelessWidget {
     return ListView.builder(
       itemCount: entries.length + 1,
       itemBuilder: (BuildContext itemBuilderContext, int listIndex) {
+        //last item in list is the widget to enter food
         if (listIndex == entries.length) {
           return Column(
             children: [
@@ -24,7 +29,7 @@ class FoodEntryList extends StatelessWidget {
                 onAdd: (context, entry) {
                   context
                       .read<FoodEntryBloc>()
-                      .add(FoodEntryEvent(entry: entry));
+                      .add(FoodEntryEvent(entry: entry, forDate: date));
                 },
               ),
               const SizedBox(height: 75),
@@ -38,10 +43,20 @@ class FoodEntryList extends StatelessWidget {
             FoodEntryWidget(
               key: ValueKey(entries[entryIndex].id),
               entry: entries[entryIndex],
-              onDelete: (callbackContext, id) {
-                callbackContext.read<FoodEntryBloc>().add(FoodDeletionEvent(
-                      entryID: id,
-                    ));
+              onDelete: (_, id) {
+                context
+                    .read<FoodEntryBloc>()
+                    .add(FoodDeletionEvent(entryID: id, forDate: date));
+              },
+              onChange: (_, changedEntry) {
+                context.read<FoodEntryBloc>().add(
+                      FoodChangedEvent(newEntry: changedEntry, forDate: date),
+                    );
+              },
+              onTap: (_, tappedEntry) {
+                context.read<FoodEntryBloc>().add(
+                      FoodEntryTapped(entry: tappedEntry, forDate: date),
+                    );
               },
             ),
             const Divider(),

lib/perdate/perdate_pageview.dart

@@ -0,0 +1,52 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
+import 'dart:developer';
+
+import 'package:calorimeter/perdate/perdate_pageview_controller.dart';
+import 'package:calorimeter/perdate/perdate_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class PerDatePageView extends StatelessWidget {
+  // this is the date for which the PerDate widget will be shown on screen
+  // left of it will be yesterday's PerDate widget
+  // right of it will be tomorrow's PerDate widget
+  final DateTime initialDate;
+  final PageController pageController;
+
+  const PerDatePageView({
+    required this.initialDate,
+    required this.pageController,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    log("PerDatePageView's build()");
+    return PageView.builder(
+        reverse: true,
+        controller: pageController,
+        onPageChanged: (value) {
+          log("onPageChanged() with value $value");
+
+          var diff = value - pageController.initialPage;
+          var newDate = initialDate.subtract(Duration(days: diff));
+          log("newDate = $newDate");
+
+          context
+              .read<PageViewStateProvider>()
+              .addVisitedindexIfNotVisitedByBackButton(value);
+          context.read<PageViewStateProvider>().setDisplayedDate(newDate);
+        },
+        itemBuilder: (context, index) {
+          log("itemBuilder() called with index $index");
+          var dateToBuildWidgetFor = initialDate
+              .subtract(Duration(days: index - pageController.initialPage));
+
+          return PerDateWidget(
+            key: ValueKey(dateToBuildWidgetFor.toString()),
+            date: dateToBuildWidgetFor,
+          );
+        });
+  }
+}

lib/perdate/perdate_pageview_controller.dart

@@ -0,0 +1,148 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
+import 'dart:developer';
+
+import 'package:calorimeter/food_entry/food_entry_bloc.dart';
+import 'package:calorimeter/perdate/perdate_pageview.dart';
+import 'package:calorimeter/utils/app_drawer.dart';
+import 'package:calorimeter/utils/calendar_floating_button.dart';
+import 'package:calorimeter/utils/date_time_helper.dart';
+import 'package:calorimeter/utils/rectangular_notch_shape.dart';
+import 'package:calorimeter/utils/scan_food_floating_button.dart';
+import 'package:calorimeter/utils/sum_widget.dart';
+import 'package:calorimeter/utils/theme_switcher_button.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+class PerDatePageViewController extends StatelessWidget {
+  // this is the date for which the PerDate widget will be shown on screen
+  // left of it will be yesterday's PerDate widget
+  // right of it will be tomorrow's PerDate widget
+  final DateTime initialDate;
+  final PageController pageController;
+  static final int initialOffset = 36500000;
+
+  const PerDatePageViewController._(
+      {required this.initialDate, required this.pageController});
+
+  factory PerDatePageViewController({required initialDate}) {
+    return PerDatePageViewController._(
+        initialDate: initialDate,
+        pageController: PageController(initialPage: initialOffset));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (context) => PageViewStateProvider(
+        initialDate: initialDate,
+        initialOffset: initialOffset,
+      ),
+      child: Builder(builder: (context) {
+        return BackButtonListener(
+          onBackButtonPressed: () async {
+            context.read<PageViewStateProvider>().backButtonWasPressed = true;
+            var visitedIndexes =
+                context.read<PageViewStateProvider>().visitedIndexes;
+            if (visitedIndexes.length == 1) {
+              return false;
+            }
+
+            visitedIndexes.removeLast();
+            pageController.jumpToPage(visitedIndexes.last);
+
+            return true;
+          },
+          child: Scaffold(
+            appBar: AppBar(
+              title: Builder(builder: (context) {
+                return Text(DateFormat.yMMMMd(
+                        Localizations.localeOf(context).toString())
+                    .format(
+                        context.watch<PageViewStateProvider>().displayedDate));
+              }),
+              actions: const [ThemeSwitcherButton()],
+            ),
+            bottomNavigationBar: BottomAppBar(
+              shape: const RectangularNotchShape(),
+              color: Theme.of(context).colorScheme.secondary,
+              child: Builder(builder: (context) {
+                return SumWidget(
+                    date: context.watch<PageViewStateProvider>().displayedDate);
+              }),
+            ),
+            drawer: const AppDrawer(),
+            floatingActionButton: OverflowBar(children: [
+              ScanFoodFAB(
+                onPressed: () {
+                  context.read<FoodEntryBloc>().add(
+                        BarcodeAboutToBeScanned(
+                          forDate: context
+                              .read<PageViewStateProvider>()
+                              .displayedDate,
+                        ),
+                      );
+                },
+              ),
+              const SizedBox(width: 8),
+              CalendarFAB(
+                startFromDate: DateTimeHelper.now(),
+                onDateSelected: (dateSelected) {
+                  if (dateSelected == null) return;
+
+                  var dateDiff = dateSelected.difference(initialDate).inDays;
+
+                  log("dateDiff = $dateDiff");
+                  pageController.jumpToPage(initialOffset - dateDiff);
+                },
+              ),
+            ]),
+            floatingActionButtonLocation:
+                FloatingActionButtonLocation.endDocked,
+            body: PerDatePageView(
+              pageController: pageController,
+              initialDate: initialDate,
+            ),
+          ),
+        );
+      }),
+    );
+  }
+}
+
+class PageViewStateProvider with ChangeNotifier {
+  DateTime _displayedDate;
+  final List<int> _visitedIndexes;
+  bool _backButtonWasPressed = false;
+
+  PageViewStateProvider({required DateTime initialDate, int initialOffset = 0})
+      : _displayedDate = initialDate,
+        _visitedIndexes = [] {
+    _visitedIndexes.add(initialOffset);
+  }
+
+  set backButtonWasPressed(val) => _backButtonWasPressed = val;
+  get backButtonWasPressed => _backButtonWasPressed;
+
+  get displayedDate => _displayedDate;
+  void setDisplayedDate(date) {
+    _displayedDate = date;
+    notifyListeners();
+  }
+
+  get visitedIndexes => _visitedIndexes;
+
+  void addVisitedIndex(int index) {
+    _visitedIndexes.add(index);
+  }
+
+  void addVisitedindexIfNotVisitedByBackButton(int index) {
+    if (_backButtonWasPressed) {
+      _backButtonWasPressed = false;
+      return;
+    }
+
+    addVisitedIndex(index);
+  }
+}

lib/perdate/perdate_widget.dart

@@ -1,19 +1,9 @@
-import 'package:barcode_scan2/barcode_scan2.dart';
-import 'package:calorimeter/food_scan/food_fact_lookup.dart';
-import 'package:calorimeter/utils/enter_food_controller.dart';
-import 'package:calorimeter/utils/scan_food_floating_button.dart';
-import 'package:calorimeter/utils/app_drawer.dart';
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/perdate/entry_list.dart';
-import 'package:calorimeter/storage/storage.dart';
-import 'package:calorimeter/utils/calendar_floating_button.dart';
-import 'package:calorimeter/utils/rectangular_notch_shape.dart';
-import 'package:calorimeter/utils/sum_widget.dart';
-import 'package:calorimeter/utils/theme_switcher_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
 
 class PerDateWidget extends StatefulWidget {
   final DateTime date;
@@ -23,125 +13,46 @@ class PerDateWidget extends StatefulWidget {
   State<PerDateWidget> createState() => _PerDateWidgetState();
 }
 
-class _PerDateWidgetState extends State<PerDateWidget> {
-  late FoodStorage storage;
-  late Future<List<FoodEntry>> entriesFuture;
-  List<FoodEntry> entries = [];
-
+class _PerDateWidgetState extends State<PerDateWidget>
+    with AutomaticKeepAliveClientMixin<PerDateWidget> {
   @override
   void initState() {
-    storage = FoodStorage.getInstance();
-    entriesFuture = storage.getEntriesForDate(widget.date);
-    entriesFuture.then((val) {
-      entries = val;
-    });
+    context
+        .read<FoodEntryBloc>()
+        .add(PageBeingInitialized(forDate: widget.date));
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder(
-        future: entriesFuture,
-        builder: (context, snapshot) {
-          return snapshot.connectionState != ConnectionState.done
-              ? const Center(child: CircularProgressIndicator())
-              : MultiProvider(
-                  providers: [
-                    ChangeNotifierProvider(
-                        create: (context) => EnterFoodController()),
-                    BlocProvider(
-                      create: (context) => FoodEntryBloc(
-                        initialState: FoodEntryState(foodEntries: entries),
-                        storage: storage,
-                        forDate: widget.date,
-                      ),
-                    )
-                  ],
-                  child: BlocBuilder<FoodEntryBloc, FoodEntryState>(
-                      builder: (context, state) {
-                    return Scaffold(
-                        appBar: AppBar(
-                          title:
-                              Text(DateFormat.yMMMMd('de').format(widget.date)),
-                          actions: const [ThemeSwitcherButton()],
-                        ),
-                        body: FoodEntryList(entries: state.foodEntries),
-                        bottomNavigationBar: BottomAppBar(
-                            shape: const RectangularNotchShape(),
-                            color: Theme.of(context).colorScheme.secondary,
-                            child: SumWidget(foodEntries: state.foodEntries)),
-                        drawer: const AppDrawer(),
-                        floatingActionButton: OverflowBar(children: [
-                          ScanFoodFloatingButton(
-                            onPressed: () async {
-                              var client = FoodFactLookupClient();
+    super.build(context);
 
-                              var scanResult = await BarcodeScanner.scan();
-
-                              if (scanResult.type == ResultType.Cancelled) {
-                                return;
-                              }
-
-                              if (!context.mounted) return;
-
-                              if (scanResult.type == ResultType.Error) {
-                                showNewSnackbarWith(context,
-                                    "Fehler beim Scannen des Barcodes.");
-                              }
-                              var response = await client
-                                  .retrieveFoodInfo(scanResult.rawContent);
-
-                              if (!context.mounted) return;
-
-                              if (response.status ==
-                                  FoodFactResponseStatus.barcodeNotFound) {
-                                showNewSnackbarWith(context,
-                                    "Barcode konnte nicht gefunden werden.");
-                                return;
-                              }
-
-                              if (response.status ==
-                                  FoodFactResponseStatus
-                                      .foodFactServerNotReachable) {
-                                showNewSnackbarWith(context,
-                                    "OpenFoodFacts-Server konnte nicht erreicht werden.");
-                                return;
-                              }
-
-                              context.read<EnterFoodController>().set(
-                                    response.food!.name,
-                                    response.food!.kcalPer100g.toString(),
-                                  );
-                            },
-                          ),
-                          const SizedBox(width: 8),
-                          CalendarFloatingButton(
-                            startFromDate: widget.date,
-                            onDateSelected: (dateSelected) {
-                              Navigator.of(context).push(
-                                MaterialPageRoute(
-                                  builder: (context) {
-                                    return PerDateWidget(date: dateSelected);
-                                  },
-                                ),
-                              );
-                            },
-                          ),
-                        ]),
-                        floatingActionButtonLocation:
-                            FloatingActionButtonLocation.endDocked);
-                  }),
-                );
-        });
+    return BlocConsumer<FoodEntryBloc, GlobalEntryState>(
+      listener: (context, pageState) {
+        if (pageState.appError != null) {
+          showNewSnackbarWith(context, pageState.appError!);
+        }
+      },
+      builder: (context, pageState) {
+        return FoodEntryList(
+            entries: pageState.foodEntries[widget.date] ?? [],
+            date: widget.date);
+      },
+    );
   }
 
-  void showNewSnackbarWith(BuildContext context, String text) {
-    var snackbar =
-        ErrorSnackbar(colorScheme: Theme.of(context).colorScheme, text: text);
+  void showNewSnackbarWith(BuildContext context, GlobalAppError error) {
+    var snackbar = ErrorSnackbar(
+        colorScheme: Theme.of(context).colorScheme,
+        text: error.toErrorString(context));
 
-    ScaffoldMessenger.of(context).clearSnackBars();
-    ScaffoldMessenger.of(context).showSnackBar(snackbar);
+    ScaffoldMessenger.of(context)
+      ..removeCurrentSnackBar()
+      ..showSnackBar(snackbar);
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }
 
 class ErrorSnackbar extends SnackBar {

lib/storage/storage.dart

@@ -1,14 +1,16 @@
-import 'dart:developer';
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'dart:io';
 
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
+import 'package:calorimeter/utils/date_time_helper.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:universal_platform/universal_platform.dart';
 
 class FoodStorage {
   static late FoodStorage _instance;
   late String path;
-  final Map<String, double> _foodLookupDatabase = {};
+  final Map<String, int> _foodLookupDatabase = {};
 
   FoodStorage._create();
 
@@ -31,8 +33,8 @@ class FoodStorage {
 
   static FoodStorage getInstance() => _instance;
 
-  Future<List<FoodEntry>> getEntriesForDate(DateTime date) async {
-    List<FoodEntry> entries = [];
+  Future<List<FoodEntryState>> getEntriesForDate(DateTime date) async {
+    List<FoodEntryState> entries = [];
     var filePath = '$path/${date.year}/${date.month}/${date.day}';
 
     var file = File(filePath);
@@ -43,11 +45,29 @@ class FoodStorage {
     var lines = await file.readAsLines();
 
     for (var line in lines) {
-      var fields = line.split(',');
-      var entry = FoodEntry(
-          name: fields[1],
-          mass: double.parse(fields[2]),
-          kcalPerMass: double.parse(fields[3]));
+      var fields = line.splitWithIgnore(',', ignoreIn: '"');
+      int mass = 0;
+      int kcalPerMass = 0;
+
+      try {
+        mass = int.parse(fields[2]);
+      } catch (e) {
+        mass = double.parse(fields[2]).toInt();
+      }
+
+      try {
+        kcalPerMass = int.parse(fields[3]);
+      } catch (e) {
+        kcalPerMass = double.parse(fields[3]).toInt();
+      }
+
+      var entry = FoodEntryState(
+        name: fields[1].replaceAll('"', ""),
+        mass: mass,
+        kcalPer100: kcalPerMass,
+        waitingForNetwork: false,
+        isSelected: false,
+      );
       entries.add(entry);
     }
 
@@ -55,7 +75,7 @@ class FoodStorage {
   }
 
   Future<void> writeEntriesForDate(
-      DateTime date, List<FoodEntry> foodEntries) async {
+      DateTime date, List<FoodEntryState> foodEntries) async {
     var filePath = '$path/${date.year}/${date.month}/${date.day}';
     var file = File(filePath);
 
@@ -139,11 +159,11 @@ class FoodStorage {
   Future<void> buildFoodLookupDatabase() async {
     // get a list of dates of the last 365 days
     var dates = List<DateTime>.generate(365, (idx) {
-      var pastDay = Duration(days: idx);
-      return DateTime.now().subtract(pastDay);
+      var durationToPast = Duration(days: idx);
+      return DateTimeHelper.now().subtract(durationToPast);
     });
 
-    for (var date in dates) {
+    for (var date in dates.reversed) {
       addFoodEntryToLookupDatabaseFor(date);
     }
   }
@@ -152,15 +172,52 @@ class FoodStorage {
     var entriesForDate = await getEntriesForDate(date);
 
     for (var entry in entriesForDate) {
-      _foodLookupDatabase[entry.name] = entry.kcalPerMass;
-      log("Added entry: ${entry.name}/${entry.kcalPerMass}");
+      _foodLookupDatabase[entry.name] = entry.kcalPer100;
     }
   }
 
-  void addFoodEntryToLookupDatabase(FoodEntry entry) {
-    _foodLookupDatabase[entry.name] = entry.kcalPerMass;
-    log("Added entry: ${entry.name}/${entry.kcalPerMass}");
+  void addFoodEntryToLookupDatabase(FoodEntryState entry) {
+    _foodLookupDatabase[entry.name] = entry.kcalPer100;
   }
 
-  Map<String, double> get getFoodEntryLookupDatabase => _foodLookupDatabase;
+  Map<String, int> get getFoodEntryLookupDatabase => _foodLookupDatabase;
+}
+
+extension SplitWithIgnore on String {
+  List<String> splitWithIgnore(String delimiter, {String? ignoreIn}) {
+    List<String> parts = [];
+
+    if (ignoreIn == null) {
+      return split(delimiter);
+    }
+
+    int index = -1;
+    int indexCharAfterDelimiter = 0;
+    bool inIgnore = false;
+    for (var rune in runes) {
+      var char = String.fromCharCode(rune);
+
+      index += 1;
+
+      if (char == ignoreIn) {
+        inIgnore = !inIgnore;
+        continue;
+      }
+
+      if (inIgnore) {
+        continue;
+      }
+
+      if (char == delimiter) {
+        parts.add(substring(indexCharAfterDelimiter, index));
+        indexCharAfterDelimiter = index + 1;
+      }
+
+      if (index + 1 == length) {
+        parts.add(substring(indexCharAfterDelimiter, length));
+      }
+    }
+
+    return parts;
+  }
 }

lib/utils/app_drawer.dart

@@ -1,5 +1,8 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:calorimeter/utils/settings.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class AppDrawer extends StatelessWidget {
   const AppDrawer({
@@ -17,16 +20,17 @@ class AppDrawer extends StatelessWidget {
               color: Colors.redAccent,
             ),
             child: ListTile(
-                leading: IconButton(
-                  icon: const Icon(Icons.close),
-                  onPressed: () {
-                    Navigator.of(context).pop();
-                  },
-                ),
-                title: const Text('Menü')),
+              leading: IconButton(
+                icon: const Icon(Icons.close),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              title: Text(AppLocalizations.of(context)!.menu),
+            ),
           ),
           ListTile(
-            title: const Text('Einstellungen'),
+            title: Text(AppLocalizations.of(context)!.settings),
             trailing: const Icon(Icons.settings),
             onTap: () {
               Navigator.of(context).pop();

lib/utils/calendar_floating_button.dart

@@ -1,10 +1,13 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
+import 'package:calorimeter/utils/date_time_helper.dart';
 import 'package:flutter/material.dart';
 
-class CalendarFloatingButton extends StatelessWidget {
+class CalendarFAB extends StatelessWidget {
   final DateTime startFromDate;
-  final Function(DateTime) onDateSelected;
+  final Function(DateTime?) onDateSelected;
 
-  const CalendarFloatingButton(
+  const CalendarFAB(
       {super.key, required this.startFromDate, required this.onDateSelected});
 
   @override
@@ -12,20 +15,20 @@ class CalendarFloatingButton extends StatelessWidget {
     return FloatingActionButton(
       onPressed: () async {
         var datePicked = await showDatePicker(
-          locale: const Locale('de'),
           context: context,
           initialDate: startFromDate,
-          currentDate: DateTime.now(),
-          firstDate: DateTime.now().subtract(const Duration(days: 365 * 10)),
-          lastDate: DateTime.now(),
+          currentDate: DateTimeHelper.now(),
+          firstDate:
+              DateTimeHelper.now().subtract(const Duration(days: 365 * 10)),
+          lastDate: DateTimeHelper.now().add(const Duration(days: 365 * 10)),
         );
 
         if (!context.mounted) return;
 
-        onDateSelected(datePicked ?? DateTime.now());
+        onDateSelected(datePicked?.copyWith(isUtc: true));
       },
       heroTag: "calendarFAB",
-      child: const Icon(Icons.today),
+      child: const Icon(Icons.date_range),
     );
   }
 }

lib/utils/date_time_helper.dart

@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
+class DateTimeHelper {
+  static DateTime now() {
+    return DateTime.now().copyWith(
+      isUtc: true,
+      hour: 0,
+      minute: 0,
+      second: 0,
+      millisecond: 0,
+      microsecond: 0,
+    );
+  }
+}

lib/utils/enter_food_controller.dart

@@ -1,12 +0,0 @@
-import 'package:flutter/material.dart';
-
-class EnterFoodController extends ChangeNotifier {
-  String name = "";
-  String kcalPer100g = "";
-
-  void set(String newName, String newKcal) {
-    name = newName;
-    kcalPer100g = newKcal;
-    notifyListeners();
-  }
-}

lib/utils/rectangular_notch_shape.dart

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:flutter/material.dart';
 
 class RectangularNotchShape extends NotchedShape {

lib/utils/row_with_spacers_widget.dart

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:flutter/material.dart';
 
 class RowWidget extends StatelessWidget {

lib/utils/scan_food_floating_button.dart

@@ -1,8 +1,10 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:flutter/material.dart';
 
-class ScanFoodFloatingButton extends StatelessWidget {
+class ScanFoodFAB extends StatelessWidget {
   final Function() onPressed;
-  const ScanFoodFloatingButton({super.key, required this.onPressed});
+  const ScanFoodFAB({super.key, required this.onPressed});
 
   @override
   Widget build(BuildContext context) {

lib/utils/settings.dart

@@ -1,8 +1,11 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:calorimeter/utils/app_drawer.dart';
 import 'package:calorimeter/utils/settings_bloc.dart';
 import 'package:settings_ui/settings_ui.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class SettingsWidget extends StatefulWidget {
   const SettingsWidget({super.key});
@@ -21,33 +24,24 @@ class _SettingsWidgetState extends State<SettingsWidget> {
           builder: (context, state) {
         return SettingsList(sections: [
           SettingsSection(
-            title: const Text('Deine persönlichen Einstellungen'),
+            title: Text(AppLocalizations.of(context)!.yourSettings),
             tiles: [
               SettingsTile.navigation(
                   leading: const Icon(Icons.food_bank),
-                  title: const Text('Kalorienlimit pro Tag'),
+                  title: Text(AppLocalizations.of(context)!.dayLimit),
                   value: Text(state.kcalLimit.toString()),
                   onPressed: (context) async {
                     await showDialog(
                         builder: (ctx) {
                           return AlertDialog(
-                            title: const Text("Kalorienlimit pro Tag"),
-                            content: TextField(controller: kcalPerDayCtrl),
+                            title: Text(AppLocalizations.of(context)!.dayLimit),
+                            content: TextField(
+                                controller: kcalPerDayCtrl,
+                                onSubmitted: (val) => submitDailyKcal()),
                             actions: [
                               TextButton(
-                                  onPressed: () {
-                                    double setting;
-                                    try {
-                                      setting =
-                                          double.parse(kcalPerDayCtrl.text);
-                                    } catch (e) {
-                                      setting = 2000.0;
-                                    }
-                                    context.read<SettingsDataBloc>().add(
-                                        DailyKcalLimitUpdated(kcal: setting));
-                                    Navigator.of(context).pop();
-                                  },
-                                  child: const Text('Ok'))
+                                  onPressed: () => submitDailyKcal(),
+                                  child: Text(AppLocalizations.of(context)!.ok))
                             ],
                           );
                         },
@@ -58,7 +52,18 @@ class _SettingsWidgetState extends State<SettingsWidget> {
         ]);
       }),
       drawer: const AppDrawer(),
-      appBar: AppBar(title: const Text('Einstellungen')),
+      appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
     );
   }
+
+  void submitDailyKcal() {
+    double setting;
+    try {
+      setting = double.parse(kcalPerDayCtrl.text);
+    } catch (e) {
+      setting = 2000.0;
+    }
+    context.read<SettingsDataBloc>().add(DailyKcalLimitUpdated(kcal: setting));
+    Navigator.of(context).pop();
+  }
 }

lib/utils/settings_bloc.dart

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:calorimeter/storage/storage.dart';
 

lib/utils/sum_widget.dart

@@ -1,56 +1,63 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:calorimeter/food_entry/food_entry_bloc.dart';
 import 'package:calorimeter/utils/settings_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class SumWidget extends StatelessWidget {
-  final List<FoodEntry> foodEntries;
-  const SumWidget({required this.foodEntries, super.key});
+  final DateTime date;
+
+  const SumWidget({super.key, required this.date});
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<SettingsDataBloc, SettingsState>(
-      builder: (context, state) {
-        var sum = 0.0;
-        for (var entry in foodEntries) {
-          sum += entry.kcalPerMass / 100 * entry.mass;
-        }
-        var diff = state.kcalLimit - sum;
-        var diffLimit = state.kcalLimit ~/ 4;
+    return BlocBuilder<FoodEntryBloc, GlobalEntryState>(
+        builder: (context, entryState) {
+      return BlocBuilder<SettingsDataBloc, SettingsState>(
+        builder: (context, settingsState) {
+          var sum = 0.0;
+          for (var entry in entryState.foodEntries[date] ?? []) {
+            sum += entry.kcalPer100 / 100 * entry.mass;
+          }
+          var diff = settingsState.kcalLimit - sum;
+          var diffLimit = settingsState.kcalLimit ~/ 4;
 
-        var textColor = Theme.of(context).colorScheme.onSecondary;
-        var newTextColor = textColor;
-        var brightness = Theme.of(context).brightness;
+          var textColor = Theme.of(context).colorScheme.onSecondary;
+          var newTextColor = textColor;
+          var brightness = Theme.of(context).brightness;
 
-        switch (brightness) {
-          case Brightness.dark:
-            if (diff < 0) {
-              newTextColor = Colors.red[900]!;
-            } else if (diff < diffLimit) {
-              newTextColor = Colors.orange[900]!;
-            }
-            break;
+          switch (brightness) {
+            case Brightness.dark:
+              if (diff < 0) {
+                newTextColor = Colors.red[900]!;
+              } else if (diff < diffLimit) {
+                newTextColor = Colors.orange[900]!;
+              }
+              break;
 
-          case Brightness.light:
-            if (diff < 0) {
-              newTextColor = Colors.redAccent;
-            } else if (diff < diffLimit) {
-              newTextColor = Colors.orangeAccent;
-            }
-            break;
-        }
+            case Brightness.light:
+              if (diff < 0) {
+                newTextColor = Colors.redAccent;
+              } else if (diff < diffLimit) {
+                newTextColor = Colors.orangeAccent;
+              }
+              break;
+          }
 
-        return Align(
-          alignment: Alignment.centerLeft,
-          child: Text(
-            'kcal heute: ${sum.ceil().toString()}/${state.kcalLimit.ceil()}',
-            style: Theme.of(context)
-                .textTheme
-                .bodyLarge!
-                .copyWith(color: newTextColor),
-          ),
-        );
-      },
-    );
+          return Align(
+            alignment: Alignment.centerLeft,
+            child: Text(
+              '${AppLocalizations.of(context)!.kcalToday}: ${sum.ceil().toString()}/${settingsState.kcalLimit.ceil()}',
+              style: Theme.of(context)
+                  .textTheme
+                  .bodyLarge!
+                  .copyWith(color: newTextColor),
+            ),
+          );
+        },
+      );
+    });
   }
 }

lib/utils/theme_bloc.dart

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:calorimeter/storage/storage.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 

lib/utils/theme_switcher_button.dart

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
 import 'package:calorimeter/utils/theme_bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

metadata/android/en-US/full_description.txt

@@ -0,0 +1,4 @@
+With Calorimeter you can track your daily calorie intake.
+Build your own database of your favorite foods.
+Or scan the foods that you buy.
+As simple as it gets.

metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Track your calories!

metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Calorimeter

pubspec.lock

@@ -1,6 +1,43 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      url: "https://pub.dev"
+    source: hosted
+    version: "76.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.3"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.11.0"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.0"
   async:
     dependency: transitive
     description:
@@ -41,6 +78,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -53,18 +106,34 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
   fake_async:
     dependency: transitive
     description:
@@ -81,14 +150,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -102,14 +179,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.1.6"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.2"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -120,6 +205,59 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.6.2"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.2"
   intl:
     dependency: "direct main"
     description:
@@ -128,22 +266,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.19.0"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.1"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -156,10 +318,26 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.1.1"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -184,6 +362,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.15.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   nested:
     dependency: transitive
     description:
@@ -192,6 +378,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   path:
     dependency: transitive
     description:
@@ -204,26 +406,26 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7"
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.10"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -248,14 +450,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -264,6 +474,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.1"
   protobuf:
     dependency: transitive
     description:
@@ -280,6 +506,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.2"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
   settings_ui:
     dependency: "direct main"
     description:
@@ -288,11 +522,59 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.2"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.13"
   source_span:
     dependency: transitive
     description:
@@ -313,10 +595,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -329,10 +611,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -341,22 +623,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  test:
+    dependency: "direct main"
+    description:
+      name: test
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.25.8"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.5"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   universal_platform:
     dependency: "direct main"
     description:
@@ -369,10 +667,10 @@ packages:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.5.1"
   vector_math:
     dependency: transitive
     description:
@@ -385,18 +683,74 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
 sdks:
-  dart: ">=3.5.2 <4.0.0"
-  flutter: ">=3.22.0"
+  dart: ">=3.6.0 <4.0.0"
+  flutter: ">=3.24.0"

pubspec.yaml

@@ -1,10 +1,9 @@
 name: calorimeter
-description: "A new Flutter project."
+description: "Track your calories!"
 publish_to: 'none'
-version: 0.1.0
 
 environment:
-  sdk: ^3.5.2
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -19,11 +18,21 @@ dependencies:
   uuid: ^4.5.0
   barcode_scan2: ^4.3.3
   provider: ^6.1.2
+  test: ^1.25.7
+  go_router: ^14.3.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
+  flutter_launcher_icons: ^0.14.1
 
 flutter:
   uses-material-design: true
+  generate: true
+
+flutter_launcher_icons:
+  android: "launcher_icon"
+  image_path: "assets/icon.png"
+  adaptive_icon_background: "assets/icon_background.png"
+  adaptive_icon_foreground: "assets/icon.png"

test/split_with_ignore_test.dart

@@ -0,0 +1,59 @@
+import 'package:calorimeter/storage/storage.dart';
+import 'package:test/test.dart';
+
+void main() {
+  group(
+    'Test custom split with ignore',
+    () {
+      test('string without ignoring', () {
+        var testString = 'This is a test string';
+        var resultingList = testString.splitWithIgnore(' ');
+
+        expect(resultingList[0], equals('This'));
+        expect(resultingList[1], equals('is'));
+        expect(resultingList[2], equals('a'));
+        expect(resultingList[3], equals('test'));
+        expect(resultingList[4], equals('string'));
+      });
+
+      test('string that does not contain the ignored character', () {
+        var testString = 'This is a test string';
+        var resultingList = testString.splitWithIgnore(' ', ignoreIn: '"');
+
+        expect(resultingList[0], equals('This'));
+        expect(resultingList[1], equals('is'));
+        expect(resultingList[2], equals('a'));
+        expect(resultingList[3], equals('test'));
+        expect(resultingList[4], equals('string'));
+      });
+
+      test(
+        'string that contains ignored character',
+        () {
+          var testString = 'This is "a test" string';
+          var resultingList = testString.splitWithIgnore(' ', ignoreIn: '"');
+
+          expect(resultingList[0], equals('This'));
+          expect(resultingList[1], equals('is'));
+          expect(resultingList[2], equals('"a test"'));
+          expect(resultingList[3], equals('string'));
+        },
+      );
+
+      test(
+        'string that contains commas that should be ignored',
+        () {
+          var testString =
+              'f9a96b80-71f9-11ef-8df4-f3628a737a16,"Erdnüsse, geröstet",120.0,100.0';
+          var resultingList = testString.splitWithIgnore(',', ignoreIn: '"');
+
+          expect(
+              resultingList[0], equals('f9a96b80-71f9-11ef-8df4-f3628a737a16'));
+          expect(resultingList[1], equals('"Erdnüsse, geröstet"'));
+          expect(resultingList[2], equals('120.0'));
+          expect(resultingList[3], equals('100.0'));
+        },
+      );
+    },
+  );
+}