Compare commits
10 Commits
e2f710528e
...
7cbeee4885
Author | SHA1 | Date |
---|---|---|
|
7cbeee4885 | |
|
37dc2b428d | |
|
bb9ffb5455 | |
|
2e0b36339d | |
|
5a0dd4d559 | |
|
67a82ee370 | |
|
2876aa6756 | |
|
5b927dbaa1 | |
|
aaead3085b | |
|
0258ac81b4 |
|
@ -0,0 +1,674 @@
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) 2024 Tomasz Półgrabia
|
||||||
|
|
||||||
|
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) 2024 Tomasz Półgrabia
|
||||||
|
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>.
|
|
@ -1,3 +1,5 @@
|
||||||
|
# Purpose of application
|
||||||
|
|
||||||
Urban explorer is an app which serves the knowledge about interesting places
|
Urban explorer is an app which serves the knowledge about interesting places
|
||||||
in the user's neighborhood.
|
in the user's neighborhood.
|
||||||
|
|
||||||
|
@ -13,3 +15,7 @@ Currently used libraries:
|
||||||
- crashlytics (for bug reporting),
|
- crashlytics (for bug reporting),
|
||||||
- universal image loader
|
- universal image loader
|
||||||
- google support libs.
|
- google support libs.
|
||||||
|
|
||||||
|
# Post mortem update
|
||||||
|
|
||||||
|
By now (since Nov 2016 ), Panoramio is defunct and it was 50% of the application data sources (other was wiki) https://www.panoramio.com/ https://en.wikipedia.org/wiki/Panoramio . It was available since Nov 2016 under the google play key pl.tpolgrabia.urbanexplorer and taken down on March 2018 by Google due to inactivity (not updating information about the application).
|
|
@ -35,8 +35,8 @@ android {
|
||||||
applicationId "pl.tpolgrabia.urbanexplorer"
|
applicationId "pl.tpolgrabia.urbanexplorer"
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 21
|
targetSdkVersion 21
|
||||||
versionCode 4
|
versionCode 6
|
||||||
versionName "1.1"
|
versionName "1.1.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
|
@ -72,7 +72,7 @@ dependencies {
|
||||||
// workaround issue #73
|
// workaround issue #73
|
||||||
exclude group: 'com.google.android', module: 'android'
|
exclude group: 'com.google.android', module: 'android'
|
||||||
}
|
}
|
||||||
compile project(':panoramiobindings')
|
|
||||||
compile project(':urbanexplorerutils')
|
compile project(':urbanexplorerutils')
|
||||||
compile project(':wikibinding')
|
compile project(':wikibinding')
|
||||||
compile project(':googleutils')
|
compile project(':googleutils')
|
||||||
|
|
|
@ -6,7 +6,7 @@ import java.util.Locale;
|
||||||
* Created by tpolgrabia on 27.08.16.
|
* Created by tpolgrabia on 27.08.16.
|
||||||
*/
|
*/
|
||||||
public class AppConstants {
|
public class AppConstants {
|
||||||
public static final AppStage RELEASE = AppStage.DEVELOPMENT;
|
public static final AppStage RELEASE = AppStage.FINAL;
|
||||||
public static final float MIN_DISTANCE = 100;
|
public static final float MIN_DISTANCE = 100;
|
||||||
public static final long GPS_LOCATION_UPDATE_FREQ = 15000;
|
public static final long GPS_LOCATION_UPDATE_FREQ = 15000;
|
||||||
public static final float GPS_LOCATION_DISTANCE_FREQ = MIN_DISTANCE;
|
public static final float GPS_LOCATION_DISTANCE_FREQ = MIN_DISTANCE;
|
||||||
|
|
|
@ -16,14 +16,10 @@ import org.greenrobot.eventbus.EventBus;
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
import org.greenrobot.eventbus.Subscribe;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.utils.PanoramioUtils;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.activities.SettingsActivity;
|
import pl.tpolgrabia.urbanexplorer.activities.SettingsActivity;
|
||||||
import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListener;
|
import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListener;
|
||||||
import pl.tpolgrabia.urbanexplorer.dto.MainActivityState;
|
import pl.tpolgrabia.urbanexplorer.dto.MainActivityState;
|
||||||
import pl.tpolgrabia.urbanexplorer.events.RefreshSettingsEvent;
|
import pl.tpolgrabia.urbanexplorer.events.RefreshSettingsEvent;
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioShowerFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.PlacesFragment;
|
import pl.tpolgrabia.urbanexplorer.fragments.PlacesFragment;
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment;
|
import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment;
|
||||||
import pl.tpolgrabia.urbanexplorer.handlers.*;
|
import pl.tpolgrabia.urbanexplorer.handlers.*;
|
||||||
|
@ -48,33 +44,27 @@ public class MainActivity extends ActionBarActivity {
|
||||||
public static DisplayImageOptions rectOptions;
|
public static DisplayImageOptions rectOptions;
|
||||||
|
|
||||||
private GestureDetectorCompat gestureDetector;
|
private GestureDetectorCompat gestureDetector;
|
||||||
private MainActivityState currFrag = MainActivityState.PANORAMIO;
|
private MainActivityState currFrag = MainActivityState.WIKI;
|
||||||
private StandardLocationListener locationCallback;
|
private StandardLocationListener locationCallback;
|
||||||
private boolean locationServicesActivated = false;
|
private boolean locationServicesActivated = false;
|
||||||
private GestureDetector.OnGestureListener swipeHandler;
|
private GestureDetector.OnGestureListener swipeHandler;
|
||||||
private PanoramioImageInfo photoInfo;
|
|
||||||
private ProgressDialog progressDlg;
|
private ProgressDialog progressDlg;
|
||||||
private MainActivityState oldFrag = MainActivityState.PANORAMIO_SHOWER;
|
private MainActivityState oldFrag = MainActivityState.GOOGLE_PLACES;
|
||||||
private boolean savedConfiguration;
|
private boolean savedConfiguration;
|
||||||
private static final Map<MainActivityState, Runnable> switchFragmentActions = new HashMap<>();
|
private static final Map<MainActivityState, Runnable> switchFragmentActions = new HashMap<>();
|
||||||
|
|
||||||
private static final Map<Integer, String> fragTags = new HashMap<>();
|
private static final Map<Integer, String> fragTags = new HashMap<>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
fragTags.put(MainActivityState.PANORAMIO.getOrder(), HomeFragment.TAG);
|
|
||||||
fragTags.put(MainActivityState.WIKI.getOrder(), WikiLocationsFragment.TAG);
|
fragTags.put(MainActivityState.WIKI.getOrder(), WikiLocationsFragment.TAG);
|
||||||
fragTags.put(MainActivityState.GOOGLE_PLACES.getOrder(), PlacesFragment.TAG);
|
fragTags.put(MainActivityState.GOOGLE_PLACES.getOrder(), PlacesFragment.TAG);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MainActivity() {
|
public MainActivity() {
|
||||||
switchFragmentActions.put(MainActivityState.PANORAMIO_SHOWER, new PanoramioShowerSwitchHandler(this));
|
|
||||||
switchFragmentActions.put(MainActivityState.PANORAMIO, new PanoramioSwitchHandler(this));
|
|
||||||
switchFragmentActions.put(MainActivityState.WIKI, new WikiSwitchHandler(this));
|
switchFragmentActions.put(MainActivityState.WIKI, new WikiSwitchHandler(this));
|
||||||
switchFragmentActions.put(MainActivityState.GOOGLE_PLACES, new GooglePlacesSwitchHandler(this));
|
switchFragmentActions.put(MainActivityState.GOOGLE_PLACES, new GooglePlacesSwitchHandler(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<PanoramioImageInfo> photos;
|
|
||||||
|
|
||||||
public StandardLocationListener getLocationCallback() {
|
public StandardLocationListener getLocationCallback() {
|
||||||
return locationCallback;
|
return locationCallback;
|
||||||
}
|
}
|
||||||
|
@ -105,7 +95,7 @@ public class MainActivity extends ActionBarActivity {
|
||||||
HelperUtils.initErrorAndDebugHanlers(this);
|
HelperUtils.initErrorAndDebugHanlers(this);
|
||||||
NetUtils.setGlobalProxyAuth(this);
|
NetUtils.setGlobalProxyAuth(this);
|
||||||
|
|
||||||
currFrag = MainActivityState.PANORAMIO;
|
currFrag = MainActivityState.WIKI;
|
||||||
progressDlg = new ProgressDialog(this);
|
progressDlg = new ProgressDialog(this);
|
||||||
progressDlg.setCancelable(false);
|
progressDlg.setCancelable(false);
|
||||||
|
|
||||||
|
@ -119,12 +109,11 @@ public class MainActivity extends ActionBarActivity {
|
||||||
// init fragments
|
// init fragments
|
||||||
MainActivityState fragId = savedInstanceState != null
|
MainActivityState fragId = savedInstanceState != null
|
||||||
? (MainActivityState)savedInstanceState.getSerializable(AppConstants.FRAG_ID)
|
? (MainActivityState)savedInstanceState.getSerializable(AppConstants.FRAG_ID)
|
||||||
: MainActivityState.PANORAMIO;
|
: MainActivityState.WIKI;
|
||||||
|
|
||||||
lg.trace("Restored orig frag id: {}", fragId);
|
lg.trace("Restored orig frag id: {}", fragId);
|
||||||
currFrag = fragId == null ? MainActivityState.PANORAMIO : fragId;
|
currFrag = fragId == null ? MainActivityState.WIKI : fragId;
|
||||||
lg.trace("Set final frag id: {}", fragId);
|
lg.trace("Set final frag id: {}", fragId);
|
||||||
photoInfo = savedInstanceState != null ? (PanoramioImageInfo) savedInstanceState.getSerializable(AppConstants.PHOTO_INFO) : null;
|
|
||||||
boolean copySavedConfiguration = savedConfiguration =
|
boolean copySavedConfiguration = savedConfiguration =
|
||||||
savedInstanceState != null && savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY);
|
savedInstanceState != null && savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY);
|
||||||
|
|
||||||
|
@ -137,13 +126,6 @@ public class MainActivity extends ActionBarActivity {
|
||||||
public void onBackPressed() {
|
public void onBackPressed() {
|
||||||
lg.debug("Back pressed");
|
lg.debug("Back pressed");
|
||||||
|
|
||||||
switch(currFrag) {
|
|
||||||
case PANORAMIO_SHOWER:
|
|
||||||
photoInfo = null;
|
|
||||||
currFrag = MainActivityState.PANORAMIO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
super.onBackPressed();
|
super.onBackPressed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -189,43 +171,6 @@ public class MainActivity extends ActionBarActivity {
|
||||||
EventBus.getDefault().post(new RefreshEvent(this));
|
EventBus.getDefault().post(new RefreshEvent(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void resetPhotoInfo() {
|
|
||||||
this.photoInfo = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void switchToPhoto(PanoramioImageInfo photoInfo) {
|
|
||||||
this.photoInfo = photoInfo;
|
|
||||||
this.currFrag = MainActivityState.PANORAMIO_SHOWER;
|
|
||||||
FragmentManager fragmentManager = getSupportFragmentManager();
|
|
||||||
FragmentTransaction ctx = fragmentManager.beginTransaction();
|
|
||||||
|
|
||||||
ctx.setCustomAnimations(R.anim.slide_in_down,
|
|
||||||
R.anim.slide_out_down,
|
|
||||||
R.anim.slide_in_up,
|
|
||||||
R.anim.slide_out_up);
|
|
||||||
Fragment frag = fragmentManager.findFragmentByTag(PanoramioShowerFragment.TAG);
|
|
||||||
|
|
||||||
if (frag != null) {
|
|
||||||
ctx.replace(R.id.fragments, frag);
|
|
||||||
} else {
|
|
||||||
Fragment panoramioShower = createShowerFragment(photoInfo);
|
|
||||||
ctx.replace(R.id.fragments, panoramioShower, PanoramioShowerFragment.TAG);
|
|
||||||
}
|
|
||||||
if (!savedConfiguration) {
|
|
||||||
ctx.addToBackStack(AppConstants.PHOTO_BACKSTACK);
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.commit();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PanoramioShowerFragment createShowerFragment(PanoramioImageInfo photoInfo) {
|
|
||||||
PanoramioShowerFragment panoramioShower = new PanoramioShowerFragment();
|
|
||||||
Bundle arguments = new Bundle();
|
|
||||||
arguments.putSerializable(PanoramioShowerFragment.PANORAMIO_PHOTO_ARG_KEY, photoInfo);
|
|
||||||
panoramioShower.setArguments(arguments);
|
|
||||||
return panoramioShower;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void switchFragment() {
|
private void switchFragment() {
|
||||||
|
|
||||||
|
@ -233,10 +178,6 @@ public class MainActivity extends ActionBarActivity {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!savedConfiguration) {
|
|
||||||
photoInfo = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Runnable switchAction = switchFragmentActions.get(currFrag);
|
Runnable switchAction = switchFragmentActions.get(currFrag);
|
||||||
if (switchAction != null) {
|
if (switchAction != null) {
|
||||||
switchAction.run();
|
switchAction.run();
|
||||||
|
@ -385,7 +326,6 @@ public class MainActivity extends ActionBarActivity {
|
||||||
super.onSaveInstanceState(outState);
|
super.onSaveInstanceState(outState);
|
||||||
lg.trace("1 Saving current fragment id: {}", currFrag);
|
lg.trace("1 Saving current fragment id: {}", currFrag);
|
||||||
outState.putSerializable(AppConstants.FRAG_ID, currFrag);
|
outState.putSerializable(AppConstants.FRAG_ID, currFrag);
|
||||||
outState.putSerializable(AppConstants.PHOTO_INFO, photoInfo);
|
|
||||||
outState.putBoolean(AppConstants.SAVED_CONFIG_KEY, true);
|
outState.putBoolean(AppConstants.SAVED_CONFIG_KEY, true);
|
||||||
lg.trace("2 Saving current fragment id: {}", currFrag);
|
lg.trace("2 Saving current fragment id: {}", currFrag);
|
||||||
}
|
}
|
||||||
|
@ -402,14 +342,6 @@ public class MainActivity extends ActionBarActivity {
|
||||||
lg.trace("onStart {}", System.identityHashCode(this));
|
lg.trace("onStart {}", System.identityHashCode(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPhotos(List<PanoramioImageInfo> photos) {
|
|
||||||
this.photos = photos;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PanoramioImageInfo getPhotoInfo() {
|
|
||||||
return photoInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void handleLoadingStart(DataLoadingStartEvent event) {
|
public void handleLoadingStart(DataLoadingStartEvent event) {
|
||||||
progressDlg.show();
|
progressDlg.show();
|
||||||
|
|
|
@ -26,7 +26,7 @@ public class StandardLocationListener implements LocationListener {
|
||||||
@Override
|
@Override
|
||||||
public void onLocationChanged(Location location) {
|
public void onLocationChanged(Location location) {
|
||||||
lg.info("Location provider changed: {}", location);
|
lg.info("Location provider changed: {}", location);
|
||||||
Toast.makeText(ctx, "Location changed " + location, Toast.LENGTH_LONG).show();
|
// Toast.makeText(ctx, "Location changed " + location, Toast.LENGTH_LONG).show();
|
||||||
LocationUtils.updateLastLocationUPdate(ctx);
|
LocationUtils.updateLastLocationUPdate(ctx);
|
||||||
EventBus.getDefault().post(
|
EventBus.getDefault().post(
|
||||||
new LocationChangedEventBuilder()
|
new LocationChangedEventBuilder()
|
||||||
|
@ -37,7 +37,7 @@ public class StandardLocationListener implements LocationListener {
|
||||||
@Override
|
@Override
|
||||||
public void onStatusChanged(String provider, int status, Bundle extras) {
|
public void onStatusChanged(String provider, int status, Bundle extras) {
|
||||||
lg.debug("Location provider {} status has changed to {} with {}", provider, status, extras);
|
lg.debug("Location provider {} status has changed to {} with {}", provider, status, extras);
|
||||||
Toast.makeText(ctx, "Location provider " + provider + " status changed to " + status, Toast.LENGTH_LONG).show();
|
// Toast.makeText(ctx, "Location provider " + provider + " status changed to " + status, Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.callbacks.geocoder;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.googleutils.callback.LocationGeoCoderCallback;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class GeocodedLocationCallback implements LocationGeoCoderCallback {
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(GeocodedLocationCallback.class);
|
|
||||||
private HomeFragment homeFragment;
|
|
||||||
|
|
||||||
public GeocodedLocationCallback(HomeFragment homeFragment) {
|
|
||||||
this.homeFragment = homeFragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void callback(int code, String message, String googleStatus, String geocodedLocation) {
|
|
||||||
lg.debug("Geocoded result code {}, message {}, status: {}, value {}",
|
|
||||||
code, message, googleStatus, geocodedLocation);
|
|
||||||
|
|
||||||
homeFragment.setCurrentGeocodedLocation(geocodedLocation);
|
|
||||||
homeFragment.updateLocationInfo();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,77 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.callbacks.panoramio;
|
|
||||||
|
|
||||||
import android.support.v4.app.FragmentActivity;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.callback.PanoramioResponseCallback;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.callback.PanoramioResponseStatus;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.R;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioAdapter;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class FetchAdditionalPanoramioPhotosCallback implements PanoramioResponseCallback {
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(FetchAdditionalPanoramioPhotosCallback.class);
|
|
||||||
private HomeFragment homeFragment;
|
|
||||||
private final FragmentActivity activity;
|
|
||||||
|
|
||||||
public FetchAdditionalPanoramioPhotosCallback(HomeFragment homeFragment, FragmentActivity activity) {
|
|
||||||
this.homeFragment = homeFragment;
|
|
||||||
this.activity = activity;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
|
|
||||||
try {
|
|
||||||
lg.debug("Fetched with status: {}, images: {}, count: {}", status, images, imagesCount);
|
|
||||||
if (status != PanoramioResponseStatus.SUCCESS) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final View view = homeFragment.getView();
|
|
||||||
if (view == null) {
|
|
||||||
lg.debug("View still not initialized");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ListView locations = (ListView) view.findViewById(R.id.locations);
|
|
||||||
if (locations == null) {
|
|
||||||
lg.trace("Empty locations");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ArrayAdapter<PanoramioImageInfo> adapter = (ArrayAdapter<PanoramioImageInfo>) locations.getAdapter();
|
|
||||||
homeFragment.addPhotos(images);
|
|
||||||
lg.debug("Additional Photos size {} loaded. There are {} photos", images.size(), homeFragment.getPhotosCount());
|
|
||||||
|
|
||||||
if (homeFragment.getPhotosCount() <= 0) {
|
|
||||||
Toast.makeText(homeFragment.getActivity(), "No results", Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
|
|
||||||
homeFragment.setNoMorePhotos(images.isEmpty());
|
|
||||||
if (adapter == null) {
|
|
||||||
locations.setAdapter(new PanoramioAdapter(activity, R.id.list_item, images));
|
|
||||||
} else {
|
|
||||||
adapter.addAll(images);
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO we can think about removing first items also and last if the number
|
|
||||||
// TODO of items exceeds the limit (to save the memory)
|
|
||||||
|
|
||||||
lg.debug("Finished Fetching additional photos count: {}", homeFragment.getPhotosCount());
|
|
||||||
|
|
||||||
} finally {
|
|
||||||
lg.trace("Releasing fetching lock");
|
|
||||||
homeFragment.getLoading().release();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,68 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.callbacks.panoramio;
|
|
||||||
|
|
||||||
import android.support.v4.app.FragmentActivity;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.callback.PanoramioResponseCallback;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.callback.PanoramioResponseStatus;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.MainActivity;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.R;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioAdapter;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class FetchPanoramioPhotosCallback implements PanoramioResponseCallback {
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(FetchPanoramioPhotosCallback.class);
|
|
||||||
|
|
||||||
private HomeFragment homeFragment;
|
|
||||||
private final FragmentActivity activity;
|
|
||||||
|
|
||||||
|
|
||||||
public FetchPanoramioPhotosCallback(HomeFragment homeFragment, FragmentActivity activity) {
|
|
||||||
this.homeFragment = homeFragment;
|
|
||||||
this.activity = activity;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
|
|
||||||
|
|
||||||
lg.trace("Panoramio response status {}, images: {}, imagesCount: {}",
|
|
||||||
status,
|
|
||||||
images,
|
|
||||||
imagesCount);
|
|
||||||
|
|
||||||
ArrayAdapter<PanoramioImageInfo> adapter = new PanoramioAdapter(activity,
|
|
||||||
R.layout.location_item,
|
|
||||||
images);
|
|
||||||
|
|
||||||
if (images.isEmpty()) {
|
|
||||||
Toast.makeText(homeFragment.getActivity(), "No results", Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
final View view = homeFragment.getView();
|
|
||||||
if (view == null) {
|
|
||||||
lg.trace("Fragment's view is not initialized");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ListView locations = (ListView) view.findViewById(R.id.locations);
|
|
||||||
locations.setAdapter(adapter);
|
|
||||||
MainActivity mainActivity = (MainActivity) homeFragment.getActivity();
|
|
||||||
if (mainActivity == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mainActivity.setPhotos(images);
|
|
||||||
|
|
||||||
lg.trace("Photos size: {}", homeFragment.getPhotosCount());
|
|
||||||
mainActivity.hideProgress();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,31 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.callbacks.panoramio;
|
|
||||||
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.events.LocationChangedEvent;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioLocationCallback {
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioLocationCallback.class);
|
|
||||||
private HomeFragment homeFragment;
|
|
||||||
|
|
||||||
public PanoramioLocationCallback(HomeFragment homeFragment) {
|
|
||||||
this.homeFragment = homeFragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subscribe
|
|
||||||
public void handleLocationChanged(LocationChangedEvent event) {
|
|
||||||
homeFragment.setNoMorePhotos(false);
|
|
||||||
homeFragment.setPhotos(new ArrayList<PanoramioImageInfo>());
|
|
||||||
EventBus.getDefault().post(new RefreshEvent(this));
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.callbacks.panoramio;
|
|
||||||
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.events.ProviderStatusChangedEvent;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioProviderCallback {
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioProviderCallback.class);
|
|
||||||
private HomeFragment homeFragment;
|
|
||||||
|
|
||||||
public PanoramioProviderCallback(HomeFragment homeFragment) {
|
|
||||||
this.homeFragment = homeFragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subscribe
|
|
||||||
public void handleProviderStatusChanged(ProviderStatusChangedEvent event) {
|
|
||||||
if (event.isEnabled()) {
|
|
||||||
lg.trace("Handling provider enabling - refreshing panoramio listing");
|
|
||||||
EventBus.getDefault().post(new RefreshEvent(this));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -4,10 +4,8 @@ package pl.tpolgrabia.urbanexplorer.dto;
|
||||||
* Created by tpolgrabia on 19.09.16.
|
* Created by tpolgrabia on 19.09.16.
|
||||||
*/
|
*/
|
||||||
public enum MainActivityState {
|
public enum MainActivityState {
|
||||||
PANORAMIO(0),
|
|
||||||
WIKI(1),
|
WIKI(1),
|
||||||
GOOGLE_PLACES(2),
|
GOOGLE_PLACES(2);
|
||||||
PANORAMIO_SHOWER(-1);
|
|
||||||
|
|
||||||
private final Integer order;
|
private final Integer order;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,73 @@
|
||||||
|
package pl.tpolgrabia.urbanexplorer.dto;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by tpolgrabia on 19.11.16.
|
||||||
|
*/
|
||||||
|
public class PanoramioRequest {
|
||||||
|
private Long offset;
|
||||||
|
private Long count;
|
||||||
|
private Double latitude;
|
||||||
|
private Double longitude;
|
||||||
|
private Double radiusX;
|
||||||
|
private Double radiusY;
|
||||||
|
|
||||||
|
public Long getOffset() {
|
||||||
|
return offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOffset(Long offset) {
|
||||||
|
this.offset = offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getCount() {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCount(Long count) {
|
||||||
|
this.count = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getLatitude() {
|
||||||
|
return latitude;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLatitude(Double latitude) {
|
||||||
|
this.latitude = latitude;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getLongitude() {
|
||||||
|
return longitude;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLongitude(Double longitude) {
|
||||||
|
this.longitude = longitude;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getRadiusX() {
|
||||||
|
return radiusX;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRadiusX(Double radiusX) {
|
||||||
|
this.radiusX = radiusX;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getRadiusY() {
|
||||||
|
return radiusY;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRadiusY(Double radiusY) {
|
||||||
|
this.radiusY = radiusY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "PanoramioRequest{" +
|
||||||
|
"offset=" + offset +
|
||||||
|
", count=" + count +
|
||||||
|
", latitude=" + latitude +
|
||||||
|
", longitude=" + longitude +
|
||||||
|
", radiusX=" + radiusX +
|
||||||
|
", radiusY=" + radiusY +
|
||||||
|
'}';
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,70 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.dto.panoramio;
|
|
||||||
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 18.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioCacheDto implements Serializable{
|
|
||||||
private static final long serialVersionUID = -8856222832500878380L;
|
|
||||||
private List<PanoramioImageInfo> panoramioImages;
|
|
||||||
private Double latitude;
|
|
||||||
private Double longitude;
|
|
||||||
private Double altitude;
|
|
||||||
private Date fetchedAt;
|
|
||||||
|
|
||||||
public Date getFetchedAt() {
|
|
||||||
return fetchedAt;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setFetchedAt(Date fetchedAt) {
|
|
||||||
this.fetchedAt = fetchedAt;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<PanoramioImageInfo> getPanoramioImages() {
|
|
||||||
return panoramioImages;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPanoramioImages(List<PanoramioImageInfo> panoramioImages) {
|
|
||||||
this.panoramioImages = panoramioImages;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getLatitude() {
|
|
||||||
return latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLatitude(Double latitude) {
|
|
||||||
this.latitude = latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getLongitude() {
|
|
||||||
return longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLongitude(Double longitude) {
|
|
||||||
this.longitude = longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getAltitude() {
|
|
||||||
return altitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setAltitude(Double altitude) {
|
|
||||||
this.altitude = altitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "PanoramioCacheDto{" +
|
|
||||||
"panoramioImages=" + panoramioImages +
|
|
||||||
", latitude=" + latitude +
|
|
||||||
", longitude=" + longitude +
|
|
||||||
", altitude=" + altitude +
|
|
||||||
", fetchedAt=" + fetchedAt +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,41 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.events;
|
|
||||||
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.handlers.PanoramioItemLongClickHandler;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 26.10.16.
|
|
||||||
*/
|
|
||||||
public class PhotoInfoUpdateEvent {
|
|
||||||
private Object source;
|
|
||||||
private PanoramioImageInfo photoInfo;
|
|
||||||
|
|
||||||
public PhotoInfoUpdateEvent(Object source, PanoramioImageInfo photoInfo) {
|
|
||||||
this.source = source;
|
|
||||||
this.photoInfo = photoInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Object getSource() {
|
|
||||||
return source;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSource(Object source) {
|
|
||||||
this.source = source;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PanoramioImageInfo getPhotoInfo() {
|
|
||||||
return photoInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhotoInfo(PanoramioImageInfo photoInfo) {
|
|
||||||
this.photoInfo = photoInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "PhotoInfoUpdateEvent{" +
|
|
||||||
"source=" + source +
|
|
||||||
", photoInfo=" + photoInfo +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,298 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.fragments;
|
|
||||||
|
|
||||||
import android.location.Location;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.support.v4.app.FragmentActivity;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.googleutils.utils.GeocoderUtils;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.utils.PanoramioUtils;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.AppConstants;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.MainActivity;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.R;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.callbacks.*;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.callbacks.geocoder.GeocodedLocationCallback;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.callbacks.panoramio.FetchAdditionalPanoramioPhotosCallback;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.callbacks.panoramio.FetchPanoramioPhotosCallback;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.callbacks.panoramio.PanoramioLocationCallback;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.callbacks.panoramio.PanoramioProviderCallback;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.handlers.PanoramioItemLongClickHandler;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.handlers.PanoramioLocationsScrollListener;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.utils.*;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.utils.DebugUtils;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.utils.SettingsUtils;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.Semaphore;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
*/
|
|
||||||
public class HomeFragment extends Fragment {
|
|
||||||
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(HomeFragment.class);
|
|
||||||
|
|
||||||
public static final String TAG = HomeFragment.class.getSimpleName();
|
|
||||||
public static final String PHOTO_LIST = "PHOTO_LIST_KEY";
|
|
||||||
private boolean initialized = false;
|
|
||||||
private View inflatedView;
|
|
||||||
private Semaphore loading;
|
|
||||||
private ArrayList<PanoramioImageInfo> photos;
|
|
||||||
private boolean noMorePhotos;
|
|
||||||
private String currentGeocodedLocation;
|
|
||||||
private GeocoderUtils geocoderUtils;
|
|
||||||
private PanoramioLocationCallback locationChangedHandler;
|
|
||||||
private PanoramioProviderCallback providerChangedHandler;
|
|
||||||
|
|
||||||
public HomeFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
lg.trace("onCreate {}", System.identityHashCode(this));
|
|
||||||
EventBus.getDefault().register(this);
|
|
||||||
loading = new Semaphore(1, true);
|
|
||||||
noMorePhotos = false;
|
|
||||||
updateLocationInfo();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onActivityCreated(savedInstanceState);
|
|
||||||
|
|
||||||
locationChangedHandler = new PanoramioLocationCallback(this);
|
|
||||||
providerChangedHandler = new PanoramioProviderCallback(this);
|
|
||||||
|
|
||||||
EventBus.getDefault().register(locationChangedHandler);
|
|
||||||
EventBus.getDefault().register(providerChangedHandler);
|
|
||||||
|
|
||||||
geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void updateGeocodedLocation() {
|
|
||||||
if (getActivity() == null) {
|
|
||||||
lg.debug("Activity still not attached");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Location currLocation = LocationUtils.getLastKnownLocation(getActivity());
|
|
||||||
lg.debug("Current location is {}", currLocation);
|
|
||||||
if (currLocation == null) {
|
|
||||||
lg.debug("Current location is not available");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
geocoderUtils.getGeoCodedLocation(
|
|
||||||
currLocation.getLatitude(),
|
|
||||||
currLocation.getLongitude(),
|
|
||||||
new GeocodedLocationCallback(this));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
lg.trace("TAG: {}", getTag());
|
|
||||||
DebugUtils.dumpFragments(getFragmentManager().getFragments());
|
|
||||||
|
|
||||||
inflatedView = inflater.inflate(R.layout.fragment_home, container, false);
|
|
||||||
ListView locations = (ListView)inflatedView.findViewById(R.id.locations);
|
|
||||||
final ListView finalLocations = locations;
|
|
||||||
locations.setOnItemLongClickListener(new PanoramioItemLongClickHandler(this, finalLocations));
|
|
||||||
|
|
||||||
initialized = true;
|
|
||||||
|
|
||||||
lg.trace("Saved instance state {}", savedInstanceState);
|
|
||||||
if (photos == null) {
|
|
||||||
photos = PanoramioCacheUtils.loadPhotosFromCache(this, savedInstanceState);
|
|
||||||
}
|
|
||||||
|
|
||||||
locations.setAdapter(new PanoramioAdapter(getActivity(), R.layout.location_item, photos));
|
|
||||||
lg.trace("Photos initialized {}", photos);
|
|
||||||
|
|
||||||
lg.trace("Photos size: {}", photos.size());
|
|
||||||
locations.setOnScrollListener(new PanoramioLocationsScrollListener(this));
|
|
||||||
return inflatedView;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void fetchAdditionalPhotos() throws InterruptedException {
|
|
||||||
final FragmentActivity activity = getActivity();
|
|
||||||
if (activity == null) {
|
|
||||||
lg.trace("Activity shouldn't be null. No headless fragment");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
MainActivity mainActivity = (MainActivity)getActivity();
|
|
||||||
if (noMorePhotos) {
|
|
||||||
lg.trace("No more photos - last query was zero result");
|
|
||||||
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!initialized) {
|
|
||||||
lg.trace("Fetching additional photos blocked till system is initialized");
|
|
||||||
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (getView() == null) {
|
|
||||||
lg.trace("Application still not initialized");
|
|
||||||
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
final Location location = LocationUtils.getLastKnownLocation(activity);
|
|
||||||
if (location == null) {
|
|
||||||
lg.info("Location still not available");
|
|
||||||
Toast.makeText(activity, "Location still not available", Toast.LENGTH_SHORT).show();
|
|
||||||
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
lg.trace("Fetching additional photos. Trying loading acquirng lock");
|
|
||||||
if (!loading.tryAcquire()) {
|
|
||||||
lg.info("Fetching additional photos. Loading in progress");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
int offset = photos.size();
|
|
||||||
lg.debug("Fetching additional photos offset: {}, count: {}", offset, SettingsUtils.getPanoramioBulkDataSize(getActivity()));
|
|
||||||
PanoramioUtils.fetchPanoramioImages(
|
|
||||||
activity,
|
|
||||||
location.getLatitude(),
|
|
||||||
location.getLongitude(),
|
|
||||||
SettingsUtils.fetchRadiusX(getActivity()),
|
|
||||||
SettingsUtils.fetchRadiusY(getActivity()),
|
|
||||||
(long)(offset),
|
|
||||||
fetchLocationPageSize(),
|
|
||||||
new FetchAdditionalPanoramioPhotosCallback(this, activity)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Long fetchLocationPageSize() {
|
|
||||||
return Long.valueOf(SettingsUtils.getPanoramioBulkDataSize(getActivity()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
getActivity().setTitle("Panoramio search");
|
|
||||||
lg.trace("onResume");
|
|
||||||
if (currentGeocodedLocation != null) {
|
|
||||||
updateLocationInfo();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
updateGeocodedLocation();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void updateLocationInfo() {
|
|
||||||
lg.trace("Update locations info");
|
|
||||||
final View view = getView();
|
|
||||||
if (view == null) {
|
|
||||||
lg.warn("Fragment has no view");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
final TextView locationInfo = (TextView) view.findViewById(R.id.locationInfo);
|
|
||||||
final FragmentActivity activity = getActivity();
|
|
||||||
if (activity == null) {
|
|
||||||
lg.warn("Activity should'nt be null. No headless fragment");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
final Location currLocation = LocationUtils.getLastKnownLocation(activity);
|
|
||||||
lg.trace("Current location: {}, locationInfo: {}", currLocation, locationInfo);
|
|
||||||
locationInfo.setText(currentGeocodedLocation);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
lg.trace("onDestroy");
|
|
||||||
EventBus.getDefault().unregister(this);
|
|
||||||
PanoramioCacheUtils.savePhotosToCache(getActivity(), photos);
|
|
||||||
|
|
||||||
// FIXME true reason is that hot swapping doesn't fire the activityCreated event while it was recreated
|
|
||||||
if (locationChangedHandler != null) {
|
|
||||||
// FIXME only avoiding crash
|
|
||||||
EventBus.getDefault().unregister(locationChangedHandler);
|
|
||||||
}
|
|
||||||
if (providerChangedHandler != null) {
|
|
||||||
// FIXME only avoiding crash
|
|
||||||
EventBus.getDefault().unregister(providerChangedHandler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSaveInstanceState(Bundle outState) {
|
|
||||||
lg.trace("Saving state");
|
|
||||||
super.onSaveInstanceState(outState);
|
|
||||||
outState.putSerializable(PHOTO_LIST, photos);
|
|
||||||
lg.trace("Saved photos: {}", photos);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subscribe
|
|
||||||
public void refresh(RefreshEvent refreshEvent) {
|
|
||||||
lg.debug("Refreshing event...");
|
|
||||||
lg.trace("Fetch panoramio photos");
|
|
||||||
final FragmentActivity activity = getActivity();
|
|
||||||
if (activity == null) {
|
|
||||||
lg.warn("Activity shouldn't be null. It isn't headless fragment");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final Location location = LocationUtils.getLastKnownLocation(activity);
|
|
||||||
if (location == null) {
|
|
||||||
lg.info("Location is still not available");
|
|
||||||
EventBus.getDefault().post(new DataLoadingFinishEvent(this));
|
|
||||||
Toast.makeText(getActivity(), "Location is still not available", Toast.LENGTH_SHORT).show();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
PanoramioUtils.fetchPanoramioImages(
|
|
||||||
activity,
|
|
||||||
location.getLatitude(),
|
|
||||||
location.getLongitude(),
|
|
||||||
SettingsUtils.fetchRadiusX(getActivity()),
|
|
||||||
SettingsUtils.fetchRadiusY(getActivity()),
|
|
||||||
0L,
|
|
||||||
fetchLocationPageSize(),
|
|
||||||
new FetchPanoramioPhotosCallback(this, activity)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Semaphore getLoading() {
|
|
||||||
return loading;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setNoMorePhotos(boolean noMorePhotos) {
|
|
||||||
this.noMorePhotos = noMorePhotos;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getPhotosCount() {
|
|
||||||
return photos.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addPhotos(List<PanoramioImageInfo> images) {
|
|
||||||
photos.addAll(images);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCurrentGeocodedLocation(String currentGeocodedLocation) {
|
|
||||||
this.currentGeocodedLocation = currentGeocodedLocation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhotos(ArrayList<PanoramioImageInfo> photos) {
|
|
||||||
this.photos = photos;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,30 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.fragments;
|
|
||||||
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import pl.tpolgrabia.urbanexplorer.R;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
*/
|
|
||||||
public class LoginFragment extends Fragment {
|
|
||||||
|
|
||||||
|
|
||||||
public LoginFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
return inflater.inflate(R.layout.fragment_login, container, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,71 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.fragments;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.BitmapFactory;
|
|
||||||
import android.support.v4.app.FragmentActivity;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import com.androidquery.AQuery;
|
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.MainActivity;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.R;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.utils.NetUtils;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 27.08.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioAdapter extends ArrayAdapter<PanoramioImageInfo> {
|
|
||||||
public static final int MAX_OWNERNAME_LENGTH = 10;
|
|
||||||
public static final int MAX_PANORAMIO_DESCRIPTION_LENGTH = 96;
|
|
||||||
|
|
||||||
public PanoramioAdapter(FragmentActivity ctx, int location_item, List<PanoramioImageInfo> photosDescriptions) {
|
|
||||||
super(ctx, location_item, photosDescriptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View getView(int position, View convertView, ViewGroup parent) {
|
|
||||||
LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
||||||
View itemView = convertView != null ? convertView : inflater.inflate(R.layout.location_item, parent, false);
|
|
||||||
final PanoramioImageInfo item = getItem(position);
|
|
||||||
|
|
||||||
if (item.getPhotoId() != null && item.getPhotoId().equals(itemView.getTag())) {
|
|
||||||
// if it is the the same object f.e. add new objects to the collection (without the slide)
|
|
||||||
// the refresh makes blinking without this
|
|
||||||
return itemView;
|
|
||||||
}
|
|
||||||
|
|
||||||
TextView locDesc = (TextView) itemView.findViewById(R.id.location_description);
|
|
||||||
itemView.setTag(item.getPhotoId());
|
|
||||||
final String description = item.getPhotoTitle();
|
|
||||||
final String trimmedDescription =
|
|
||||||
description != null && description.length() > MAX_PANORAMIO_DESCRIPTION_LENGTH
|
|
||||||
? description.substring(0, MAX_PANORAMIO_DESCRIPTION_LENGTH) + "..."
|
|
||||||
: description;
|
|
||||||
locDesc.setText(trimmedDescription);
|
|
||||||
final String photoUrl = item.getPhotoFileUrl();
|
|
||||||
ImageView photoImg = (ImageView) itemView.findViewById(R.id.photo_img);
|
|
||||||
photoImg.setImageBitmap(BitmapFactory.decodeResource(getContext().getResources(), R.drawable.noimage));
|
|
||||||
ImageLoader.getInstance().displayImage(photoUrl, photoImg, MainActivity.options);
|
|
||||||
|
|
||||||
|
|
||||||
TextView authorWidget = (TextView) itemView.findViewById(R.id.location_author);
|
|
||||||
final String ownerName = item.getOwnerName();
|
|
||||||
final String trimmedOwnerName =
|
|
||||||
ownerName != null && ownerName.length() > MAX_OWNERNAME_LENGTH
|
|
||||||
? ownerName.substring(0, MAX_OWNERNAME_LENGTH) + "..."
|
|
||||||
: ownerName;
|
|
||||||
authorWidget.setText(trimmedOwnerName);
|
|
||||||
|
|
||||||
TextView uploadDateWidget = (TextView) itemView.findViewById(R.id.location_upload_date);
|
|
||||||
uploadDateWidget.setText(item.getUploadDate());
|
|
||||||
|
|
||||||
return itemView;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,155 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.fragments;
|
|
||||||
|
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.support.v4.app.FragmentActivity;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.MainActivity;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.R;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.events.PhotoInfoUpdateEvent;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
*/
|
|
||||||
public class PanoramioShowerFragment extends Fragment {
|
|
||||||
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioShowerFragment.class);
|
|
||||||
|
|
||||||
|
|
||||||
public static final String PANORAMIO_PHOTO_ARG_KEY = "PANORAMIO_PHOTO_ARG_KEY";
|
|
||||||
public static final String TAG = "PANORAMIO_TAG";
|
|
||||||
private TextView photoTitle;
|
|
||||||
private TextView photoUploadDate;
|
|
||||||
private TextView photoAuthor;
|
|
||||||
private TextView photoUrl;
|
|
||||||
private TextView photoLocation;
|
|
||||||
|
|
||||||
public PanoramioShowerFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
EventBus.getDefault().register(this);
|
|
||||||
lg.debug("Registering...");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
Bundle arguments = getArguments();
|
|
||||||
final View inflatedView = inflater.inflate(R.layout.fragment_panoramio_shower, container, false);
|
|
||||||
|
|
||||||
if (arguments == null) {
|
|
||||||
return inflatedView;
|
|
||||||
}
|
|
||||||
|
|
||||||
final PanoramioImageInfo imageInfo = (PanoramioImageInfo) arguments.getSerializable(PANORAMIO_PHOTO_ARG_KEY);
|
|
||||||
|
|
||||||
if (imageInfo == null) {
|
|
||||||
return inflatedView;
|
|
||||||
}
|
|
||||||
|
|
||||||
setContent(inflatedView, imageInfo);
|
|
||||||
|
|
||||||
return inflatedView;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setContent(View view, final PanoramioImageInfo imageInfo) {
|
|
||||||
if (imageInfo != null) {
|
|
||||||
ImageLoader.getInstance().displayImage(
|
|
||||||
imageInfo.getPhotoFileUrl(),
|
|
||||||
(ImageView) view.findViewById(R.id.photo_container),
|
|
||||||
MainActivity.rectOptions);
|
|
||||||
|
|
||||||
photoTitle = (TextView)view.findViewById(R.id.photo_title);
|
|
||||||
photoTitle.setText(imageInfo.getPhotoTitle());
|
|
||||||
|
|
||||||
photoUploadDate = (TextView)view.findViewById(R.id.photo_upload);
|
|
||||||
photoUploadDate.setText(imageInfo.getUploadDate());
|
|
||||||
|
|
||||||
photoAuthor = (TextView)view.findViewById(R.id.photo_author);
|
|
||||||
photoAuthor.setText(imageInfo.getOwnerName());
|
|
||||||
|
|
||||||
photoUrl = (TextView)view.findViewById(R.id.photo_url);
|
|
||||||
photoUrl.setText(imageInfo.getPhotoUrl());
|
|
||||||
photoUrl.setOnLongClickListener(new View.OnLongClickListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onLongClick(View v) {
|
|
||||||
Intent intent = new Intent(Intent.ACTION_VIEW,
|
|
||||||
Uri.parse(imageInfo.getPhotoUrl()));
|
|
||||||
startActivity(intent);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
photoLocation = (TextView)view.findViewById(R.id.photo_location);
|
|
||||||
photoLocation.setText(imageInfo.getLatitude() + "," + imageInfo.getLongitude());
|
|
||||||
photoLocation.setOnLongClickListener(new View.OnLongClickListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onLongClick(View v) {
|
|
||||||
Intent intent = new Intent(Intent.ACTION_VIEW,
|
|
||||||
Uri.parse("http://maps.google.com/maps?daddr=" + imageInfo.getLatitude() + "," +
|
|
||||||
imageInfo.getLongitude()));
|
|
||||||
startActivity(intent);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subscribe
|
|
||||||
public void handlePhotoInfoUpdate(PhotoInfoUpdateEvent event) {
|
|
||||||
lg.debug("Photo event: {}", event);
|
|
||||||
if (getView() == null) {
|
|
||||||
lg.debug("View is not available");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final PanoramioImageInfo photoInfo = event.getPhotoInfo();
|
|
||||||
if (photoInfo == null) {
|
|
||||||
lg.debug("Photo info is not available");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setContent(getView(), photoInfo);
|
|
||||||
|
|
||||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
|
||||||
0,
|
|
||||||
LinearLayout.LayoutParams.MATCH_PARENT,
|
|
||||||
1);
|
|
||||||
getView().setLayoutParams(params);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
|
|
||||||
EventBus.getDefault().unregister(this);
|
|
||||||
lg.debug("Unregistering...");
|
|
||||||
|
|
||||||
FragmentActivity acc = getActivity();
|
|
||||||
if (acc != null) {
|
|
||||||
MainActivity mainActivity = (MainActivity)acc;
|
|
||||||
mainActivity.resetPhotoInfo();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -159,11 +159,11 @@ public class PlacesFragment extends Fragment {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Toast.makeText(getActivity(),
|
// Toast.makeText(getActivity(),
|
||||||
String.format(AppConstants.DEF_APP_LOCALE,
|
// String.format(AppConstants.DEF_APP_LOCALE,
|
||||||
"Location changed: %.3f,%.3f",
|
// "Location changed: %.3f,%.3f",
|
||||||
location.getLatitude(), location.getLongitude()),
|
// location.getLatitude(), location.getLongitude()),
|
||||||
Toast.LENGTH_SHORT).show();
|
// Toast.LENGTH_SHORT).show();
|
||||||
|
|
||||||
cleanAdapter();
|
cleanAdapter();
|
||||||
|
|
||||||
|
@ -220,12 +220,12 @@ public class PlacesFragment extends Fragment {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Toast.makeText(getActivity(),
|
// Toast.makeText(getActivity(),Comm
|
||||||
String.format(AppConstants.DEF_APP_LOCALE,
|
// String.format(AppConstants.DEF_APP_LOCALE,
|
||||||
"Fetching nearby places %.3f,%.3f",
|
// "Fetching nearby places %.3f,%.3f",
|
||||||
location.getLatitude(),
|
// location.getLatitude(),
|
||||||
location.getLongitude()),
|
// location.getLongitude()),
|
||||||
Toast.LENGTH_SHORT).show();
|
// Toast.LENGTH_SHORT).show();
|
||||||
|
|
||||||
|
|
||||||
GooglePlacesRequest request = new GooglePlacesRequest();
|
GooglePlacesRequest request = new GooglePlacesRequest();
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.handlers;
|
|
||||||
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.utils.PanoramioUtils;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.AppConstants;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.MainActivity;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.events.PhotoInfoUpdateEvent;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioAdapter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioItemLongClickHandler implements AdapterView.OnItemLongClickListener {
|
|
||||||
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioItemLongClickHandler.class);
|
|
||||||
|
|
||||||
private HomeFragment homeFragment;
|
|
||||||
private final ListView finalLocations;
|
|
||||||
|
|
||||||
public PanoramioItemLongClickHandler(HomeFragment homeFragment, ListView finalLocations) {
|
|
||||||
this.homeFragment = homeFragment;
|
|
||||||
this.finalLocations = finalLocations;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onItemLongClick(AdapterView<?> adapterView, View view, int pos, long rowId) {
|
|
||||||
PanoramioAdapter panAdapter = (PanoramioAdapter) finalLocations.getAdapter();
|
|
||||||
PanoramioImageInfo photoInfo = panAdapter.getItem(pos);
|
|
||||||
MainActivity activity = (MainActivity) homeFragment.getActivity();
|
|
||||||
if (PanoramioSwitchHandler.enoughLargeAndHorizontal(activity)) {
|
|
||||||
lg.debug("Sending panoramio image event");
|
|
||||||
EventBus.getDefault().post(new PhotoInfoUpdateEvent(this, photoInfo));
|
|
||||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
|
||||||
0,
|
|
||||||
LinearLayout.LayoutParams.MATCH_PARENT,
|
|
||||||
1);
|
|
||||||
View layout = homeFragment.getView();
|
|
||||||
layout.setLayoutParams(params);
|
|
||||||
} else {
|
|
||||||
activity.switchToPhoto(photoInfo);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,58 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.handlers;
|
|
||||||
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.AbsListView;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioLocationsScrollListener implements AbsListView.OnScrollListener {
|
|
||||||
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioLocationsScrollListener.class);
|
|
||||||
private HomeFragment homeFragment;
|
|
||||||
|
|
||||||
public PanoramioLocationsScrollListener(HomeFragment homeFragment) {
|
|
||||||
this.homeFragment = homeFragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onScrollStateChanged(AbsListView view, int scrollState) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onScroll(AbsListView view,
|
|
||||||
int firstVisibleItem,
|
|
||||||
int visibleItemCount,
|
|
||||||
int totalItemCount) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
if (firstVisibleItem <= 0) {
|
|
||||||
// scrolled to the top
|
|
||||||
lg.trace("Scrolled to the top");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firstVisibleItem + visibleItemCount >= totalItemCount) {
|
|
||||||
lg.trace("Scrolled to the bottom");
|
|
||||||
// scrolled to the bottom
|
|
||||||
final View fragView = homeFragment.getView();
|
|
||||||
if (fragView == null) {
|
|
||||||
lg.trace("Frag still not initialized");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
homeFragment.fetchAdditionalPhotos();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
lg.error("Aquiring lock interrupted exception", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,24 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.handlers;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.MainActivity;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioShowerSwitchHandler implements Runnable {
|
|
||||||
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioShowerSwitchHandler.class);
|
|
||||||
private final MainActivity mainActivity;
|
|
||||||
|
|
||||||
public PanoramioShowerSwitchHandler(MainActivity mainActivity) {
|
|
||||||
this.mainActivity = mainActivity;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
lg.debug("Switching to panoramio shower");
|
|
||||||
mainActivity.switchToPhoto(mainActivity.getPhotoInfo());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,42 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.handlers;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.util.DisplayMetrics;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.utils.PanoramioUtils;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.AppConstants;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.MainActivity;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioShowerFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 21.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioSwitchHandler implements Runnable {
|
|
||||||
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioSwitchHandler.class);
|
|
||||||
private final MainActivity mainActivity;
|
|
||||||
|
|
||||||
public PanoramioSwitchHandler(MainActivity mainActivity) {
|
|
||||||
this.mainActivity = mainActivity;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
lg.debug("Switching to home fragment");
|
|
||||||
mainActivity.switchFragment(new HomeFragment(), HomeFragment.TAG);
|
|
||||||
if (enoughLargeAndHorizontal(mainActivity)) {
|
|
||||||
mainActivity.addFragment(MainActivity.createShowerFragment(null), PanoramioShowerFragment.TAG);
|
|
||||||
// mainActivity.addFragment(new WikiLocationsFragment(), WikiLocationsFragment.TAG);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean enoughLargeAndHorizontal(Activity ctx) {
|
|
||||||
DisplayMetrics metrics = PanoramioUtils.calcMetrics(ctx);
|
|
||||||
return metrics.widthPixels >= metrics.heightPixels // horizontal
|
|
||||||
&& PanoramioUtils.calcDiag(ctx) >= AppConstants.PANORAMIO_SHOWER_SIDEBAR_THRESHOLD;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,126 +0,0 @@
|
||||||
package pl.tpolgrabia.urbanexplorer.utils;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.location.Location;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.google.gson.stream.JsonReader;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.AppConstants;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioCacheDto;
|
|
||||||
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
|
|
||||||
|
|
||||||
import java.io.*;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.GregorianCalendar;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 25.09.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioCacheUtils {
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioCacheUtils.class);
|
|
||||||
|
|
||||||
private PanoramioCacheUtils() {
|
|
||||||
/**
|
|
||||||
* EMPTY
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ArrayList<PanoramioImageInfo> loadPhotosFromCache(HomeFragment homeFragment, Bundle savedBundleSettings) {
|
|
||||||
ArrayList<PanoramioImageInfo> photos;
|
|
||||||
|
|
||||||
if (savedBundleSettings == null) {
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
final Serializable serPhotos = savedBundleSettings.getSerializable(HomeFragment.PHOTO_LIST);
|
|
||||||
lg.trace("Photo list serPhotos {}", serPhotos);
|
|
||||||
photos = (ArrayList<PanoramioImageInfo>) serPhotos;
|
|
||||||
|
|
||||||
if (photos != null && !photos.isEmpty()) {
|
|
||||||
// we are using from serializable bundle photos
|
|
||||||
return photos;
|
|
||||||
} else {
|
|
||||||
// maybe we find something in our cache file
|
|
||||||
Reader reader = null;
|
|
||||||
try {
|
|
||||||
reader =
|
|
||||||
new InputStreamReader(
|
|
||||||
new FileInputStream(
|
|
||||||
new File(homeFragment.getActivity().getCacheDir(),
|
|
||||||
AppConstants.PANORAMIO_CACHE_FILENAME)));
|
|
||||||
|
|
||||||
PanoramioCacheDto dto = new Gson().fromJson(new JsonReader(reader), PanoramioCacheDto.class);
|
|
||||||
if (dto == null) {
|
|
||||||
lg.trace("Sorry, photos I/O cache is null");
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
photos = new ArrayList<>(dto.getPanoramioImages());
|
|
||||||
lg.trace("Photos size from I/O cache is {}", photos.size());
|
|
||||||
lg.trace("I've read photos from I/O cache");
|
|
||||||
return photos;
|
|
||||||
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
lg.error("File not found", e);
|
|
||||||
return new ArrayList<>();
|
|
||||||
} catch (IOException e) {
|
|
||||||
lg.error("I/O error", e);
|
|
||||||
return new ArrayList<>();
|
|
||||||
} catch (Throwable t) {
|
|
||||||
lg.error("Throwable", t);
|
|
||||||
return new ArrayList<>();
|
|
||||||
} finally {
|
|
||||||
if (reader != null) {
|
|
||||||
try {
|
|
||||||
reader.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
lg.error("Error closing reader - I/O error", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void savePhotosToCache(Context ctx, ArrayList<PanoramioImageInfo> photos) {
|
|
||||||
File cacheDir = ctx.getCacheDir();
|
|
||||||
BufferedWriter br = null;
|
|
||||||
try {
|
|
||||||
br = new BufferedWriter(
|
|
||||||
new OutputStreamWriter(
|
|
||||||
new FileOutputStream(
|
|
||||||
new File(cacheDir, AppConstants.PANORAMIO_CACHE_FILENAME))));
|
|
||||||
|
|
||||||
PanoramioCacheDto dto = new PanoramioCacheDto();
|
|
||||||
dto.setPanoramioImages(photos);
|
|
||||||
|
|
||||||
Location location = LocationUtils.getLastKnownLocation(ctx);
|
|
||||||
if (location != null) {
|
|
||||||
dto.setLongitude(location.getLongitude());
|
|
||||||
dto.setLatitude(location.getLatitude());
|
|
||||||
dto.setAltitude(location.getAltitude());
|
|
||||||
}
|
|
||||||
|
|
||||||
dto.setFetchedAt(new GregorianCalendar().getTime());
|
|
||||||
// FIXME this should be a fetch time, not persist time
|
|
||||||
|
|
||||||
new Gson().toJson(dto, br);
|
|
||||||
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
lg.error("File not found", e);
|
|
||||||
} catch (IOException e) {
|
|
||||||
lg.error("I/O Exception", e);
|
|
||||||
} finally {
|
|
||||||
if (br != null) {
|
|
||||||
try {
|
|
||||||
br.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
lg.error("I/O error during photos cache saving", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -7,8 +7,8 @@ android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 21
|
targetSdkVersion 21
|
||||||
versionCode 1
|
versionCode 2
|
||||||
versionName "1.0"
|
versionName "1.0.1"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
/build
|
|
|
@ -1,39 +0,0 @@
|
||||||
apply plugin: 'com.android.library'
|
|
||||||
|
|
||||||
android {
|
|
||||||
compileSdkVersion 21
|
|
||||||
buildToolsVersion "24.0.2"
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
minSdkVersion 16
|
|
||||||
targetSdkVersion 21
|
|
||||||
versionCode 2
|
|
||||||
versionName "1.0.1"
|
|
||||||
}
|
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
minifyEnabled false
|
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lintOptions {
|
|
||||||
disable 'InvalidPackage'
|
|
||||||
abortOnError false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
|
||||||
testCompile 'junit:junit:4.12'
|
|
||||||
compile 'com.android.support:appcompat-v7:21.0.3'
|
|
||||||
compile 'org.greenrobot:eventbus:3.0.0'
|
|
||||||
|
|
||||||
compile 'org.slf4j:slf4j-api:1.7.21'
|
|
||||||
compile 'com.github.tony19:logback-android-core:1.1.1-6'
|
|
||||||
compile('com.github.tony19:logback-android-classic:1.1.1-6') {
|
|
||||||
// workaround issue #73
|
|
||||||
exclude group: 'com.google.android', module: 'android'
|
|
||||||
}
|
|
||||||
compile project(':urbanexplorerutils')
|
|
||||||
}
|
|
|
@ -1,17 +0,0 @@
|
||||||
# Add project specific ProGuard rules here.
|
|
||||||
# By default, the flags in this file are appended to flags specified
|
|
||||||
# in /home/tpolgrabia/bin/android-sdk-linux/tools/proguard/proguard-android.txt
|
|
||||||
# You can edit the include path and order by changing the proguardFiles
|
|
||||||
# directive in build.gradle.
|
|
||||||
#
|
|
||||||
# For more details, see
|
|
||||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
|
||||||
|
|
||||||
# Add any project specific keep options here:
|
|
||||||
|
|
||||||
# If your project uses WebView with JS, uncomment the following
|
|
||||||
# and specify the fully qualified class name to the JavaScript interface
|
|
||||||
# class:
|
|
||||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
|
||||||
# public *;
|
|
||||||
#}
|
|
|
@ -1,13 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings;
|
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.test.ApplicationTestCase;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
|
|
||||||
*/
|
|
||||||
public class ApplicationTest extends ApplicationTestCase<Application> {
|
|
||||||
public ApplicationTest() {
|
|
||||||
super(Application.class);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,11 +0,0 @@
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
package="pl.tpolgrabia.panoramiobindings">
|
|
||||||
|
|
||||||
<application android:allowBackup="true"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:supportsRtl="true"
|
|
||||||
>
|
|
||||||
|
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
|
|
@ -1,11 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings.callback;
|
|
||||||
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 28.08.16.
|
|
||||||
*/
|
|
||||||
public interface PanoramioResponseCallback {
|
|
||||||
void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount);
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings.callback;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 28.08.16.
|
|
||||||
*/
|
|
||||||
public enum PanoramioResponseStatus {
|
|
||||||
GENERAL_ERROR,
|
|
||||||
NETWORK_ERROR,
|
|
||||||
SUCCESS
|
|
||||||
}
|
|
|
@ -1,136 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings.dto;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 27.08.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioImageInfo implements Serializable{
|
|
||||||
private static final long serialVersionUID = -3749926831546160047L;
|
|
||||||
private Double height;
|
|
||||||
private String ownerName;
|
|
||||||
private Long ownerId;
|
|
||||||
private String photoFileUrl;
|
|
||||||
private String photoTitle;
|
|
||||||
private String uploadDate;
|
|
||||||
private Double width;
|
|
||||||
private Double latitude;
|
|
||||||
private Double longitude;
|
|
||||||
private String ownerUrl;
|
|
||||||
private Long photoId;
|
|
||||||
private String photoUrl;
|
|
||||||
|
|
||||||
public Double getHeight() {
|
|
||||||
return height;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setHeight(Double height) {
|
|
||||||
this.height = height;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getOwnerName() {
|
|
||||||
return ownerName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOwnerName(String ownerName) {
|
|
||||||
this.ownerName = ownerName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getOwnerId() {
|
|
||||||
return ownerId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOwnerId(Long ownerId) {
|
|
||||||
this.ownerId = ownerId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPhotoFileUrl() {
|
|
||||||
return photoFileUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhotoFileUrl(String photoFileUrl) {
|
|
||||||
this.photoFileUrl = photoFileUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPhotoTitle() {
|
|
||||||
return photoTitle;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhotoTitle(String photoTitle) {
|
|
||||||
this.photoTitle = photoTitle;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUploadDate() {
|
|
||||||
return uploadDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUploadDate(String uploadDate) {
|
|
||||||
this.uploadDate = uploadDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getWidth() {
|
|
||||||
return width;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setWidth(Double width) {
|
|
||||||
this.width = width;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLatitude(Double latitude) {
|
|
||||||
this.latitude = latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getLatitude() {
|
|
||||||
return latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLongitude(Double longitude) {
|
|
||||||
this.longitude = longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getLongitude() {
|
|
||||||
return longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOwnerUrl(String ownerUrl) {
|
|
||||||
this.ownerUrl = ownerUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getOwnerUrl() {
|
|
||||||
return ownerUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhotoId(Long photoId) {
|
|
||||||
this.photoId = photoId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getPhotoId() {
|
|
||||||
return photoId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhotoUrl(String photoUrl) {
|
|
||||||
this.photoUrl = photoUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPhotoUrl() {
|
|
||||||
return photoUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "PanoramioImageInfo{" +
|
|
||||||
"height=" + height +
|
|
||||||
", ownerName='" + ownerName + '\'' +
|
|
||||||
", ownerId=" + ownerId +
|
|
||||||
", photoFileUrl='" + photoFileUrl + '\'' +
|
|
||||||
", photoTitle='" + photoTitle + '\'' +
|
|
||||||
", uploadDate='" + uploadDate + '\'' +
|
|
||||||
", width=" + width +
|
|
||||||
", latitude=" + latitude +
|
|
||||||
", longitude=" + longitude +
|
|
||||||
", ownerUrl='" + ownerUrl + '\'' +
|
|
||||||
", photoId=" + photoId +
|
|
||||||
", photoUrl='" + photoUrl + '\'' +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,46 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings.dto;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 28.08.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioMapLocation implements Serializable{
|
|
||||||
private static final long serialVersionUID = -3048527017887972550L;
|
|
||||||
private Double latitude;
|
|
||||||
private Double longitude;
|
|
||||||
private Long zoom;
|
|
||||||
|
|
||||||
public Double getLatitude() {
|
|
||||||
return latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLatitude(Double latitude) {
|
|
||||||
this.latitude = latitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getLongitude() {
|
|
||||||
return longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLongitude(Double longitude) {
|
|
||||||
this.longitude = longitude;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getZoom() {
|
|
||||||
return zoom;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setZoom(Long zoom) {
|
|
||||||
this.zoom = zoom;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "PanoramioMapLocation{" +
|
|
||||||
"latitude=" + latitude +
|
|
||||||
", longitude=" + longitude +
|
|
||||||
", zoom=" + zoom +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,57 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings.dto;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 28.08.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioResponse implements Serializable{
|
|
||||||
private static final long serialVersionUID = 8840731825651350777L;
|
|
||||||
private List<PanoramioImageInfo> photos;
|
|
||||||
private Long count;
|
|
||||||
private Boolean moreAvailable;
|
|
||||||
private PanoramioMapLocation mapLocation;
|
|
||||||
|
|
||||||
public List<PanoramioImageInfo> getPhotos() {
|
|
||||||
return photos;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPhotos(List<PanoramioImageInfo> photos) {
|
|
||||||
this.photos = photos;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getCount() {
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCount(Long count) {
|
|
||||||
this.count = count;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Boolean getMoreAvailable() {
|
|
||||||
return moreAvailable;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMoreAvailable(Boolean moreAvailable) {
|
|
||||||
this.moreAvailable = moreAvailable;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PanoramioMapLocation getMapLocation() {
|
|
||||||
return mapLocation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setMapLocation(PanoramioMapLocation mapLocation) {
|
|
||||||
this.mapLocation = mapLocation;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "PanoramioResponse{" +
|
|
||||||
"photos=" + photos +
|
|
||||||
", count=" + count +
|
|
||||||
", moreAvailable=" + moreAvailable +
|
|
||||||
", mapLocation=" + mapLocation +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,12 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings.exceptions;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 27.08.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioResponseNotExpected extends RuntimeException {
|
|
||||||
private static final long serialVersionUID = 4518500758010368539L;
|
|
||||||
|
|
||||||
public PanoramioResponseNotExpected(String errorCause) {
|
|
||||||
super(errorCause);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,173 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings.utils;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.PointF;
|
|
||||||
import android.util.DisplayMetrics;
|
|
||||||
import android.view.Display;
|
|
||||||
import com.androidquery.AQuery;
|
|
||||||
import com.androidquery.callback.AjaxCallback;
|
|
||||||
import com.androidquery.callback.AjaxStatus;
|
|
||||||
import org.json.JSONArray;
|
|
||||||
import org.json.JSONException;
|
|
||||||
import org.json.JSONObject;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.callback.PanoramioResponseCallback;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.callback.PanoramioResponseStatus;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioMapLocation;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.dto.PanoramioResponse;
|
|
||||||
import pl.tpolgrabia.panoramiobindings.exceptions.PanoramioResponseNotExpected;
|
|
||||||
import pl.tpolgrabia.urbanexplorerutils.utils.NetUtils;
|
|
||||||
|
|
||||||
import java.text.ParseException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by tpolgrabia on 27.08.16.
|
|
||||||
*/
|
|
||||||
public class PanoramioUtils {
|
|
||||||
|
|
||||||
private static final Logger lg = LoggerFactory.getLogger(PanoramioUtils.class);
|
|
||||||
private static final String CLASS_TAG = PanoramioUtils.class.getSimpleName();
|
|
||||||
|
|
||||||
private static final String LOCATIONS_LIST_IMAGE_SIZE = "medium";
|
|
||||||
private static final String LOCATIONS_ORDER = "popularity";
|
|
||||||
|
|
||||||
public static void fetchPanoramioImages(
|
|
||||||
Context ctx,
|
|
||||||
Double lat,
|
|
||||||
Double lon,
|
|
||||||
Double radiusX,
|
|
||||||
Double radiusY,
|
|
||||||
Long offset,
|
|
||||||
Long count,
|
|
||||||
final PanoramioResponseCallback callback) {
|
|
||||||
AQuery aq = NetUtils.createProxyAQueryInstance(ctx);
|
|
||||||
final String aqQuery = "http://www.panoramio.com/map/get_panoramas.php?" +
|
|
||||||
"set=public" +
|
|
||||||
"&from=" + offset +
|
|
||||||
"&to=" + (offset + count) +
|
|
||||||
"&minx=" + (lon - radiusX) +
|
|
||||||
"&miny=" + (lat - radiusY) +
|
|
||||||
"&maxx=" + (lon + radiusX) +
|
|
||||||
"&maxy=" + (lat + radiusX) +
|
|
||||||
"&size=" + LOCATIONS_LIST_IMAGE_SIZE +
|
|
||||||
"&order=" + LOCATIONS_ORDER +
|
|
||||||
"&mapfilter=true";
|
|
||||||
lg.debug("Query URL: {}", aqQuery);
|
|
||||||
aq.ajax(aqQuery,
|
|
||||||
JSONObject.class,
|
|
||||||
new AjaxCallback<JSONObject>() {
|
|
||||||
@Override
|
|
||||||
public void callback(String url, JSONObject object, AjaxStatus status) {
|
|
||||||
try {
|
|
||||||
lg.debug("Query code: {}, error: {}, message: {}, object: {}",
|
|
||||||
status.getCode(), status.getError(), status.getMessage(), object);
|
|
||||||
if (object == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<PanoramioImageInfo> photosInfos;
|
|
||||||
try {
|
|
||||||
photosInfos = PanoramioUtils.fetchPanoramioImagesFromResponse(object.getJSONArray("photos"));
|
|
||||||
} catch (ParseException e) {
|
|
||||||
lg.warn("Parse exception", e);
|
|
||||||
photosInfos = new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
Long photosCount = PanoramioUtils.fetchPanoramioImagesCountFromResponse(object);
|
|
||||||
callback.callback(PanoramioResponseStatus.SUCCESS,
|
|
||||||
photosInfos,
|
|
||||||
photosCount);
|
|
||||||
|
|
||||||
} catch (JSONException e) {
|
|
||||||
lg.warn("Json not supported format", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PanoramioImageInfo fetchPanoramioDto(JSONObject photo) throws JSONException, ParseException {
|
|
||||||
PanoramioImageInfo info = new PanoramioImageInfo();
|
|
||||||
info.setPhotoTitle(photo.getString("photo_title"));
|
|
||||||
info.setPhotoFileUrl(photo.getString("photo_file_url"));
|
|
||||||
info.setWidth(photo.getDouble("width"));
|
|
||||||
info.setHeight(photo.getDouble("height"));
|
|
||||||
info.setLatitude(photo.getDouble("latitude"));
|
|
||||||
info.setLongitude(photo.getDouble("longitude"));
|
|
||||||
info.setOwnerId(photo.getLong("owner_id"));
|
|
||||||
info.setOwnerName(photo.getString("owner_name"));
|
|
||||||
info.setOwnerUrl(photo.getString("owner_url"));
|
|
||||||
info.setPhotoId(photo.getLong("photo_id"));
|
|
||||||
info.setPhotoUrl(photo.getString("photo_url"));
|
|
||||||
info.setUploadDate(photo.getString("upload_date"));
|
|
||||||
return info;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Long fetchPanoramioImagesCountFromResponse(JSONObject object) {
|
|
||||||
try {
|
|
||||||
return object.getLong("count");
|
|
||||||
} catch (JSONException e) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<PanoramioImageInfo> fetchPanoramioImagesFromResponse(JSONArray photos) throws JSONException, ParseException {
|
|
||||||
|
|
||||||
if (photos == null) {
|
|
||||||
throw new PanoramioResponseNotExpected("photos arg cannot be null");
|
|
||||||
}
|
|
||||||
|
|
||||||
List<PanoramioImageInfo> photosInfos = new ArrayList<>();
|
|
||||||
int n = photos.length();
|
|
||||||
for (int i = 0; i < n; i++) {
|
|
||||||
photosInfos.add(
|
|
||||||
fetchPanoramioDto(
|
|
||||||
photos.getJSONObject(i)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return photosInfos;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PanoramioResponse fetchPanoramioResponse(JSONObject panoramioResponse) throws JSONException, ParseException {
|
|
||||||
PanoramioResponse response = new PanoramioResponse();
|
|
||||||
response.setCount(panoramioResponse.getLong("count"));
|
|
||||||
response.setMoreAvailable(panoramioResponse.getBoolean("has_more"));
|
|
||||||
response.setPhotos(fetchPanoramioImagesFromResponse(panoramioResponse.getJSONArray("photos")));
|
|
||||||
response.setMapLocation(fetchPanoramioLocation(panoramioResponse.getJSONObject("map_location")));
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static PanoramioMapLocation fetchPanoramioLocation(JSONObject mapLocation) throws JSONException {
|
|
||||||
PanoramioMapLocation location = new PanoramioMapLocation();
|
|
||||||
location.setLatitude(mapLocation.getDouble("lat"));
|
|
||||||
location.setLongitude(mapLocation.getDouble("lon"));
|
|
||||||
location.setZoom(mapLocation.getLong("panoramio_zoom"));
|
|
||||||
return location;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static PointF calcDims(Activity ctx) {
|
|
||||||
DisplayMetrics metrics = calcMetrics(ctx);
|
|
||||||
int w = metrics.widthPixels;
|
|
||||||
int h = metrics.heightPixels;
|
|
||||||
float wi = w / metrics.xdpi;
|
|
||||||
float hi = h / metrics.ydpi;
|
|
||||||
return new PointF(wi, hi);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static DisplayMetrics calcMetrics(Activity ctx) {
|
|
||||||
DisplayMetrics metrics = new DisplayMetrics();
|
|
||||||
final Display display = ctx.getWindowManager().getDefaultDisplay();
|
|
||||||
display.getMetrics(metrics);
|
|
||||||
return metrics;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static double calcDiag(Activity ctx) {
|
|
||||||
PointF dims = calcDims(ctx);
|
|
||||||
return Math.sqrt(dims.x*dims.x + dims.y*dims.y);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,3 +0,0 @@
|
||||||
<resources>
|
|
||||||
<string name="app_name">Panoramio Bindings</string>
|
|
||||||
</resources>
|
|
|
@ -1,15 +0,0 @@
|
||||||
package pl.tpolgrabia.panoramiobindings;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To work on unit tests, switch the Test Artifact in the Build Variants view.
|
|
||||||
*/
|
|
||||||
public class ExampleUnitTest {
|
|
||||||
@Test
|
|
||||||
public void addition_isCorrect() throws Exception {
|
|
||||||
assertEquals(4, 2 + 2);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1 +1 @@
|
||||||
include ':app', ':panoramiobindings', ':urbanexplorerutils', ':wikibinding', ':googleutils'
|
include ':app', ':urbanexplorerutils', ':wikibinding', ':googleutils'
|
||||||
|
|
|
@ -7,8 +7,8 @@ android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 21
|
targetSdkVersion 21
|
||||||
versionCode 2
|
versionCode 3
|
||||||
versionName "1.0.1"
|
versionName "1.0.2"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
|
|
|
@ -7,8 +7,8 @@ android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 16
|
minSdkVersion 16
|
||||||
targetSdkVersion 21
|
targetSdkVersion 21
|
||||||
versionCode 2
|
versionCode 3
|
||||||
versionName "1.0.1"
|
versionName "1.0.2"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
package pl.tpolgrabia.wikibinding.dto.generator;
|
package pl.tpolgrabia.wikibinding.dto.generator;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by tpolgrabia on 01.11.16.
|
* Created by tpolgrabia on 01.11.16.
|
||||||
*/
|
*/
|
||||||
public class WikiQuery2 {
|
public class WikiQuery2 {
|
||||||
|
@SerializedName("pages")
|
||||||
private Map<Long, WikiPage> pages;
|
private Map<Long, WikiPage> pages;
|
||||||
|
|
||||||
public Map<Long, WikiPage> getPages() {
|
public Map<Long, WikiPage> getPages() {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package pl.tpolgrabia.wikibinding.dto.generator;
|
package pl.tpolgrabia.wikibinding.dto.generator;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
import pl.tpolgrabia.wikibinding.dto.geosearch.WikiQuery;
|
import pl.tpolgrabia.wikibinding.dto.geosearch.WikiQuery;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
@ -11,7 +12,9 @@ import java.util.Map;
|
||||||
*/
|
*/
|
||||||
public class WikiResponse2 implements Serializable {
|
public class WikiResponse2 implements Serializable {
|
||||||
private static final long serialVersionUID = 2208673089408151268L;
|
private static final long serialVersionUID = 2208673089408151268L;
|
||||||
|
@SerializedName("batch_complete")
|
||||||
private Boolean batchComplete;
|
private Boolean batchComplete;
|
||||||
|
@SerializedName("query")
|
||||||
private WikiQuery2 query;
|
private WikiQuery2 query;
|
||||||
|
|
||||||
public Boolean getBatchComplete() {
|
public Boolean getBatchComplete() {
|
||||||
|
|
|
@ -1,10 +1,14 @@
|
||||||
package pl.tpolgrabia.wikibinding.dto.geosearch;
|
package pl.tpolgrabia.wikibinding.dto.geosearch;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by tpolgrabia on 05.09.16.
|
* Created by tpolgrabia on 05.09.16.
|
||||||
*/
|
*/
|
||||||
public class WikiGeoResponse2 {
|
public class WikiGeoResponse2 {
|
||||||
|
@SerializedName("batch_complete")
|
||||||
private Boolean batchComplete;
|
private Boolean batchComplete;
|
||||||
|
@SerializedName("query")
|
||||||
private WikiQuery query;
|
private WikiQuery query;
|
||||||
|
|
||||||
public Boolean getBatchComplete() {
|
public Boolean getBatchComplete() {
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
package pl.tpolgrabia.wikibinding.dto.geosearch;
|
package pl.tpolgrabia.wikibinding.dto.geosearch;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by tpolgrabia on 01.11.16.
|
* Created by tpolgrabia on 01.11.16.
|
||||||
*/
|
*/
|
||||||
public class WikiQuery {
|
public class WikiQuery {
|
||||||
|
@SerializedName("geosearch")
|
||||||
private List<WikiGeoObject> geosearch;
|
private List<WikiGeoObject> geosearch;
|
||||||
|
|
||||||
public List<WikiGeoObject> getGeosearch() {
|
public List<WikiGeoObject> getGeosearch() {
|
||||||
|
|
Loading…
Reference in New Issue