Compare commits
No commits in common. "master" and "swipeable-pages" have entirely different histories.
master
...
swipeable-
1
.flutter
1
.flutter
@ -1 +0,0 @@
|
||||
Subproject commit 17025dd88227cd9532c33fa78f5250d548d87e9a
|
||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule ".flutter"]
|
||||
path = .flutter
|
||||
url = https://github.com/flutter/flutter.git
|
||||
674
COPYING
674
COPYING
@ -1,674 +0,0 @@
|
||||
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>.
|
||||
@ -5,22 +5,11 @@ 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
|
||||
@ -31,25 +20,21 @@ 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 = 4
|
||||
versionName = "1.0.4"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
release {
|
||||
keyAlias = keystoreProperties['keyAlias']
|
||||
keyPassword = keystoreProperties['keyPassword']
|
||||
storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
|
||||
storePassword = keystoreProperties['storePassword']
|
||||
}
|
||||
versionCode = flutter.versionCode
|
||||
versionName = flutter.versionName
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
signingConfig = signingConfigs.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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
arb-dir: lib/l10n
|
||||
template-arb-file: app_en.arb
|
||||
output-localization-file: app_localizations.dart
|
||||
@ -1,10 +1,7 @@
|
||||
/* 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:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
class EnterFoodWidget extends StatefulWidget {
|
||||
final Function(BuildContext context, FoodEntryState entry) onAdd;
|
||||
@ -43,8 +40,8 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
|
||||
return TextFormField(
|
||||
controller: controller,
|
||||
focusNode: focusNode,
|
||||
decoration: InputDecoration(
|
||||
label: Text(AppLocalizations.of(context)!.name),
|
||||
decoration: const InputDecoration(
|
||||
label: Text("Name"),
|
||||
),
|
||||
);
|
||||
},
|
||||
@ -71,11 +68,9 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
|
||||
}),
|
||||
TextField(
|
||||
textAlign: TextAlign.end,
|
||||
decoration: InputDecoration(
|
||||
label: Align(
|
||||
alignment: Alignment.centerRight,
|
||||
child: Text(AppLocalizations.of(context)!.amountPer),
|
||||
),
|
||||
decoration: const InputDecoration(
|
||||
label:
|
||||
Align(alignment: Alignment.centerRight, child: Text("Menge")),
|
||||
),
|
||||
keyboardType: TextInputType.number,
|
||||
controller: massController,
|
||||
@ -83,11 +78,9 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
|
||||
),
|
||||
TextField(
|
||||
textAlign: TextAlign.end,
|
||||
decoration: InputDecoration(
|
||||
decoration: const InputDecoration(
|
||||
label: Align(
|
||||
alignment: Alignment.centerRight,
|
||||
child: Text(AppLocalizations.of(context)!.kcalper),
|
||||
)),
|
||||
alignment: Alignment.centerRight, child: Text("kcal pro"))),
|
||||
keyboardType: TextInputType.number,
|
||||
controller: kcalPerMassController,
|
||||
onSubmitted: (value) => onSubmitAction(),
|
||||
@ -112,8 +105,7 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
|
||||
try {
|
||||
massAsNumber = int.parse(massController.text.replaceAll(",", "."));
|
||||
} catch (e) {
|
||||
var snackbar = SnackBar(
|
||||
content: Text(AppLocalizations.of(context)!.errAmountNotANumber));
|
||||
var snackbar = const SnackBar(content: Text("Menge muss eine Zahl sein"));
|
||||
ScaffoldMessenger.of(context).clearSnackBars();
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackbar);
|
||||
return;
|
||||
@ -123,8 +115,8 @@ class _EnterFoodWidgetState extends State<EnterFoodWidget> {
|
||||
kcalPerMassAsNumber =
|
||||
int.parse(kcalPerMassController.text.replaceAll(",", "."));
|
||||
} catch (e) {
|
||||
var snackbar = SnackBar(
|
||||
content: Text(AppLocalizations.of(context)!.errKcalNotANumber));
|
||||
var snackbar =
|
||||
const SnackBar(content: Text("'kcal pro 100g' muss eine Zahl sein"));
|
||||
ScaffoldMessenger.of(context).removeCurrentSnackBar();
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackbar);
|
||||
return;
|
||||
|
||||
@ -1,130 +1,79 @@
|
||||
/* 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, GlobalEntryState> {
|
||||
final GlobalEntryState initialState;
|
||||
class FoodEntryBloc extends Bloc<FoodEvent, PageState> {
|
||||
final PageState initialState;
|
||||
final FoodStorage storage;
|
||||
final DateTime forDate;
|
||||
|
||||
FoodEntryBloc({required this.initialState, required this.storage})
|
||||
FoodEntryBloc(
|
||||
{required this.initialState,
|
||||
required this.forDate,
|
||||
required this.storage})
|
||||
: super(initialState) {
|
||||
on<PageBeingInitialized>(handlePageBeingInitialized);
|
||||
on<FoodEntryEvent>(handleFoodEntryEvent);
|
||||
on<FoodChangedEvent>(handleFoodChangedEvent);
|
||||
on<FoodDeletionEvent>(handleDeleteFoodEvent);
|
||||
on<BarcodeAboutToBeScanned>(handleBarcodeScannedEvent);
|
||||
on<BarcodeScanned>(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<GlobalEntryState> emit) async {
|
||||
var entriesForDate = state.foodEntries[event.forDate];
|
||||
entriesForDate ??= [];
|
||||
FoodEntryEvent event, Emitter<PageState> emit) async {
|
||||
PageState newState = PageState.from(state);
|
||||
newState.addEntry(event.entry);
|
||||
|
||||
entriesForDate.add(event.entry);
|
||||
|
||||
await storage.writeEntriesForDate(event.forDate, entriesForDate);
|
||||
await storage.writeEntriesForDate(forDate, newState.foodEntries);
|
||||
storage.addFoodEntryToLookupDatabase(event.entry);
|
||||
|
||||
// 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));
|
||||
emit(newState);
|
||||
}
|
||||
|
||||
void handleFoodChangedEvent(
|
||||
FoodChangedEvent event, Emitter<GlobalEntryState> emit) async {
|
||||
var entriesForDate = state.foodEntries[event.forDate];
|
||||
if (entriesForDate == null) return;
|
||||
|
||||
var index = entriesForDate.indexWhere((entry) {
|
||||
FoodChangedEvent event, Emitter<PageState> emit) async {
|
||||
var entries = state.foodEntries;
|
||||
var index = entries.indexWhere((entry) {
|
||||
return entry.id == event.newEntry.id;
|
||||
});
|
||||
|
||||
entriesForDate.removeAt(index);
|
||||
entriesForDate.insert(index, event.newEntry);
|
||||
entries.removeAt(index);
|
||||
entries.insert(index, event.newEntry);
|
||||
|
||||
await storage.writeEntriesForDate(event.forDate, entriesForDate);
|
||||
await storage.writeEntriesForDate(forDate, entries);
|
||||
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));
|
||||
emit(PageState(foodEntries: entries));
|
||||
}
|
||||
|
||||
void handleDeleteFoodEvent(
|
||||
FoodDeletionEvent event, Emitter<GlobalEntryState> emit) async {
|
||||
var entriesForDate = state.foodEntries[event.forDate];
|
||||
if (entriesForDate == null) return;
|
||||
FoodDeletionEvent event, Emitter<PageState> emit) async {
|
||||
state.foodEntries.removeWhere((entry) => entry.id == event.entryID);
|
||||
|
||||
entriesForDate.removeWhere((entry) => entry.id == event.entryID);
|
||||
await storage.writeEntriesForDate(forDate, state.foodEntries);
|
||||
|
||||
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));
|
||||
emit(PageState.from(state));
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
BarcodeScanned event, Emitter<PageState> emit) async {
|
||||
var client = FoodFactLookupClient();
|
||||
var scanResult = await event.scanResultFuture;
|
||||
|
||||
if (scanResult.type == ResultType.Cancelled) {
|
||||
return;
|
||||
}
|
||||
if (scanResult.type == ResultType.Error) {
|
||||
emit(GlobalEntryState(
|
||||
emit(PageState(
|
||||
foodEntries: state.foodEntries,
|
||||
appError: GlobalAppError(GlobalAppErrorType.errGeneralError)));
|
||||
errorString: "Fehler beim Scannen des Barcodes"));
|
||||
return;
|
||||
}
|
||||
var responseFuture = client.retrieveFoodInfo(scanResult.rawContent);
|
||||
|
||||
List<FoodEntryState> newList = List.from(state.foodEntries);
|
||||
var newEntryWaiting = FoodEntryState(
|
||||
kcalPer100: 0,
|
||||
name: "",
|
||||
@ -132,14 +81,11 @@ class FoodEntryBloc extends Bloc<FoodEvent, GlobalEntryState> {
|
||||
waitingForNetwork: true,
|
||||
isSelected: false,
|
||||
);
|
||||
|
||||
entriesForDate.add(newEntryWaiting);
|
||||
var newFoodEntries = state.foodEntries;
|
||||
newFoodEntries.addAll({event.forDate: entriesForDate});
|
||||
emit(GlobalEntryState(foodEntries: newFoodEntries));
|
||||
newList.add(newEntryWaiting);
|
||||
emit(PageState(foodEntries: newList));
|
||||
|
||||
await responseFuture.then((response) async {
|
||||
var index = entriesForDate
|
||||
var index = newList
|
||||
.indexWhere((entryState) => entryState.id == newEntryWaiting.id);
|
||||
|
||||
// element not found (was deleted previously)
|
||||
@ -148,25 +94,26 @@ class FoodEntryBloc extends Bloc<FoodEvent, GlobalEntryState> {
|
||||
}
|
||||
|
||||
if (response.status == FoodFactResponseStatus.barcodeNotFound) {
|
||||
entriesForDate.removeWhere((entry) => entry.id == newEntryWaiting.id);
|
||||
var newFoodEntries = state.foodEntries;
|
||||
newFoodEntries.addAll({event.forDate: entriesForDate});
|
||||
List<FoodEntryState> listWithEntryRemoved =
|
||||
List.from(state.foodEntries);
|
||||
listWithEntryRemoved
|
||||
.removeWhere((entry) => entry.id == newEntryWaiting.id);
|
||||
|
||||
emit(GlobalEntryState(
|
||||
foodEntries: newFoodEntries,
|
||||
appError: GlobalAppError(GlobalAppErrorType.errbarcodeNotFound)));
|
||||
emit(PageState(
|
||||
foodEntries: listWithEntryRemoved,
|
||||
errorString: "Barcode konnte nicht gefunden werden."));
|
||||
return;
|
||||
}
|
||||
if (response.status ==
|
||||
FoodFactResponseStatus.foodFactServerNotReachable) {
|
||||
entriesForDate.removeWhere((entry) => entry.id == newEntryWaiting.id);
|
||||
var newFoodEntries = state.foodEntries;
|
||||
newFoodEntries.addAll({event.forDate: entriesForDate});
|
||||
List<FoodEntryState> listWithEntryRemoved =
|
||||
List.from(state.foodEntries);
|
||||
listWithEntryRemoved
|
||||
.removeWhere((entry) => entry.id == newEntryWaiting.id);
|
||||
|
||||
emit(GlobalEntryState(
|
||||
foodEntries: newFoodEntries,
|
||||
appError:
|
||||
GlobalAppError(GlobalAppErrorType.errServerNotReachable)));
|
||||
emit(PageState(
|
||||
foodEntries: listWithEntryRemoved,
|
||||
errorString: "OpenFoodFacts-Server konnte nicht erreicht werden."));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -178,116 +125,91 @@ class FoodEntryBloc extends Bloc<FoodEvent, GlobalEntryState> {
|
||||
isSelected: false,
|
||||
);
|
||||
|
||||
entriesForDate.removeAt(index);
|
||||
entriesForDate.insert(index, newEntryFinishedWaiting);
|
||||
newList.removeAt(index);
|
||||
newList.insert(index, newEntryFinishedWaiting);
|
||||
|
||||
await storage.writeEntriesForDate(event.forDate, entriesForDate);
|
||||
await storage.writeEntriesForDate(forDate, newList);
|
||||
storage.addFoodEntryToLookupDatabase(newEntryFinishedWaiting);
|
||||
|
||||
var entriesFromStorage = await storage.getEntriesForDate(event.forDate);
|
||||
var newFoodEntries = state.foodEntries;
|
||||
newFoodEntries.addAll({event.forDate: entriesFromStorage});
|
||||
|
||||
emit(GlobalEntryState(foodEntries: newFoodEntries));
|
||||
emit(PageState(foodEntries: newList));
|
||||
});
|
||||
}
|
||||
|
||||
void handleFoodEntryTapped(
|
||||
FoodEntryTapped event, Emitter<GlobalEntryState> emit) async {
|
||||
var entriesForDate = state.foodEntries[event.forDate];
|
||||
if (entriesForDate == null) return;
|
||||
|
||||
FoodEntryTapped event, Emitter<PageState> emit) async {
|
||||
var oldStateOfTappedEntry = event.entry.isSelected;
|
||||
|
||||
for (var entry in entriesForDate) {
|
||||
for (var entry in state.foodEntries) {
|
||||
entry.isSelected = false;
|
||||
}
|
||||
|
||||
var selectedEntry = entriesForDate.firstWhere((entry) {
|
||||
var selectedEntry = state.foodEntries.firstWhere((entry) {
|
||||
return entry.id == event.entry.id;
|
||||
});
|
||||
|
||||
selectedEntry.isSelected = !oldStateOfTappedEntry;
|
||||
|
||||
emit(GlobalEntryState(foodEntries: state.foodEntries));
|
||||
emit(PageState(foodEntries: state.foodEntries));
|
||||
}
|
||||
}
|
||||
|
||||
class FoodEvent {
|
||||
final DateTime forDate;
|
||||
|
||||
FoodEvent({required this.forDate});
|
||||
}
|
||||
|
||||
class PageBeingInitialized extends FoodEvent {
|
||||
PageBeingInitialized({required super.forDate});
|
||||
}
|
||||
class FoodEvent {}
|
||||
|
||||
class FoodEntryEvent extends FoodEvent {
|
||||
final FoodEntryState entry;
|
||||
|
||||
FoodEntryEvent({required this.entry, required super.forDate});
|
||||
FoodEntryEvent({required this.entry});
|
||||
}
|
||||
|
||||
class FoodChangedEvent extends FoodEvent {
|
||||
final FoodEntryState newEntry;
|
||||
|
||||
FoodChangedEvent({required this.newEntry, required super.forDate});
|
||||
FoodChangedEvent({required this.newEntry});
|
||||
}
|
||||
|
||||
class FoodDeletionEvent extends FoodEvent {
|
||||
final String entryID;
|
||||
|
||||
FoodDeletionEvent({required this.entryID, required super.forDate});
|
||||
FoodDeletionEvent({required this.entryID});
|
||||
}
|
||||
|
||||
class BarcodeAboutToBeScanned extends FoodEvent {
|
||||
BarcodeAboutToBeScanned({required super.forDate});
|
||||
class BarcodeScanned extends FoodEvent {
|
||||
final Future<ScanResult> scanResultFuture;
|
||||
|
||||
BarcodeScanned({required this.scanResultFuture});
|
||||
}
|
||||
|
||||
class FoodEntryTapped extends FoodEvent {
|
||||
final FoodEntryState entry;
|
||||
|
||||
FoodEntryTapped({required this.entry, required super.forDate});
|
||||
}
|
||||
|
||||
class PermissionException extends FoodEvent {
|
||||
PermissionException({required super.forDate});
|
||||
FoodEntryTapped({required this.entry});
|
||||
}
|
||||
|
||||
/// This is the state for one date/page
|
||||
class GlobalEntryState {
|
||||
final Map<DateTime, List<FoodEntryState>> foodEntries;
|
||||
final GlobalAppError? appError;
|
||||
class PageState {
|
||||
final List<FoodEntryState> foodEntries;
|
||||
final String? errorString;
|
||||
|
||||
GlobalEntryState({required this.foodEntries, this.appError});
|
||||
PageState({required this.foodEntries, this.errorString});
|
||||
|
||||
factory GlobalEntryState.init() {
|
||||
return GlobalEntryState(foodEntries: {});
|
||||
factory PageState.init() {
|
||||
return PageState(foodEntries: []);
|
||||
}
|
||||
|
||||
static from(GlobalEntryState state) {
|
||||
return GlobalEntryState(foodEntries: state.foodEntries);
|
||||
static from(PageState state) {
|
||||
return PageState(foodEntries: state.foodEntries);
|
||||
}
|
||||
|
||||
bool addEntry(FoodEntryState entry, DateTime date) {
|
||||
var list = foodEntries[date];
|
||||
|
||||
if (list == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
list.add(entry);
|
||||
|
||||
return true;
|
||||
void addEntry(FoodEntryState entry) {
|
||||
foodEntries.add(entry);
|
||||
}
|
||||
}
|
||||
|
||||
class FoodEntryState {
|
||||
final String id;
|
||||
final String name;
|
||||
final int mass;
|
||||
final int kcalPer100;
|
||||
final String id;
|
||||
final bool waitingForNetwork;
|
||||
bool isSelected;
|
||||
|
||||
@ -324,29 +246,3 @@ class FoodEntryState {
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
/* 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 FoodEntryState entry;
|
||||
@ -166,8 +163,8 @@ class _FoodEntryChangeDialogState extends State<FoodEntryChangeDialog> {
|
||||
child: TextField(
|
||||
onSubmitted: (val) => _onSubmitAction(),
|
||||
controller: nameController,
|
||||
decoration: InputDecoration(
|
||||
label: Text(AppLocalizations.of(context)!.name),
|
||||
decoration: const InputDecoration(
|
||||
label: Text("Name"),
|
||||
),
|
||||
),
|
||||
),
|
||||
@ -178,8 +175,8 @@ class _FoodEntryChangeDialogState extends State<FoodEntryChangeDialog> {
|
||||
child: TextField(
|
||||
onSubmitted: (val) => _onSubmitAction(),
|
||||
controller: massController,
|
||||
decoration: InputDecoration(
|
||||
label: Text(AppLocalizations.of(context)!.amountPer),
|
||||
decoration: const InputDecoration(
|
||||
label: Text("Menge"),
|
||||
),
|
||||
),
|
||||
),
|
||||
@ -190,8 +187,8 @@ class _FoodEntryChangeDialogState extends State<FoodEntryChangeDialog> {
|
||||
child: TextField(
|
||||
onSubmitted: (val) => _onSubmitAction(),
|
||||
controller: kcalPer100Controller,
|
||||
decoration: InputDecoration(
|
||||
label: Text(AppLocalizations.of(context)!.kcalper),
|
||||
decoration: const InputDecoration(
|
||||
label: Text("kcal pro Menge"),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* 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';
|
||||
@ -56,41 +54,19 @@ class FoodFactModel {
|
||||
});
|
||||
|
||||
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;
|
||||
int quantity;
|
||||
|
||||
try {
|
||||
quantity = double.parse(quantityString);
|
||||
quantity = int.parse(quantityString);
|
||||
} catch (e) {
|
||||
quantity = 0;
|
||||
}
|
||||
|
||||
return FoodFactModel(
|
||||
name: json['product']['product_name'] ?? "",
|
||||
kcalPer100g: kcalPer100gForModel,
|
||||
mass: quantity.ceil(),
|
||||
);
|
||||
name: json['product']['product_name'],
|
||||
kcalPer100g: json['product']['nutriments']['energy-kcal_100g'],
|
||||
mass: quantity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{
|
||||
"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."
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
{
|
||||
"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."
|
||||
}
|
||||
@ -1,28 +1,19 @@
|
||||
/* 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/perdate/perdate_pageview.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();
|
||||
|
||||
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();
|
||||
|
||||
@ -51,13 +42,6 @@ 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),
|
||||
@ -82,16 +66,25 @@ class MainApp extends StatelessWidget {
|
||||
GoRoute(
|
||||
path: '/',
|
||||
builder: (context, state) {
|
||||
return PerDatePageViewController(
|
||||
initialDate: DateTimeHelper.now(),
|
||||
return PerDatePageview(
|
||||
initalDate: DateTime.now().copyWith(
|
||||
hour: 0,
|
||||
minute: 0,
|
||||
second: 0,
|
||||
millisecond: 0,
|
||||
microsecond: 0,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: [
|
||||
Locale('en'),
|
||||
localizationsDelegates: const [
|
||||
GlobalMaterialLocalizations.delegate,
|
||||
GlobalWidgetsLocalizations.delegate,
|
||||
GlobalCupertinoLocalizations.delegate,
|
||||
],
|
||||
supportedLocales: const [
|
||||
Locale('de'),
|
||||
],
|
||||
theme: ThemeData(
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* 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';
|
||||
@ -8,11 +6,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
class FoodEntryList extends StatelessWidget {
|
||||
final List<FoodEntryState> entries;
|
||||
final DateTime date;
|
||||
|
||||
const FoodEntryList({
|
||||
required this.entries,
|
||||
required this.date,
|
||||
super.key,
|
||||
});
|
||||
|
||||
@ -29,7 +25,7 @@ class FoodEntryList extends StatelessWidget {
|
||||
onAdd: (context, entry) {
|
||||
context
|
||||
.read<FoodEntryBloc>()
|
||||
.add(FoodEntryEvent(entry: entry, forDate: date));
|
||||
.add(FoodEntryEvent(entry: entry));
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 75),
|
||||
@ -44,19 +40,19 @@ class FoodEntryList extends StatelessWidget {
|
||||
key: ValueKey(entries[entryIndex].id),
|
||||
entry: entries[entryIndex],
|
||||
onDelete: (_, id) {
|
||||
context
|
||||
.read<FoodEntryBloc>()
|
||||
.add(FoodDeletionEvent(entryID: id, forDate: date));
|
||||
context.read<FoodEntryBloc>().add(FoodDeletionEvent(
|
||||
entryID: id,
|
||||
));
|
||||
},
|
||||
onChange: (_, changedEntry) {
|
||||
context.read<FoodEntryBloc>().add(
|
||||
FoodChangedEvent(newEntry: changedEntry, forDate: date),
|
||||
);
|
||||
context
|
||||
.read<FoodEntryBloc>()
|
||||
.add(FoodChangedEvent(newEntry: changedEntry));
|
||||
},
|
||||
onTap: (_, tappedEntry) {
|
||||
context.read<FoodEntryBloc>().add(
|
||||
FoodEntryTapped(entry: tappedEntry, forDate: date),
|
||||
);
|
||||
context
|
||||
.read<FoodEntryBloc>()
|
||||
.add(FoodEntryTapped(entry: tappedEntry));
|
||||
},
|
||||
),
|
||||
const Divider(),
|
||||
|
||||
@ -1,52 +1,76 @@
|
||||
/* 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 {
|
||||
class PerDatePageview extends StatefulWidget {
|
||||
// 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;
|
||||
final DateTime initalDate;
|
||||
const PerDatePageview({required this.initalDate, super.key});
|
||||
|
||||
const PerDatePageView({
|
||||
required this.initialDate,
|
||||
required this.pageController,
|
||||
super.key,
|
||||
});
|
||||
@override
|
||||
State<PerDatePageview> createState() => _PerDatePageviewState();
|
||||
}
|
||||
|
||||
class _PerDatePageviewState extends State<PerDatePageview> {
|
||||
late PageController pageController;
|
||||
late DateTime displayedDate;
|
||||
late List<int> visitedIndexes = [];
|
||||
final int initialOffset = 36500000;
|
||||
|
||||
//TODO: that is just ugly
|
||||
bool backButtonWasPressed = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
pageController = PageController(initialPage: initialOffset);
|
||||
displayedDate = widget.initalDate;
|
||||
visitedIndexes.add(initialOffset);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
log("PerDatePageView's build()");
|
||||
return PageView.builder(
|
||||
reverse: true,
|
||||
controller: pageController,
|
||||
onPageChanged: (value) {
|
||||
log("onPageChanged() with value $value");
|
||||
return BackButtonListener(
|
||||
onBackButtonPressed: () async {
|
||||
if (visitedIndexes.length == 1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var diff = value - pageController.initialPage;
|
||||
var newDate = initialDate.subtract(Duration(days: diff));
|
||||
log("newDate = $newDate");
|
||||
visitedIndexes.removeLast();
|
||||
|
||||
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));
|
||||
backButtonWasPressed = true;
|
||||
pageController.jumpToPage(visitedIndexes.last);
|
||||
|
||||
return PerDateWidget(
|
||||
key: ValueKey(dateToBuildWidgetFor.toString()),
|
||||
date: dateToBuildWidgetFor,
|
||||
);
|
||||
});
|
||||
return true;
|
||||
},
|
||||
child: PageView.builder(
|
||||
reverse: true,
|
||||
controller: pageController,
|
||||
onPageChanged: (value) {
|
||||
if (backButtonWasPressed) {
|
||||
backButtonWasPressed = false;
|
||||
return;
|
||||
}
|
||||
|
||||
visitedIndexes.add(value);
|
||||
},
|
||||
itemBuilder: (context, index) {
|
||||
var dateToBuildWidgetFor =
|
||||
displayedDate.subtract(Duration(days: index - initialOffset));
|
||||
|
||||
return PerDateWidget(
|
||||
key: ValueKey(dateToBuildWidgetFor.toString()),
|
||||
date: dateToBuildWidgetFor,
|
||||
onDateSelected: (dateSelected) {
|
||||
if (dateSelected == null) return;
|
||||
|
||||
var diff = dateSelected.difference(dateToBuildWidgetFor);
|
||||
var newIndex = index - diff.inDays;
|
||||
|
||||
pageController.jumpToPage(newIndex);
|
||||
});
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,148 +0,0 @@
|
||||
/* 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);
|
||||
}
|
||||
}
|
||||
@ -1,13 +1,23 @@
|
||||
/* 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/utils/scan_food_floating_button.dart';
|
||||
import 'package:calorimeter/utils/app_drawer.dart';
|
||||
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;
|
||||
const PerDateWidget({super.key, required this.date});
|
||||
final Function(DateTime?) onDateSelected;
|
||||
const PerDateWidget(
|
||||
{super.key, required this.date, required this.onDateSelected});
|
||||
|
||||
@override
|
||||
State<PerDateWidget> createState() => _PerDateWidgetState();
|
||||
@ -15,36 +25,91 @@ class PerDateWidget extends StatefulWidget {
|
||||
|
||||
class _PerDateWidgetState extends State<PerDateWidget>
|
||||
with AutomaticKeepAliveClientMixin<PerDateWidget> {
|
||||
late FoodStorage storage;
|
||||
late Future<List<FoodEntryState>> entriesFuture;
|
||||
List<FoodEntryState> entries = [];
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
context
|
||||
.read<FoodEntryBloc>()
|
||||
.add(PageBeingInitialized(forDate: widget.date));
|
||||
storage = FoodStorage.getInstance();
|
||||
entriesFuture = storage.getEntriesForDate(widget.date);
|
||||
entriesFuture.then((val) {
|
||||
entries = val;
|
||||
});
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
super.build(context);
|
||||
|
||||
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);
|
||||
},
|
||||
);
|
||||
return FutureBuilder(
|
||||
future: entriesFuture,
|
||||
builder: (context, snapshot) {
|
||||
return snapshot.connectionState != ConnectionState.done
|
||||
? const Center(child: CircularProgressIndicator())
|
||||
: MultiProvider(
|
||||
providers: [
|
||||
BlocProvider(
|
||||
create: (context) => FoodEntryBloc(
|
||||
initialState: PageState(foodEntries: entries),
|
||||
storage: storage,
|
||||
forDate: widget.date,
|
||||
),
|
||||
)
|
||||
],
|
||||
child: BlocConsumer<FoodEntryBloc, PageState>(
|
||||
listener: (context, pageState) {
|
||||
if (pageState.errorString != null) {
|
||||
showNewSnackbarWith(context, pageState.errorString!);
|
||||
}
|
||||
},
|
||||
builder: (context, pageState) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(
|
||||
DateFormat.yMMMMd('de').format(widget.date)),
|
||||
actions: const [ThemeSwitcherButton()],
|
||||
),
|
||||
body: FoodEntryList(entries: pageState.foodEntries),
|
||||
bottomNavigationBar: BottomAppBar(
|
||||
shape: const RectangularNotchShape(),
|
||||
color: Theme.of(context).colorScheme.secondary,
|
||||
child: SumWidget(
|
||||
foodEntries: pageState.foodEntries)),
|
||||
drawer: const AppDrawer(),
|
||||
floatingActionButton: OverflowBar(children: [
|
||||
ScanFoodFloatingButton(
|
||||
onPressed: () {
|
||||
var result = BarcodeScanner.scan();
|
||||
context.read<FoodEntryBloc>().add(
|
||||
BarcodeScanned(scanResultFuture: result));
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
CalendarFloatingButton(
|
||||
startFromDate: widget.date,
|
||||
onDateSelected: (dateSelected) {
|
||||
widget.onDateSelected(dateSelected);
|
||||
},
|
||||
),
|
||||
]),
|
||||
floatingActionButtonLocation:
|
||||
FloatingActionButtonLocation.endDocked);
|
||||
},
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
void showNewSnackbarWith(BuildContext context, GlobalAppError error) {
|
||||
var snackbar = ErrorSnackbar(
|
||||
colorScheme: Theme.of(context).colorScheme,
|
||||
text: error.toErrorString(context));
|
||||
void showNewSnackbarWith(BuildContext context, String text) {
|
||||
var snackbar =
|
||||
ErrorSnackbar(colorScheme: Theme.of(context).colorScheme, text: text);
|
||||
|
||||
ScaffoldMessenger.of(context)
|
||||
..removeCurrentSnackBar()
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
/* 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';
|
||||
|
||||
@ -160,7 +157,7 @@ class FoodStorage {
|
||||
// get a list of dates of the last 365 days
|
||||
var dates = List<DateTime>.generate(365, (idx) {
|
||||
var durationToPast = Duration(days: idx);
|
||||
return DateTimeHelper.now().subtract(durationToPast);
|
||||
return DateTime.now().subtract(durationToPast);
|
||||
});
|
||||
|
||||
for (var date in dates.reversed) {
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
/* 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({
|
||||
@ -20,17 +17,16 @@ class AppDrawer extends StatelessWidget {
|
||||
color: Colors.redAccent,
|
||||
),
|
||||
child: ListTile(
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.close),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
title: Text(AppLocalizations.of(context)!.menu),
|
||||
),
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.close),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
title: const Text('Menü')),
|
||||
),
|
||||
ListTile(
|
||||
title: Text(AppLocalizations.of(context)!.settings),
|
||||
title: const Text('Einstellungen'),
|
||||
trailing: const Icon(Icons.settings),
|
||||
onTap: () {
|
||||
Navigator.of(context).pop();
|
||||
|
||||
@ -1,13 +1,10 @@
|
||||
/* 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 CalendarFAB extends StatelessWidget {
|
||||
class CalendarFloatingButton extends StatelessWidget {
|
||||
final DateTime startFromDate;
|
||||
final Function(DateTime?) onDateSelected;
|
||||
|
||||
const CalendarFAB(
|
||||
const CalendarFloatingButton(
|
||||
{super.key, required this.startFromDate, required this.onDateSelected});
|
||||
|
||||
@override
|
||||
@ -15,20 +12,20 @@ class CalendarFAB extends StatelessWidget {
|
||||
return FloatingActionButton(
|
||||
onPressed: () async {
|
||||
var datePicked = await showDatePicker(
|
||||
locale: const Locale('de'),
|
||||
context: context,
|
||||
initialDate: startFromDate,
|
||||
currentDate: DateTimeHelper.now(),
|
||||
firstDate:
|
||||
DateTimeHelper.now().subtract(const Duration(days: 365 * 10)),
|
||||
lastDate: DateTimeHelper.now().add(const Duration(days: 365 * 10)),
|
||||
currentDate: DateTime.now(),
|
||||
firstDate: DateTime.now().subtract(const Duration(days: 365 * 10)),
|
||||
lastDate: DateTime.now().add(const Duration(days: 365 * 10)),
|
||||
);
|
||||
|
||||
if (!context.mounted) return;
|
||||
|
||||
onDateSelected(datePicked?.copyWith(isUtc: true));
|
||||
onDateSelected(datePicked);
|
||||
},
|
||||
heroTag: "calendarFAB",
|
||||
child: const Icon(Icons.date_range),
|
||||
child: const Icon(Icons.today),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
/* 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,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
/* 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 {
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* 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 {
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-or-later */
|
||||
/* Copyright (C) 2024 Marco Groß <mgross@sw-gross.de> */
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class ScanFoodFAB extends StatelessWidget {
|
||||
class ScanFoodFloatingButton extends StatelessWidget {
|
||||
final Function() onPressed;
|
||||
const ScanFoodFAB({super.key, required this.onPressed});
|
||||
const ScanFoodFloatingButton({super.key, required this.onPressed});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
||||
@ -1,11 +1,8 @@
|
||||
/* 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});
|
||||
@ -24,24 +21,33 @@ class _SettingsWidgetState extends State<SettingsWidget> {
|
||||
builder: (context, state) {
|
||||
return SettingsList(sections: [
|
||||
SettingsSection(
|
||||
title: Text(AppLocalizations.of(context)!.yourSettings),
|
||||
title: const Text('Deine persönlichen Einstellungen'),
|
||||
tiles: [
|
||||
SettingsTile.navigation(
|
||||
leading: const Icon(Icons.food_bank),
|
||||
title: Text(AppLocalizations.of(context)!.dayLimit),
|
||||
title: const Text('Kalorienlimit pro Tag'),
|
||||
value: Text(state.kcalLimit.toString()),
|
||||
onPressed: (context) async {
|
||||
await showDialog(
|
||||
builder: (ctx) {
|
||||
return AlertDialog(
|
||||
title: Text(AppLocalizations.of(context)!.dayLimit),
|
||||
content: TextField(
|
||||
controller: kcalPerDayCtrl,
|
||||
onSubmitted: (val) => submitDailyKcal()),
|
||||
title: const Text("Kalorienlimit pro Tag"),
|
||||
content: TextField(controller: kcalPerDayCtrl),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => submitDailyKcal(),
|
||||
child: Text(AppLocalizations.of(context)!.ok))
|
||||
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'))
|
||||
],
|
||||
);
|
||||
},
|
||||
@ -52,18 +58,7 @@ class _SettingsWidgetState extends State<SettingsWidget> {
|
||||
]);
|
||||
}),
|
||||
drawer: const AppDrawer(),
|
||||
appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
|
||||
appBar: AppBar(title: const Text('Einstellungen')),
|
||||
);
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* 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';
|
||||
|
||||
|
||||
@ -1,63 +1,56 @@
|
||||
/* 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 DateTime date;
|
||||
|
||||
const SumWidget({super.key, required this.date});
|
||||
final List<FoodEntryState> foodEntries;
|
||||
const SumWidget({required this.foodEntries, super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
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;
|
||||
return BlocBuilder<SettingsDataBloc, SettingsState>(
|
||||
builder: (context, state) {
|
||||
var sum = 0.0;
|
||||
for (var entry in foodEntries) {
|
||||
sum += entry.kcalPer100 / 100 * entry.mass;
|
||||
}
|
||||
var diff = state.kcalLimit - sum;
|
||||
var diffLimit = state.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(
|
||||
'${AppLocalizations.of(context)!.kcalToday}: ${sum.ceil().toString()}/${settingsState.kcalLimit.ceil()}',
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.bodyLarge!
|
||||
.copyWith(color: newTextColor),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
return Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
'kcal heute: ${sum.ceil().toString()}/${state.kcalLimit.ceil()}',
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.bodyLarge!
|
||||
.copyWith(color: newTextColor),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* 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';
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
/* 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';
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
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.
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 411 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 98 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 97 KiB |
@ -1 +0,0 @@
|
||||
Track your calories!
|
||||
@ -1 +0,0 @@
|
||||
Calorimeter
|
||||
174
pubspec.lock
174
pubspec.lock
@ -5,39 +5,39 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: _fe_analyzer_shared
|
||||
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
|
||||
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "76.0.0"
|
||||
version: "72.0.0"
|
||||
_macros:
|
||||
dependency: transitive
|
||||
description: dart
|
||||
source: sdk
|
||||
version: "0.3.3"
|
||||
version: "0.3.2"
|
||||
analyzer:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: analyzer
|
||||
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
|
||||
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.11.0"
|
||||
version: "6.7.0"
|
||||
archive:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: archive
|
||||
sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
|
||||
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.2"
|
||||
version: "3.6.1"
|
||||
args:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: args
|
||||
sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
|
||||
sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.6.0"
|
||||
version: "2.5.0"
|
||||
async:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -90,10 +90,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cli_util
|
||||
sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
|
||||
sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.4.2"
|
||||
version: "0.4.1"
|
||||
clock:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -106,34 +106,34 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
|
||||
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.19.0"
|
||||
version: "1.18.0"
|
||||
convert:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: convert
|
||||
sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
|
||||
sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.2"
|
||||
version: "3.1.1"
|
||||
coverage:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: coverage
|
||||
sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
|
||||
sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.11.1"
|
||||
version: "1.9.2"
|
||||
crypto:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: crypto
|
||||
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
|
||||
sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.6"
|
||||
version: "3.0.5"
|
||||
fake_async:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -154,18 +154,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file
|
||||
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
|
||||
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.0.1"
|
||||
version: "7.0.0"
|
||||
fixnum:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fixnum
|
||||
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
|
||||
sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.0"
|
||||
flutter:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
@ -183,10 +183,10 @@ packages:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: flutter_launcher_icons
|
||||
sha256: "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5"
|
||||
sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.14.2"
|
||||
version: "0.14.1"
|
||||
flutter_lints:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@ -230,34 +230,34 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: go_router
|
||||
sha256: "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539"
|
||||
sha256: "6f1b756f6e863259a99135ff3c95026c3cdca17d10ebef2bba2261a25ddc8bbc"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "14.6.2"
|
||||
version: "14.3.0"
|
||||
http_multi_server:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http_multi_server
|
||||
sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
|
||||
sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.2.2"
|
||||
version: "3.2.1"
|
||||
http_parser:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http_parser
|
||||
sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
|
||||
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.1.1"
|
||||
version: "4.0.2"
|
||||
image:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image
|
||||
sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6"
|
||||
sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.5.2"
|
||||
version: "4.2.0"
|
||||
intl:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -270,10 +270,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: io
|
||||
sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
|
||||
sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.5"
|
||||
version: "1.0.4"
|
||||
js:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -294,18 +294,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
|
||||
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.0.7"
|
||||
version: "10.0.5"
|
||||
leak_tracker_flutter_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_flutter_testing
|
||||
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
|
||||
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.8"
|
||||
version: "3.0.5"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -318,26 +318,26 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: lints
|
||||
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
|
||||
sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.1.1"
|
||||
version: "5.0.0"
|
||||
logging:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: logging
|
||||
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
|
||||
sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
version: "1.2.0"
|
||||
macros:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: macros
|
||||
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
|
||||
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.1.3-main.0"
|
||||
version: "0.1.2-main.4"
|
||||
matcher:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -390,10 +390,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: package_config
|
||||
sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
|
||||
sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
version: "2.1.0"
|
||||
path:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -406,26 +406,26 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: path_provider
|
||||
sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
|
||||
sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.5"
|
||||
version: "2.1.4"
|
||||
path_provider_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_android
|
||||
sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
|
||||
sha256: f7544c346a0742aee1450f9e5c0f5269d7c602b9c95fdbcd9fb8f5b1df13b1cc
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.2.15"
|
||||
version: "2.2.11"
|
||||
path_provider_foundation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_provider_foundation
|
||||
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
|
||||
sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.1"
|
||||
version: "2.4.0"
|
||||
path_provider_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -462,10 +462,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: platform
|
||||
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
|
||||
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.6"
|
||||
version: "3.1.5"
|
||||
plugin_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -482,14 +482,6 @@ packages:
|
||||
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:
|
||||
@ -510,10 +502,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: pub_semver
|
||||
sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
|
||||
sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.5"
|
||||
version: "2.1.4"
|
||||
settings_ui:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -526,10 +518,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: shelf
|
||||
sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
|
||||
sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.2"
|
||||
version: "1.4.1"
|
||||
shelf_packages_handler:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -550,15 +542,15 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: shelf_web_socket
|
||||
sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
|
||||
sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
version: "2.0.0"
|
||||
sky_engine:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
version: "0.0.99"
|
||||
source_map_stack_trace:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -571,10 +563,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: source_maps
|
||||
sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
|
||||
sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.10.13"
|
||||
version: "0.10.12"
|
||||
source_span:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -595,10 +587,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stack_trace
|
||||
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
|
||||
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.12.0"
|
||||
version: "1.11.1"
|
||||
stream_channel:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -611,10 +603,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: string_scanner
|
||||
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
|
||||
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
version: "1.2.0"
|
||||
term_glyph:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -627,34 +619,34 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: test
|
||||
sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
|
||||
sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.25.8"
|
||||
version: "1.25.7"
|
||||
test_api:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
|
||||
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.3"
|
||||
version: "0.7.2"
|
||||
test_core:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_core
|
||||
sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
|
||||
sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.5"
|
||||
version: "0.6.4"
|
||||
typed_data:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: typed_data
|
||||
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
|
||||
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.0"
|
||||
version: "1.3.2"
|
||||
universal_platform:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -683,18 +675,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vm_service
|
||||
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
|
||||
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "14.3.0"
|
||||
version: "14.2.5"
|
||||
watcher:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: watcher
|
||||
sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
|
||||
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.0"
|
||||
web:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -747,10 +739,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: yaml
|
||||
sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
|
||||
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.3"
|
||||
version: "3.1.2"
|
||||
sdks:
|
||||
dart: ">=3.6.0 <4.0.0"
|
||||
dart: ">=3.5.3 <4.0.0"
|
||||
flutter: ">=3.24.0"
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
name: calorimeter
|
||||
description: "Track your calories!"
|
||||
description: "A new Flutter project."
|
||||
publish_to: 'none'
|
||||
version: 1.1.0
|
||||
|
||||
environment:
|
||||
sdk: ^3.5.3
|
||||
@ -29,7 +30,6 @@ dev_dependencies:
|
||||
|
||||
flutter:
|
||||
uses-material-design: true
|
||||
generate: true
|
||||
|
||||
flutter_launcher_icons:
|
||||
android: "launcher_icon"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user