mirror of
https://github.com/dzeiocom/OpenHealth.git
synced 2025-04-22 19:02:16 +00:00
feat: Continue work on Chart
This commit is contained in:
parent
f6b5715572
commit
4a9d4b8ede
674
LICENSE
674
LICENSE
@ -1,21 +1,661 @@
|
|||||||
MIT License
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
Copyright (c) 2022 Florian Bouillon
|
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.
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Preamble
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
copies or substantial portions of the Software.
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
The licenses for most software and other practical works are designed
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
to take away your freedom to share and change the works. By contrast,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
share and change all versions of a program--to make sure it remains free
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
software for all its users.
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
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.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
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 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 work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
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 AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
@ -142,8 +142,8 @@ dependencies {
|
|||||||
implementation 'com.github.HackPlan:AndroidCharts:1.0.4'
|
implementation 'com.github.HackPlan:AndroidCharts:1.0.4'
|
||||||
|
|
||||||
// Hilt
|
// Hilt
|
||||||
implementation 'com.google.dagger:hilt-android:2.42'
|
implementation 'com.google.dagger:hilt-android:2.43'
|
||||||
kapt 'com.google.dagger:hilt-compiler:2.42'
|
kapt 'com.google.dagger:hilt-compiler:2.43'
|
||||||
|
|
||||||
// Google Fit
|
// Google Fit
|
||||||
implementation "com.google.android.gms:play-services-fitness:21.1.0"
|
implementation "com.google.android.gms:play-services-fitness:21.1.0"
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
<!-- Activity for error handling -->
|
<!-- Activity for error handling -->
|
||||||
<activity android:name=".ui.ErrorActivity"
|
<activity android:name=".ui.ErrorActivity"
|
||||||
android:theme="@style/Theme.OpenHealth.NoActionBar"
|
android:theme="@style/Theme.OpenHealth"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
|
||||||
<service
|
<service
|
||||||
|
@ -5,12 +5,14 @@ import android.app.NotificationChannel
|
|||||||
import android.app.NotificationManager
|
import android.app.NotificationManager
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.content.res.Configuration
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
|
import androidx.core.view.WindowCompat
|
||||||
import androidx.navigation.NavController
|
import androidx.navigation.NavController
|
||||||
import androidx.navigation.fragment.NavHostFragment
|
import androidx.navigation.fragment.NavHostFragment
|
||||||
import androidx.navigation.ui.AppBarConfiguration
|
import androidx.navigation.ui.AppBarConfiguration
|
||||||
@ -25,6 +27,7 @@ import com.dzeio.openhealth.databinding.ActivityMainBinding
|
|||||||
import com.dzeio.openhealth.interfaces.NotificationChannels
|
import com.dzeio.openhealth.interfaces.NotificationChannels
|
||||||
import com.dzeio.openhealth.services.OpenHealthService
|
import com.dzeio.openhealth.services.OpenHealthService
|
||||||
import com.dzeio.openhealth.workers.WaterReminderWorker
|
import com.dzeio.openhealth.workers.WaterReminderWorker
|
||||||
|
import com.google.android.material.color.MaterialColors
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
@ -52,6 +55,30 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
|
|||||||
|
|
||||||
setSupportActionBar(binding.toolbar)
|
setSupportActionBar(binding.toolbar)
|
||||||
|
|
||||||
|
window.navigationBarColor = MaterialColors.getColor(
|
||||||
|
window.decorView,
|
||||||
|
com.google.android.material.R.attr.colorSecondaryContainer
|
||||||
|
)
|
||||||
|
window.statusBarColor = MaterialColors.getColor(
|
||||||
|
window.decorView,
|
||||||
|
com.google.android.material.R.attr.colorSecondaryContainer
|
||||||
|
)
|
||||||
|
|
||||||
|
when (this.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) {
|
||||||
|
Configuration.UI_MODE_NIGHT_YES -> {
|
||||||
|
WindowCompat.getInsetsController(window, window.decorView).apply {
|
||||||
|
isAppearanceLightNavigationBars = true
|
||||||
|
isAppearanceLightStatusBars = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Configuration.UI_MODE_NIGHT_NO, Configuration.UI_MODE_NIGHT_UNDEFINED -> {
|
||||||
|
WindowCompat.getInsetsController(window, window.decorView).apply {
|
||||||
|
isAppearanceLightNavigationBars = false
|
||||||
|
isAppearanceLightStatusBars = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
val navHostFragment =
|
val navHostFragment =
|
||||||
supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
|
supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
|
||||||
|
|
||||||
|
@ -4,12 +4,10 @@ import android.os.Bundle
|
|||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.core.widget.NestedScrollView
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import com.dzeio.charts.Entry
|
import com.dzeio.charts.Entry
|
||||||
import com.dzeio.charts.series.BarSerie
|
import com.dzeio.charts.series.BarSerie
|
||||||
import com.dzeio.openhealth.Application
|
import com.dzeio.openhealth.Application
|
||||||
import com.dzeio.openhealth.R
|
|
||||||
import com.dzeio.openhealth.adapters.StepsAdapter
|
import com.dzeio.openhealth.adapters.StepsAdapter
|
||||||
import com.dzeio.openhealth.core.BaseFragment
|
import com.dzeio.openhealth.core.BaseFragment
|
||||||
import com.dzeio.openhealth.databinding.FragmentStepsHomeBinding
|
import com.dzeio.openhealth.databinding.FragmentStepsHomeBinding
|
||||||
@ -59,24 +57,44 @@ class StepsHomeFragment :
|
|||||||
viewModel.items.observe(viewLifecycleOwner) { list ->
|
viewModel.items.observe(viewLifecycleOwner) { list ->
|
||||||
adapter.set(list)
|
adapter.set(list)
|
||||||
|
|
||||||
chart.debug = true
|
// chart.debug = true
|
||||||
|
|
||||||
chart.xAxis.entriesDisplayed = 10
|
chart.xAxis.entriesDisplayed = 10
|
||||||
// chart.numberOfLabels = 2
|
// chart.numberOfLabels = 2
|
||||||
|
|
||||||
// chart.animation.enabled = false
|
// chart.animation.enabled = false
|
||||||
chart.animation.refreshRate = 60
|
chart.animation.refreshRate = 60
|
||||||
chart.animation.duration = 500
|
chart.animation.duration = 300
|
||||||
|
|
||||||
|
chart.scroller.zoomEnabled = false
|
||||||
|
|
||||||
chart.xAxis.labels.color = MaterialColors.getColor(
|
chart.xAxis.labels.color = MaterialColors.getColor(
|
||||||
requireView(),
|
requireView(),
|
||||||
com.google.android.material.R.attr.colorOnBackground
|
com.google.android.material.R.attr.colorOnBackground
|
||||||
)
|
)
|
||||||
|
|
||||||
chart.xAxis.labels.size = 32f
|
chart.xAxis.labels.size = 32f
|
||||||
chart.yAxis.color = MaterialColors.getColor(
|
chart.yAxis.apply {
|
||||||
requireView(),
|
color = MaterialColors.getColor(
|
||||||
com.google.android.material.R.attr.colorPrimary
|
requireView(),
|
||||||
)
|
com.google.android.material.R.attr.colorPrimary
|
||||||
|
)
|
||||||
|
textPaint.color = MaterialColors.getColor(
|
||||||
|
requireView(),
|
||||||
|
com.google.android.material.R.attr.colorOnBackground
|
||||||
|
)
|
||||||
|
linePaint.color = MaterialColors.getColor(
|
||||||
|
requireView(),
|
||||||
|
com.google.android.material.R.attr.colorOutline
|
||||||
|
)
|
||||||
|
onValueFormat = onValueFormat@{ value, short ->
|
||||||
|
if (short) {
|
||||||
|
return@onValueFormat value.toInt().toString()
|
||||||
|
} else {
|
||||||
|
return@onValueFormat "${value.toInt()} steps"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
serie.datas = list.reversed().map {
|
serie.datas = list.reversed().map {
|
||||||
return@map Entry(it.timestamp.toDouble(), it.value.toFloat())
|
return@map Entry(it.timestamp.toDouble(), it.value.toFloat())
|
||||||
@ -95,5 +113,21 @@ class StepsHomeFragment :
|
|||||||
|
|
||||||
chart.refresh()
|
chart.refresh()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// val scrollView = requireActivity().findViewById<NestedScrollView>(R.id.scrollView)
|
||||||
|
// var scrollEnabled = false
|
||||||
|
// scrollView.setOnTouchListener { view, _ ->
|
||||||
|
// view.performClick()
|
||||||
|
// if (scrollEnabled) {
|
||||||
|
// } else {
|
||||||
|
// return@setOnTouchListener !scrollEnabled
|
||||||
|
// }
|
||||||
|
// return@setOnTouchListener true
|
||||||
|
// }
|
||||||
|
|
||||||
|
// binding.chart.setOnToggleScroll {
|
||||||
|
// Log.d(TAG, it.toString())
|
||||||
|
// scrollEnabled = it
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
|
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
|
||||||
<!-- <item android:drawable="?colorPrimary" />-->
|
<item android:drawable="?attr/backgroundColor" />
|
||||||
<item
|
<item
|
||||||
android:width="133dp"
|
android:width="133dp"
|
||||||
android:gravity="center">
|
android:gravity="center">
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
android:height="512dp"
|
android:height="512dp"
|
||||||
android:viewportWidth="512"
|
android:viewportWidth="512"
|
||||||
android:viewportHeight="512"
|
android:viewportHeight="512"
|
||||||
android:tint="#FFFFFF">
|
android:tint="?attr/backgroundColor">
|
||||||
<path
|
<path
|
||||||
android:pathData="M0,0h512v512h-512z"
|
android:pathData="M0,0h512v512h-512z"
|
||||||
android:fillColor="#FF000000"/>
|
android:tint="#FF000000"/>
|
||||||
</vector>
|
</vector>
|
||||||
|
@ -65,12 +65,4 @@
|
|||||||
app:layout_constraintRight_toRightOf="parent"
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
app:menu="@menu/bottom_menu" />
|
app:menu="@menu/bottom_menu" />
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Guideline
|
|
||||||
android:id="@+id/guideline2"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
app:layout_constraintGuide_begin="20dp" />
|
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
@ -1,17 +1,3 @@
|
|||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources>
|
||||||
<!-- Base application theme. -->
|
<style name="Theme.OpenHealth" parent="Theme.Material3.DynamicColors.DayNight" />
|
||||||
<style name="Theme.OpenHealth" parent="Theme.Material3.DynamicColors.DayNight">
|
|
||||||
<!-- <!– Primary brand color. –>-->
|
|
||||||
<!-- <item name="colorPrimary">@color/purple_200</item>-->
|
|
||||||
<!-- <item name="colorPrimaryVariant">@color/purple_700</item>-->
|
|
||||||
<!-- <item name="colorOnPrimary">@color/black</item>-->
|
|
||||||
<!-- <!– Secondary brand color. –>-->
|
|
||||||
<!-- <item name="colorSecondary">@color/teal_200</item>-->
|
|
||||||
<!-- <item name="colorSecondaryVariant">@color/teal_200</item>-->
|
|
||||||
<!-- <item name="colorOnSecondary">@color/black</item>-->
|
|
||||||
<!-- <!– Status bar color. –>-->
|
|
||||||
<!-- <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>-->
|
|
||||||
<!-- <!– Customize your theme here. –>-->
|
|
||||||
|
|
||||||
</style>
|
|
||||||
</resources>
|
</resources>
|
@ -1,10 +1,13 @@
|
|||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources>
|
||||||
|
|
||||||
<style name="Theme.OpenHealth" parent="Theme.Material3.DayNight.NoActionBar" />
|
<style name="Theme.OpenHealth" parent="Theme.Material3.DayNight.NoActionBar">
|
||||||
|
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="Theme.OpenHealth.NoActionBar" parent="Theme.OpenHealth">
|
<style name="Theme.OpenHealth.NoActionBar" parent="Theme.OpenHealth">
|
||||||
<item name="windowActionBar">false</item>
|
<item name="windowActionBar">false</item>
|
||||||
<item name="windowNoTitle">true</item>
|
<item name="windowNoTitle">true</item>
|
||||||
|
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ShapeAppearance.OpenHealth.Corner.Medium" parent="">
|
<style name="ShapeAppearance.OpenHealth.Corner.Medium" parent="">
|
||||||
|
@ -7,25 +7,49 @@ android {
|
|||||||
compileSdk 32
|
compileSdk 32
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
// Android 5 Lollipop
|
||||||
minSdk 21
|
minSdk 21
|
||||||
|
|
||||||
|
// Android 12
|
||||||
targetSdk 32
|
targetSdk 32
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles "consumer-rules.pro"
|
|
||||||
|
// Languages
|
||||||
|
def locales = ["en", "fr"]
|
||||||
|
|
||||||
|
buildConfigField "String[]", "LOCALES", "new String[]{\""+locales.join("\",\"")+"\"}"
|
||||||
|
resConfigs locales
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
// Slimmer version
|
||||||
|
minifyEnabled true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
debug {
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
debuggable true
|
||||||
|
|
||||||
|
// make it debuggable
|
||||||
|
renderscriptDebuggable true
|
||||||
|
|
||||||
|
// Optimization Level
|
||||||
|
renderscriptOptimLevel 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Compile using JAVA 8
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_6
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = '1.6'
|
jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
|
|||||||
|
|
||||||
val xAxis = XAxis<Float>()
|
val xAxis = XAxis<Float>()
|
||||||
|
|
||||||
val yAxis = YAxis<Float>()
|
val yAxis = YAxis<Float>(this)
|
||||||
|
|
||||||
val animation = Animation()
|
val animation = Animation()
|
||||||
|
|
||||||
@ -90,7 +90,7 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
|
|||||||
rectF.set(
|
rectF.set(
|
||||||
padding,
|
padding,
|
||||||
padding,
|
padding,
|
||||||
measuredWidth - padding - yAxis.getWidth(longestSerie().toFloat()) - padding,
|
measuredWidth - padding - yAxis.getWidth() - padding,
|
||||||
height - padding
|
height - padding
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -104,16 +104,21 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onDraw(canvas: Canvas) {
|
override fun onDraw(canvas: Canvas) {
|
||||||
|
|
||||||
|
if (yAxis.legendEnabled) {
|
||||||
|
yAxis.display(canvas, measuredWidth, height)
|
||||||
|
}
|
||||||
|
|
||||||
for (serie in series) {
|
for (serie in series) {
|
||||||
serie.displayData(canvas, rectF)
|
serie.displayData(canvas, rectF)
|
||||||
}
|
}
|
||||||
canvas.drawRect(
|
// canvas.drawRect(
|
||||||
measuredWidth - padding - yAxis.getWidth(longestSerie().toFloat()),
|
// measuredWidth - padding - yAxis.getWidth(),
|
||||||
0f,
|
// 0f,
|
||||||
measuredWidth - padding,
|
// measuredWidth - padding,
|
||||||
height - padding,
|
// height - padding,
|
||||||
fgPaint
|
// fgPaint
|
||||||
)
|
// )
|
||||||
super.onDraw(canvas)
|
super.onDraw(canvas)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,7 +138,7 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
|
|||||||
// )
|
// )
|
||||||
return min(
|
return min(
|
||||||
max(0f, xAxis.baseOffset + movementOffset).toInt(),
|
max(0f, xAxis.baseOffset + movementOffset).toInt(),
|
||||||
longestSerie() - getDisplayedEntries()
|
max(0, getCalculatedMax() - getDisplayedEntries())
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -142,11 +147,20 @@ class ChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet
|
|||||||
return max(0, xAxis.entriesDisplayed + ((zoom - 100) * 10).toInt())
|
return max(0, xAxis.entriesDisplayed + ((zoom - 100) * 10).toInt())
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun longestSerie(): Int {
|
fun getCalculatedMax(): Int {
|
||||||
var size = 0
|
var size = 0
|
||||||
for (serie in series) {
|
for (serie in series) {
|
||||||
if (serie.datas.size > size) size = serie.datas.size
|
if (serie.datas.size > size) size = serie.datas.size
|
||||||
}
|
}
|
||||||
return size
|
return size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getXMax(displayedOnly: Boolean = false): Float {
|
||||||
|
var max = 0f
|
||||||
|
for (serie in series) {
|
||||||
|
val res = serie.getYMax(displayedOnly)
|
||||||
|
if (max < res) max = res
|
||||||
|
}
|
||||||
|
return max
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,7 @@ class XAxisLabels {
|
|||||||
it.isAntiAlias = true
|
it.isAntiAlias = true
|
||||||
it.color = color
|
it.color = color
|
||||||
it.textSize = size
|
it.textSize = size
|
||||||
|
it.isFakeBoldText = true
|
||||||
it.textAlign = Paint.Align.CENTER
|
it.textAlign = Paint.Align.CENTER
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,30 +1,74 @@
|
|||||||
package com.dzeio.charts.axis
|
package com.dzeio.charts.axis
|
||||||
|
|
||||||
|
import android.graphics.Canvas
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
import android.graphics.Paint
|
import android.graphics.Paint
|
||||||
import android.graphics.Rect
|
import android.graphics.Rect
|
||||||
import androidx.annotation.ColorInt
|
import androidx.annotation.ColorInt
|
||||||
|
import com.dzeio.charts.ChartView
|
||||||
|
import com.dzeio.charts.utils.drawDottedLine
|
||||||
|
|
||||||
class YAxis<T> {
|
class YAxis<T>(
|
||||||
|
private val chartView: ChartView
|
||||||
|
) {
|
||||||
var max: T? = null
|
var max: T? = null
|
||||||
var min: T? = null
|
var min: T? = null
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of labels displayed on the sidebar
|
||||||
|
*/
|
||||||
|
var labelCount: Int = 4
|
||||||
|
|
||||||
@ColorInt
|
@ColorInt
|
||||||
var color = Color.parseColor("#FC496D")
|
var color = Color.parseColor("#FC496D")
|
||||||
|
|
||||||
var paint: Paint = Paint().also {
|
var textPaint: Paint = Paint().also {
|
||||||
it.isAntiAlias = true
|
it.isAntiAlias = true
|
||||||
it.color = color
|
it.color = color
|
||||||
it.textSize = 30f
|
it.textSize = 30f
|
||||||
it.textAlign = Paint.Align.CENTER
|
it.textAlign = Paint.Align.RIGHT
|
||||||
|
}
|
||||||
|
|
||||||
|
var linePaint = Paint().apply {
|
||||||
|
isAntiAlias = true
|
||||||
}
|
}
|
||||||
|
|
||||||
var legendEnabled = true
|
var legendEnabled = true
|
||||||
|
|
||||||
private val rect: Rect = Rect()
|
private val rect: Rect = Rect()
|
||||||
|
|
||||||
fun getWidth(max: Float): Int {
|
fun getWidth(): Int {
|
||||||
paint.getTextBounds(max.toString(), 0, max.toString().length, rect)
|
var maxWidth = 0
|
||||||
return rect.width()
|
val max = chartView.getXMax(true)
|
||||||
|
val vIncrement = max / labelCount
|
||||||
|
for (i in 0 until labelCount) {
|
||||||
|
val text = onValueFormat(vIncrement * (labelCount - i), true)
|
||||||
|
textPaint.getTextBounds(text, 0, text.length, rect)
|
||||||
|
if (rect.width() > maxWidth) maxWidth = rect.width()
|
||||||
|
}
|
||||||
|
return maxWidth + chartView.padding.toInt()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to display the YAxis sidebar on the right
|
||||||
|
*
|
||||||
|
* it migh also display content over the Graph
|
||||||
|
*/
|
||||||
|
fun display(canvas: Canvas, width: Int, height: Int) {
|
||||||
|
val max = chartView.getXMax(true)
|
||||||
|
val increment = (height - chartView.padding * 2) / labelCount
|
||||||
|
val vIncrement = max / labelCount
|
||||||
|
for (i in 0 until labelCount) {
|
||||||
|
val text = onValueFormat(vIncrement * (labelCount - i), true)
|
||||||
|
textPaint.getTextBounds(text, 0, text.length, rect)
|
||||||
|
val posY = increment * i.toFloat()
|
||||||
|
canvas.drawDottedLine(0f, posY + chartView.padding, width - rect.width().toFloat() - chartView.padding, posY, 40f, linePaint)
|
||||||
|
canvas.drawText(text,
|
||||||
|
width.toFloat() - chartView.padding, posY + chartView.padding, textPaint)
|
||||||
|
// canvas.drawDottedLine(0f, posY, measuredWidth.toFloat(), posY, 10f, linePaint)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var onValueFormat: (value: Float, shortVersion: Boolean) -> String = { it, _ -> it.toString() }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,16 @@ import android.view.View
|
|||||||
|
|
||||||
class ChartScroll(view: View) {
|
class ChartScroll(view: View) {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enabled the zoom/unzoom of datas
|
||||||
|
*/
|
||||||
|
var zoomEnabled = true
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable the horizontal scroll feature
|
||||||
|
*/
|
||||||
|
var scrollEnabled = true
|
||||||
|
|
||||||
// The ‘active pointer’ is the one currently moving our object.
|
// The ‘active pointer’ is the one currently moving our object.
|
||||||
private var activePointerId = INVALID_POINTER_ID
|
private var activePointerId = INVALID_POINTER_ID
|
||||||
|
|
||||||
@ -60,7 +70,10 @@ class ChartScroll(view: View) {
|
|||||||
* Code mostly stolen from https://developer.android.com/training/gestures/scale#drag
|
* Code mostly stolen from https://developer.android.com/training/gestures/scale#drag
|
||||||
*/
|
*/
|
||||||
fun onTouchEvent(ev: MotionEvent): Boolean {
|
fun onTouchEvent(ev: MotionEvent): Boolean {
|
||||||
scaleGestureDetector.onTouchEvent(ev)
|
|
||||||
|
if (zoomEnabled) {
|
||||||
|
scaleGestureDetector.onTouchEvent(ev)
|
||||||
|
}
|
||||||
|
|
||||||
when (ev.actionMasked) {
|
when (ev.actionMasked) {
|
||||||
MotionEvent.ACTION_DOWN -> {
|
MotionEvent.ACTION_DOWN -> {
|
||||||
@ -86,7 +99,9 @@ class ChartScroll(view: View) {
|
|||||||
posX += x - lastTouchX
|
posX += x - lastTouchX
|
||||||
posY += y - lastTouchY
|
posY += y - lastTouchY
|
||||||
|
|
||||||
onChartMoved?.invoke(-posX, posY)
|
if (scrollEnabled) {
|
||||||
|
onChartMoved?.invoke(-posX, posY)
|
||||||
|
}
|
||||||
|
|
||||||
// Remember this touch position for the next move event
|
// Remember this touch position for the next move event
|
||||||
lastTouchX = x
|
lastTouchX = x
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
package com.dzeio.charts.components
|
|
||||||
|
|
||||||
import android.graphics.RectF
|
|
||||||
|
|
||||||
class Sidebar {
|
|
||||||
|
|
||||||
var enabled = true
|
|
||||||
|
|
||||||
private val rect: RectF = RectF()
|
|
||||||
|
|
||||||
fun refresh(max: Float) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -2,6 +2,7 @@ package com.dzeio.charts.series
|
|||||||
|
|
||||||
import android.graphics.Canvas
|
import android.graphics.Canvas
|
||||||
import android.graphics.Paint
|
import android.graphics.Paint
|
||||||
|
import android.graphics.Rect
|
||||||
import android.graphics.RectF
|
import android.graphics.RectF
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import kotlin.math.max
|
import kotlin.math.max
|
||||||
@ -23,6 +24,8 @@ class BarSerie : SerieAbstract() {
|
|||||||
|
|
||||||
var previousRefresh = 0
|
var previousRefresh = 0
|
||||||
|
|
||||||
|
private val r = Rect()
|
||||||
|
|
||||||
override fun onUpdate(): Boolean {
|
override fun onUpdate(): Boolean {
|
||||||
var needNewFrame = false
|
var needNewFrame = false
|
||||||
for (i in targetPercentList.indices) {
|
for (i in targetPercentList.indices) {
|
||||||
@ -31,7 +34,7 @@ class BarSerie : SerieAbstract() {
|
|||||||
targetPercentList[i],
|
targetPercentList[i],
|
||||||
percentList[i],
|
percentList[i],
|
||||||
0f,
|
0f,
|
||||||
0.01f
|
0.00f
|
||||||
)
|
)
|
||||||
|
|
||||||
if (value != percentList[i]) {
|
if (value != percentList[i]) {
|
||||||
@ -113,27 +116,33 @@ class BarSerie : SerieAbstract() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun displayData(canvas: Canvas, rect: RectF) {
|
override fun displayData(canvas: Canvas, rect: RectF) {
|
||||||
val barWidth = rect.width() / view.getDisplayedEntries() - spacing
|
val barWidth = (rect.width() - view.padding * 2) / view.getDisplayedEntries() - spacing
|
||||||
|
|
||||||
if (percentList.isNotEmpty()) {
|
if (percentList.isNotEmpty()) {
|
||||||
// draw each rectangles
|
// draw each rectangles
|
||||||
for (i in 1..percentList.size) {
|
for (i in 1..percentList.size) {
|
||||||
// Log.d(TAG, percentList[i - 1].toString())
|
// Log.d(TAG, percentList[i - 1].toString())
|
||||||
val left = rect.left + spacing * i + barWidth * (i - 1).toFloat()
|
val left = rect.left + spacing * i + barWidth * (i - 1).toFloat() + view.padding
|
||||||
// Log.d(TAG, "$spacing, $i, $barWidth = $left")
|
// Log.d(TAG, "$spacing, $i, $barWidth = $left")
|
||||||
val right = rect.left + (spacing + barWidth) * i.toFloat()
|
val right = rect.left + (spacing + barWidth) * i.toFloat()
|
||||||
val bottom = rect.top + rect.height()
|
val bottom = rect.top + rect.height() - view.padding
|
||||||
val top = (bottom - rect.top) * percentList[i - 1]
|
val top = (bottom - rect.top) * percentList[i - 1] + view.padding
|
||||||
|
|
||||||
// create rounded rect
|
// create rounded rect
|
||||||
canvas.drawRoundRect(left, top, right, bottom, 8f, 8f, fgPaint)
|
canvas.drawRoundRect(left, top, right, bottom, 8f, 8f, fgPaint)
|
||||||
// remove the bottom corners DUH
|
// remove the bottom corners DUH
|
||||||
canvas.drawRect(left, max(top, bottom - 8f), right, bottom, fgPaint)
|
canvas.drawRect(left, max(top, bottom - 8f), right, bottom, fgPaint)
|
||||||
if (view.debug) {
|
val targetTop = (bottom - rect.top) * targetPercentList[i - 1]
|
||||||
|
|
||||||
|
val text = view.yAxis.onValueFormat(getMax() - getMax() * targetPercentList[i - 1], true)
|
||||||
|
view.xAxis.labels.build().getTextBounds(text, 0, text.length, r)
|
||||||
|
val doDisplayIn = r.width() + 10f < barWidth && bottom - targetTop > r.height() + 40f
|
||||||
|
if (view.debug || !doDisplayIn || (doDisplayIn && bottom - top > r.height() + 40f)) {
|
||||||
|
val y = if (doDisplayIn) top + r.height() + 20f else top - r.height()
|
||||||
canvas.drawText(
|
canvas.drawText(
|
||||||
(getMax() - getMax() * targetPercentList[i - 1]).toString(),
|
text,
|
||||||
left + (right - left) / 2,
|
left + (right - left) / 2,
|
||||||
top + (bottom - top) / 2,
|
y,
|
||||||
view.xAxis.labels.build()
|
view.xAxis.labels.build()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ import android.graphics.Canvas
|
|||||||
import android.graphics.RectF
|
import android.graphics.RectF
|
||||||
import com.dzeio.charts.ChartView
|
import com.dzeio.charts.ChartView
|
||||||
import com.dzeio.charts.Entry
|
import com.dzeio.charts.Entry
|
||||||
|
import kotlin.math.min
|
||||||
|
|
||||||
abstract class SerieAbstract {
|
abstract class SerieAbstract {
|
||||||
|
|
||||||
@ -11,6 +12,18 @@ abstract class SerieAbstract {
|
|||||||
|
|
||||||
lateinit var view: ChartView
|
lateinit var view: ChartView
|
||||||
|
|
||||||
|
fun getYMax(displayedOnly: Boolean = false): Float {
|
||||||
|
var max = 0f
|
||||||
|
var localDatas = if (displayedOnly) datas.subList(
|
||||||
|
view.getXOffset(),
|
||||||
|
min(view.getXOffset() + view.getDisplayedEntries(), datas.size)
|
||||||
|
) else datas
|
||||||
|
for (data in localDatas) {
|
||||||
|
if (max < data.y) max= data.y
|
||||||
|
}
|
||||||
|
return max
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Animation updates
|
* Animation updates
|
||||||
*/
|
*/
|
||||||
|
@ -2,15 +2,16 @@ package com.dzeio.charts.views
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.Canvas
|
import android.graphics.Canvas
|
||||||
|
import android.graphics.Color
|
||||||
import android.graphics.Paint
|
import android.graphics.Paint
|
||||||
import android.graphics.Rect
|
import android.graphics.Rect
|
||||||
import android.graphics.RectF
|
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import com.dzeio.charts.Animation
|
import com.dzeio.charts.Animation
|
||||||
import com.dzeio.charts.Entry
|
import com.dzeio.charts.Entry
|
||||||
import com.dzeio.charts.axis.XAxis
|
import com.dzeio.charts.axis.XAxis
|
||||||
import com.dzeio.charts.axis.YAxis
|
import com.dzeio.charts.axis.YAxis
|
||||||
|
import com.dzeio.charts.utils.drawDottedLine
|
||||||
import kotlin.math.abs
|
import kotlin.math.abs
|
||||||
import kotlin.math.max
|
import kotlin.math.max
|
||||||
import kotlin.math.min
|
import kotlin.math.min
|
||||||
@ -60,7 +61,13 @@ class BarChartView @JvmOverloads constructor(context: Context?, attrs: Attribute
|
|||||||
it.isAntiAlias = true
|
it.isAntiAlias = true
|
||||||
it.color = yAxis.color
|
it.color = yAxis.color
|
||||||
}
|
}
|
||||||
private val rect: RectF = RectF()
|
|
||||||
|
private var linePaint = Paint().apply {
|
||||||
|
color = Color.parseColor("#123456")
|
||||||
|
strokeWidth = 6f
|
||||||
|
}
|
||||||
|
|
||||||
|
private val rect: Rect = Rect()
|
||||||
|
|
||||||
private var bottomTextDescent = 0
|
private var bottomTextDescent = 0
|
||||||
private var bottomTextHeight = 0
|
private var bottomTextHeight = 0
|
||||||
@ -101,9 +108,11 @@ class BarChartView @JvmOverloads constructor(context: Context?, attrs: Attribute
|
|||||||
|
|
||||||
var list: ArrayList<Entry> = arrayListOf()
|
var list: ArrayList<Entry> = arrayListOf()
|
||||||
|
|
||||||
|
private var fiftyPercent = 0f
|
||||||
|
|
||||||
private var bottomTexts: ArrayList<String> = arrayListOf()
|
private var bottomTexts: ArrayList<String> = arrayListOf()
|
||||||
|
|
||||||
var previousRefresh = movementOffset
|
var previousOffset = getXOffset()
|
||||||
|
|
||||||
fun refresh() {
|
fun refresh() {
|
||||||
val r = Rect()
|
val r = Rect()
|
||||||
@ -130,10 +139,13 @@ class BarChartView @JvmOverloads constructor(context: Context?, attrs: Attribute
|
|||||||
if (calculatedMax < 0) 0f else calculatedMax
|
if (calculatedMax < 0) 0f else calculatedMax
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fiftyPercent = max / 2
|
||||||
|
|
||||||
// make sure the target list
|
// make sure the target list
|
||||||
// Log.d(TAG, list.size.toString())
|
// Log.d(TAG, list.size.toString())
|
||||||
targetPercentList = arrayListOf()
|
targetPercentList = arrayListOf()
|
||||||
|
|
||||||
|
// Log.d(TAG, "List selected: ${getXOffset()} to ${getXOffset() + getDisplayedEntries() - 1}")
|
||||||
for (item in list.subList(getXOffset(), getXOffset() + getDisplayedEntries())) {
|
for (item in list.subList(getXOffset(), getXOffset() + getDisplayedEntries())) {
|
||||||
// // Process bottom texts
|
// // Process bottom texts
|
||||||
val text = xAxis.onValueFormat(item.x)
|
val text = xAxis.onValueFormat(item.x)
|
||||||
@ -160,15 +172,23 @@ class BarChartView @JvmOverloads constructor(context: Context?, attrs: Attribute
|
|||||||
}
|
}
|
||||||
|
|
||||||
// post list
|
// post list
|
||||||
val movement = movementOffset - previousRefresh
|
val movement = getXOffset() - previousOffset
|
||||||
previousRefresh = movementOffset
|
previousOffset = getXOffset()
|
||||||
// Log.d(TAG, movement.toString())
|
// Log.d(TAG, movement.toString())
|
||||||
if (movement >= 1) {
|
if (movement >= 1) {
|
||||||
percentList = percentList.subList(1, percentList.size).toCollection(ArrayList())
|
percentList = percentList.subList(min(movement, percentList.size), percentList.size).toCollection(
|
||||||
percentList.add(1f)
|
ArrayList()
|
||||||
|
)
|
||||||
|
for (i in 0 until movement) {
|
||||||
|
percentList.add(1f)
|
||||||
|
}
|
||||||
} else if (movement <= -1) {
|
} else if (movement <= -1) {
|
||||||
percentList = percentList.subList(0, percentList.size - 1).toCollection(ArrayList())
|
percentList = percentList.subList(0, percentList.size + movement).toCollection(
|
||||||
percentList.add(0, 1f)
|
ArrayList()
|
||||||
|
)
|
||||||
|
for (i in 0 until abs(movement)) {
|
||||||
|
percentList.add(0, 1f)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (percentList.isEmpty() || percentList.size < targetPercentList.size) {
|
if (percentList.isEmpty() || percentList.size < targetPercentList.size) {
|
||||||
val temp = targetPercentList.size - percentList.size
|
val temp = targetPercentList.size - percentList.size
|
||||||
@ -188,11 +208,32 @@ class BarChartView @JvmOverloads constructor(context: Context?, attrs: Attribute
|
|||||||
color = yAxis.color
|
color = yAxis.color
|
||||||
}
|
}
|
||||||
|
|
||||||
|
linePaint = Paint().apply {
|
||||||
|
color = yAxis.lineColor
|
||||||
|
strokeWidth = 4f
|
||||||
|
}
|
||||||
|
|
||||||
removeCallbacks(animator)
|
removeCallbacks(animator)
|
||||||
post(animator)
|
post(animator)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun onDraw(canvas: Canvas) {
|
override fun onDraw(canvas: Canvas) {
|
||||||
|
val bottom = height - bottomTextHeight - textTopMargin.toFloat()
|
||||||
|
|
||||||
|
// draw sidebar and lines
|
||||||
|
val increment = bottom / yAxis.labelCount
|
||||||
|
val vIncrement = fiftyPercent * 2 / yAxis.labelCount
|
||||||
|
for (i in 0 until yAxis.labelCount) {
|
||||||
|
val text = (vIncrement * (yAxis.labelCount - i)).toString()
|
||||||
|
xAxis.labels.build().getTextBounds(text, 0, text.length, rect)
|
||||||
|
val posY = increment * i
|
||||||
|
canvas.drawDottedLine(0f, posY, measuredWidth.toFloat(), posY, 40f, linePaint)
|
||||||
|
canvas.drawText(text,
|
||||||
|
(measuredWidth - rect.width()).toFloat(), posY + rect.height() + 20f, xAxis.labels.build())
|
||||||
|
// canvas.drawDottedLine(0f, posY, measuredWidth.toFloat(), posY, 10f, linePaint)
|
||||||
|
}
|
||||||
|
|
||||||
if (percentList.isNotEmpty()) {
|
if (percentList.isNotEmpty()) {
|
||||||
// draw each rectangles
|
// draw each rectangles
|
||||||
for (i in 1..percentList.size) {
|
for (i in 1..percentList.size) {
|
||||||
@ -200,7 +241,6 @@ class BarChartView @JvmOverloads constructor(context: Context?, attrs: Attribute
|
|||||||
val left = spacing * i + barWidth * (i - 1).toFloat()
|
val left = spacing * i + barWidth * (i - 1).toFloat()
|
||||||
// Log.d(TAG, "$spacing, $i, $barWidth = $left")
|
// Log.d(TAG, "$spacing, $i, $barWidth = $left")
|
||||||
val right = (spacing + barWidth) * i.toFloat()
|
val right = (spacing + barWidth) * i.toFloat()
|
||||||
val bottom = height - bottomTextHeight - textTopMargin.toFloat()
|
|
||||||
val top = bottom * percentList[i - 1]
|
val top = bottom * percentList[i - 1]
|
||||||
|
|
||||||
// create rounded rect
|
// create rounded rect
|
||||||
@ -227,7 +267,6 @@ class BarChartView @JvmOverloads constructor(context: Context?, attrs: Attribute
|
|||||||
items += 1
|
items += 1
|
||||||
}
|
}
|
||||||
|
|
||||||
val rect = Rect()
|
|
||||||
|
|
||||||
// Log.i(TAG, "$size / max($numberOfLabels - 2, 2) = $items")
|
// Log.i(TAG, "$size / max($numberOfLabels - 2, 2) = $items")
|
||||||
for (s in bottomTexts) {
|
for (s in bottomTexts) {
|
Loading…
x
Reference in New Issue
Block a user