Compare commits
No commits in common. "stable" and "master" have entirely different histories.
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<bytecodeTargetLevel target="17" />
|
<bytecodeTargetLevel target="11" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="deploymentTargetDropDown">
|
|
||||||
<value>
|
|
||||||
<entry key="app">
|
|
||||||
<State />
|
|
||||||
</entry>
|
|
||||||
</value>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectMigrations">
|
|
||||||
<option name="MigrateToGradleLocalJavaHome">
|
|
||||||
<set>
|
|
||||||
<option value="$PROJECT_DIR$" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -3,21 +3,14 @@
|
|||||||
<component name="DesignSurface">
|
<component name="DesignSurface">
|
||||||
<option name="filePathToZoomLevelMap">
|
<option name="filePathToZoomLevelMap">
|
||||||
<map>
|
<map>
|
||||||
<entry key="../../../../layout/custom_preview.xml" value="0.36974358974358973" />
|
|
||||||
<entry key="app/src/main/res/drawable/ic_add.xml" value="0.1565" />
|
|
||||||
<entry key="app/src/main/res/drawable/ic_add_camera.xml" value="0.1565" />
|
|
||||||
<entry key="app/src/main/res/layout/activity_main.xml" value="0.45" />
|
<entry key="app/src/main/res/layout/activity_main.xml" value="0.45" />
|
||||||
<entry key="app/src/main/res/layout/dialog_info.xml" value="0.7119565217391305" />
|
<entry key="app/src/main/res/layout/fragment_add_stream.xml" value="0.536" />
|
||||||
<entry key="app/src/main/res/layout/fragment_add_stream.xml" value="0.524901185770751" />
|
|
||||||
<entry key="app/src/main/res/layout/fragment_settings_item.xml" value="0.536" />
|
|
||||||
<entry key="app/src/main/res/layout/fragment_settings_item_list.xml" value="0.4" />
|
|
||||||
<entry key="app/src/main/res/layout/fragment_surveillance.xml" value="0.16354166666666667" />
|
<entry key="app/src/main/res/layout/fragment_surveillance.xml" value="0.16354166666666667" />
|
||||||
<entry key="app/src/main/res/menu/settings_menu.xml" value="0.3458333333333333" />
|
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
674
LICENSE
674
LICENSE
@ -1,674 +0,0 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
||||||
34
README.md
34
README.md
@ -1,34 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
# Ojo: the FLOSS RTSP Surveillance camera viewer for Android
|
|
||||||
|
|
||||||
[<img src="https://raw.githubusercontent.com/andOTP/andOTP/master/assets/badges/get-it-on-github.png" height="80">](https://github.com/penguin86/ojo/releases/latest)
|
|
||||||
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/it/packages/it.danieleverducci.ojo)
|
|
||||||
|
|
||||||
(Always prefer [F-Droid](https://f-droid.org) build, when possible).
|
|
||||||
|
|
||||||
Ojo is a basic IP Camera surveillance wall.
|
|
||||||
IP camera's RTSP streams are added via its url and shown in the classic tile configuration. The number of tiles is automatically choosen based on the number of configured cameras: a single camera goes full screen, adding more cameras the app switches to a grid view: 2x2, 3x3, 4x4 and so on.
|
|
||||||
The maximum number of cameras is determined by the device's capabilities.
|
|
||||||
|
|
||||||
The stream decoding and rendering is demanded to [VLC's library](https://code.videolan.org/videolan/vlc-android): without their effort this app wouldn't be possible.
|
|
||||||
This app was specifically developed for F-Droid, as I couldn't find any open source RTSP vievers in the main repository.
|
|
||||||
|
|
||||||
The app can be opened deeplinking to url ojo://view.
|
|
||||||
To open the app with focus on a specific camera, you can use an intent (it.danieleverducci.ojo.OPEN_CAMERA) to specify which camera you want to view.
|
|
||||||
The extra argument it.danieleverducci.ojo.CAMERA_NAME will open the app with the camera with the name you specified while adding the camera.
|
|
||||||
The extra argument it.danieleverducci.ojo.CAMERA_NUMBER starting at 1 could be used as well, if you have multiple cameras with the same name.
|
|
||||||
See belows example how to use the intent. The flag (-f 268468224) could be useful if you want to switch to an other camera while the app is running.
|
|
||||||
```shell
|
|
||||||
adb -s <YOUR_DEVICE> shell am start -a it.danieleverducci.ojo.OPEN_CAMERA -f 268468224 --es it.danieleverducci.ojo.CAMERA_NAME <YOUR_CAMERA_NAME>
|
|
||||||
adb -s <YOUR_DEVICE> shell am start -a it.danieleverducci.ojo.OPEN_CAMERA -f 268468224 --es it.danieleverducci.ojo.CAMERA_NUMBER <YOUR_CAMERA_NUMBER>
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
  
|
|
||||||
|
|
||||||
## Contributors
|
|
||||||
- Thanks to [brenard](https://github.com/brenard) for the new grid sizing method
|
|
||||||
- Thanks to [davquar](https://github.com/davquar) for the fullscreen compatibility fix on Android 11
|
|
||||||
- Thanks to [jayfan0](https://github.com/jayfan0) for the first deep link implementation
|
|
||||||
- Thanks to [free-bots](https://github.com/free-bots) for the selection border on Android TV, intents for direct camera access and leanback support
|
|
||||||
@ -3,14 +3,15 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 33
|
compileSdkVersion 30
|
||||||
|
buildToolsVersion "30.0.2"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "it.danieleverducci.ojo"
|
applicationId "it.danieleverducci.ojo"
|
||||||
minSdkVersion 15
|
minSdkVersion 17
|
||||||
targetSdkVersion 33
|
targetSdkVersion 30
|
||||||
versionCode 9
|
versionCode 1
|
||||||
versionName "0.1.4"
|
versionName "0.0.1"
|
||||||
|
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
|
|
||||||
@ -30,19 +31,16 @@ android {
|
|||||||
buildFeatures {
|
buildFeatures {
|
||||||
viewBinding true
|
viewBinding true
|
||||||
}
|
}
|
||||||
namespace 'it.danieleverducci.ojo'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
implementation 'androidx.appcompat:appcompat:1.3.1'
|
||||||
implementation 'com.google.android.material:material:1.8.0'
|
implementation 'com.google.android.material:material:1.4.0'
|
||||||
implementation 'androidx.navigation:navigation-fragment:2.5.3'
|
implementation 'androidx.navigation:navigation-fragment:2.3.5'
|
||||||
implementation 'androidx.navigation:navigation-ui:2.5.3'
|
implementation 'androidx.navigation:navigation-ui:2.3.5'
|
||||||
implementation 'de.mrmaffen:libvlc-android:2.1.12@aar'
|
implementation 'org.videolan.android:libvlc-all:3.4.1'
|
||||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
|
||||||
implementation 'androidx.recyclerview:recyclerview:1.2.1'
|
|
||||||
testImplementation 'junit:junit:4.+'
|
testImplementation 'junit:junit:4.+'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
|
||||||
}
|
}
|
||||||
@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 3,
|
|
||||||
"artifactType": {
|
|
||||||
"type": "APK",
|
|
||||||
"kind": "Directory"
|
|
||||||
},
|
|
||||||
"applicationId": "it.danieleverducci.ojo.googleplay",
|
|
||||||
"variantName": "release",
|
|
||||||
"elements": [
|
|
||||||
{
|
|
||||||
"type": "SINGLE",
|
|
||||||
"filters": [],
|
|
||||||
"attributes": [],
|
|
||||||
"versionCode": 6,
|
|
||||||
"versionName": "0.1.1",
|
|
||||||
"outputFile": "app-release.apk"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"elementType": "File"
|
|
||||||
}
|
|
||||||
@ -1,11 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:tools="http://schemas.android.com/tools"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
package="it.danieleverducci.ojo">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-feature
|
|
||||||
android:name="android.software.leanback"
|
|
||||||
android:required="false" />
|
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
@ -14,32 +11,15 @@
|
|||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.Ojo">
|
android:theme="@style/Theme.Ojo">
|
||||||
<activity
|
|
||||||
android:name=".ui.SettingsActivity"
|
|
||||||
android:banner="@mipmap/ic_launcher"
|
|
||||||
android:exported="true"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:theme="@style/Theme.Ojo">
|
|
||||||
</activity>
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.MainActivity"
|
android:name=".ui.MainActivity"
|
||||||
android:configChanges="orientation|screenSize"
|
|
||||||
android:exported="true"
|
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:theme="@style/Theme.Ojo">
|
android:theme="@style/Theme.Ojo"
|
||||||
|
android:screenOrientation="landscape">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.VIEW"/>
|
|
||||||
<category android:name="android.intent.category.DEFAULT"/>
|
|
||||||
<data android:scheme="ojo" android:host="view"/>
|
|
||||||
</intent-filter>
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="it.danieleverducci.ojo.OPEN_CAMERA"/>
|
|
||||||
<category android:name="android.intent.category.DEFAULT"/>
|
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
@ -13,6 +13,7 @@ import java.io.ObjectOutputStream;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
import it.danieleverducci.ojo.entities.Camera;
|
import it.danieleverducci.ojo.entities.Camera;
|
||||||
|
|
||||||
@ -20,7 +21,6 @@ import it.danieleverducci.ojo.entities.Camera;
|
|||||||
* Manages the settings persistence
|
* Manages the settings persistence
|
||||||
*/
|
*/
|
||||||
public class Settings implements Serializable {
|
public class Settings implements Serializable {
|
||||||
private static final long serialVersionUID = 1081285022445419696L;
|
|
||||||
private static final String FILENAME = "settings.bin";
|
private static final String FILENAME = "settings.bin";
|
||||||
private static final String TAG = "Settings";
|
private static final String TAG = "Settings";
|
||||||
|
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
package it.danieleverducci.ojo;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
|
||||||
|
|
||||||
public class SharedPreferencesManager {
|
|
||||||
private static final String SP_ROTATION_ENABLED = "rot_en";
|
|
||||||
|
|
||||||
public static void saveRotationEnabled(Context ctx, boolean enabled) {
|
|
||||||
SharedPreferences sharedPref = ctx.getSharedPreferences(SP_ROTATION_ENABLED, Context.MODE_PRIVATE);
|
|
||||||
sharedPref.edit().putBoolean(SP_ROTATION_ENABLED, enabled).apply();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean loadRotationEnabled(Context ctx) {
|
|
||||||
SharedPreferences sharedPref = ctx.getSharedPreferences(SP_ROTATION_ENABLED, Context.MODE_PRIVATE);
|
|
||||||
return sharedPref.getBoolean(SP_ROTATION_ENABLED, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void toggleRotationEnabled(Context ctx) {
|
|
||||||
saveRotationEnabled(ctx, ! loadRotationEnabled(ctx));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -3,7 +3,6 @@ package it.danieleverducci.ojo.entities;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
public class Camera implements Serializable {
|
public class Camera implements Serializable {
|
||||||
private static final long serialVersionUID = -3837361587400158910L;
|
|
||||||
private String name;
|
private String name;
|
||||||
private String rtspUrl;
|
private String rtspUrl;
|
||||||
|
|
||||||
@ -12,14 +11,6 @@ public class Camera implements Serializable {
|
|||||||
this.rtspUrl = rtspUrl;
|
this.rtspUrl = rtspUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setName(String name) {
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRtspUrl(String rtspUrl) {
|
|
||||||
this.rtspUrl = rtspUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,6 @@ import android.view.View;
|
|||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import androidx.navigation.fragment.NavHostFragment;
|
import androidx.navigation.fragment.NavHostFragment;
|
||||||
|
|
||||||
@ -17,20 +16,9 @@ import it.danieleverducci.ojo.Settings;
|
|||||||
import it.danieleverducci.ojo.databinding.FragmentAddStreamBinding;
|
import it.danieleverducci.ojo.databinding.FragmentAddStreamBinding;
|
||||||
import it.danieleverducci.ojo.entities.Camera;
|
import it.danieleverducci.ojo.entities.Camera;
|
||||||
|
|
||||||
public class StreamUrlFragment extends Fragment {
|
public class AddStreamFragment extends Fragment {
|
||||||
public static final String ARG_CAMERA = "arg_camera";
|
|
||||||
|
|
||||||
private FragmentAddStreamBinding binding;
|
private FragmentAddStreamBinding binding;
|
||||||
private Settings settings;
|
|
||||||
private Integer selectedCamera = null;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
// Load existing settings (if any)
|
|
||||||
settings = Settings.fromDisk(getContext());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(
|
public View onCreateView(
|
||||||
@ -39,18 +27,6 @@ public class StreamUrlFragment extends Fragment {
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
binding = FragmentAddStreamBinding.inflate(inflater, container, false);
|
binding = FragmentAddStreamBinding.inflate(inflater, container, false);
|
||||||
|
|
||||||
// If passed an url, fill the details
|
|
||||||
Bundle args = getArguments();
|
|
||||||
if (args != null && args.containsKey(ARG_CAMERA)) {
|
|
||||||
this.selectedCamera = args.getInt(ARG_CAMERA);
|
|
||||||
|
|
||||||
Camera c = settings.getCameras().get(this.selectedCamera);
|
|
||||||
binding.streamName.setText(c.getName());
|
|
||||||
binding.streamName.setHint(getContext().getString(R.string.stream_list_default_camera_name).replace("{camNo}", (this.selectedCamera+1)+""));
|
|
||||||
binding.streamUrl.setText(c.getRtspUrl());
|
|
||||||
}
|
|
||||||
|
|
||||||
return binding.getRoot();
|
return binding.getRoot();
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -69,19 +45,10 @@ public class StreamUrlFragment extends Fragment {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Name can be empty
|
// Load existing settings (if any)
|
||||||
String name = binding.streamName.getText().toString();
|
Settings settings = Settings.fromDisk(getContext());
|
||||||
|
// Add stream to list
|
||||||
if (StreamUrlFragment.this.selectedCamera != null) {
|
settings.addCamera(new Camera("", url));
|
||||||
// Update camera
|
|
||||||
Camera c = settings.getCameras().get(StreamUrlFragment.this.selectedCamera);
|
|
||||||
c.setName(name);
|
|
||||||
c.setRtspUrl(url);
|
|
||||||
} else {
|
|
||||||
// Add stream to list
|
|
||||||
settings.addCamera(new Camera(name, url));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save
|
// Save
|
||||||
if (!settings.save()) {
|
if (!settings.save()) {
|
||||||
Snackbar.make(view, R.string.add_stream_error_saving, Snackbar.LENGTH_LONG).show();
|
Snackbar.make(view, R.string.add_stream_error_saving, Snackbar.LENGTH_LONG).show();
|
||||||
@ -89,8 +56,8 @@ public class StreamUrlFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Back to first fragment
|
// Back to first fragment
|
||||||
NavHostFragment.findNavController(StreamUrlFragment.this)
|
NavHostFragment.findNavController(AddStreamFragment.this)
|
||||||
.popBackStack();
|
.navigate(R.id.action_SecondFragment_to_FirstFragment);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -1,18 +0,0 @@
|
|||||||
package it.danieleverducci.ojo.ui;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
|
|
||||||
import it.danieleverducci.ojo.databinding.FragmentInfoBinding;
|
|
||||||
|
|
||||||
|
|
||||||
public class InfoFragment extends Fragment {
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
|
||||||
return FragmentInfoBinding.inflate(inflater, container, false).getRoot();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,62 +1,49 @@
|
|||||||
package it.danieleverducci.ojo.ui;
|
package it.danieleverducci.ojo.ui;
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.pm.ActivityInfo;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.WindowManager;
|
|
||||||
|
import com.google.android.material.snackbar.Snackbar;
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import it.danieleverducci.ojo.SharedPreferencesManager;
|
import android.view.View;
|
||||||
|
|
||||||
|
import androidx.navigation.NavController;
|
||||||
|
import androidx.navigation.Navigation;
|
||||||
|
import androidx.navigation.ui.AppBarConfiguration;
|
||||||
|
import androidx.navigation.ui.NavigationUI;
|
||||||
|
|
||||||
|
import it.danieleverducci.ojo.R;
|
||||||
import it.danieleverducci.ojo.databinding.ActivityMainBinding;
|
import it.danieleverducci.ojo.databinding.ActivityMainBinding;
|
||||||
|
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity {
|
public class MainActivity extends AppCompatActivity {
|
||||||
private static final String TAG = "MainActivity";
|
|
||||||
|
|
||||||
private ActivityMainBinding binding;
|
private ActivityMainBinding binding;
|
||||||
private OnBackButtonPressedListener onBackButtonPressedListener;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
// Interface can go below notches
|
|
||||||
if (Build.VERSION.SDK_INT >= 28) {
|
|
||||||
getWindow().setFlags(
|
|
||||||
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
|
|
||||||
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
binding = ActivityMainBinding.inflate(getLayoutInflater());
|
binding = ActivityMainBinding.inflate(getLayoutInflater());
|
||||||
setContentView(binding.getRoot());
|
setContentView(binding.getRoot());
|
||||||
|
|
||||||
binding.fab.setOnClickListener(view -> openSettings());
|
// Show FAB only on first fragment
|
||||||
|
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
|
||||||
|
navController.addOnDestinationChangedListener((controller, destination, arguments) -> {
|
||||||
|
if (destination.getId() == R.id.FirstFragment)
|
||||||
|
binding.fab.show();
|
||||||
|
else
|
||||||
|
binding.fab.hide();
|
||||||
|
});
|
||||||
|
|
||||||
|
binding.fab.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View view) {
|
||||||
|
navController.navigate(R.id.action_FirstFragment_to_SecondFragment);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onStart() {
|
|
||||||
boolean rotationEnabledSetting = SharedPreferencesManager.loadRotationEnabled(this);
|
|
||||||
this.setRequestedOrientation(rotationEnabledSetting ? ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR : ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
|
|
||||||
|
|
||||||
super.onStart();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnBackButtonPressedListener(OnBackButtonPressedListener onBackButtonPressedListener) {
|
|
||||||
this.onBackButtonPressedListener = onBackButtonPressedListener;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
if (this.onBackButtonPressedListener != null && this.onBackButtonPressedListener.onBackPressed())
|
|
||||||
return;
|
|
||||||
super.onBackPressed();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void openSettings() {
|
|
||||||
Intent i = new Intent(this, SettingsActivity.class);
|
|
||||||
startActivity(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,5 +0,0 @@
|
|||||||
package it.danieleverducci.ojo.ui;
|
|
||||||
|
|
||||||
public interface OnBackButtonPressedListener {
|
|
||||||
public boolean onBackPressed();
|
|
||||||
}
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
package it.danieleverducci.ojo.ui;
|
|
||||||
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.WindowManager;
|
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.navigation.NavController;
|
|
||||||
import androidx.navigation.Navigation;
|
|
||||||
|
|
||||||
import it.danieleverducci.ojo.R;
|
|
||||||
import it.danieleverducci.ojo.SharedPreferencesManager;
|
|
||||||
import it.danieleverducci.ojo.databinding.ActivitySettingsBinding;
|
|
||||||
|
|
||||||
public class SettingsActivity extends AppCompatActivity {
|
|
||||||
private static final String TAG = "SettingsActivity";
|
|
||||||
|
|
||||||
private ActivitySettingsBinding binding;
|
|
||||||
private NavController navController;
|
|
||||||
private OnBackButtonPressedListener onBackButtonPressedListener;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
|
|
||||||
binding = ActivitySettingsBinding.inflate(getLayoutInflater());
|
|
||||||
setContentView(binding.getRoot());
|
|
||||||
|
|
||||||
navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_settings);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnBackButtonPressedListener(OnBackButtonPressedListener onBackButtonPressedListener) {
|
|
||||||
this.onBackButtonPressedListener = onBackButtonPressedListener;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackPressed() {
|
|
||||||
if (this.onBackButtonPressedListener != null && this.onBackButtonPressedListener.onBackPressed())
|
|
||||||
return;
|
|
||||||
super.onBackPressed();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void navigateToFragment(int actionId) {
|
|
||||||
navigateToFragment(actionId, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void navigateToFragment(int actionId, Bundle bundle) {
|
|
||||||
if (navController == null) {
|
|
||||||
Log.e(TAG, "Not initialized");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (bundle != null)
|
|
||||||
navController.navigate(actionId, bundle);
|
|
||||||
else
|
|
||||||
navController.navigate(actionId);
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
Log.e(TAG, "Unable to navigate to fragment: " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void toggleRotationEnabledSetting() {
|
|
||||||
SharedPreferencesManager.toggleRotationEnabled(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean getRotationEnabledSetting() {
|
|
||||||
return SharedPreferencesManager.loadRotationEnabled(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,116 +0,0 @@
|
|||||||
package it.danieleverducci.ojo.ui;
|
|
||||||
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import it.danieleverducci.ojo.R;
|
|
||||||
import it.danieleverducci.ojo.Settings;
|
|
||||||
import it.danieleverducci.ojo.SharedPreferencesManager;
|
|
||||||
import it.danieleverducci.ojo.databinding.FragmentSettingsItemListBinding;
|
|
||||||
import it.danieleverducci.ojo.entities.Camera;
|
|
||||||
import it.danieleverducci.ojo.ui.adapters.SettingsRecyclerViewAdapter;
|
|
||||||
import it.danieleverducci.ojo.utils.ItemMoveCallback;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A fragment representing a list of Items.
|
|
||||||
*/
|
|
||||||
public class SettingsFragment extends Fragment {
|
|
||||||
|
|
||||||
private FragmentSettingsItemListBinding binding;
|
|
||||||
private Settings settings;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
binding = FragmentSettingsItemListBinding.inflate(inflater, container, false);
|
|
||||||
|
|
||||||
return binding.getRoot();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
|
||||||
// Setup toolbar
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
|
||||||
binding.settingsToolbar.getOverflowIcon().setTint(Color.WHITE);
|
|
||||||
}
|
|
||||||
binding.settingsToolbar.inflateMenu(R.menu.settings_menu);
|
|
||||||
MenuItem rotMenuItem = binding.settingsToolbar.getMenu().findItem(R.id.menuitem_allow_rotation);
|
|
||||||
rotMenuItem.setTitle(((SettingsActivity)getActivity()).getRotationEnabledSetting() ? R.string.menuitem_deny_rotation : R.string.menuitem_allow_rotation);
|
|
||||||
|
|
||||||
// Register for item click
|
|
||||||
binding.settingsToolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onMenuItemClick(MenuItem item) {
|
|
||||||
switch (item.getItemId()) {
|
|
||||||
case R.id.menuitem_add_camera:
|
|
||||||
((SettingsActivity)getActivity()).navigateToFragment(R.id.action_settingsToCameraUrl);
|
|
||||||
return true;
|
|
||||||
case R.id.menuitem_allow_rotation:
|
|
||||||
((SettingsActivity)getActivity()).toggleRotationEnabledSetting();
|
|
||||||
SharedPreferencesManager.saveRotationEnabled(getContext(), ((SettingsActivity)getActivity()).getRotationEnabledSetting());
|
|
||||||
item.setTitle(((SettingsActivity)getActivity()).getRotationEnabledSetting() ? R.string.menuitem_deny_rotation : R.string.menuitem_allow_rotation);
|
|
||||||
return true;
|
|
||||||
case R.id.menuitem_info:
|
|
||||||
((SettingsActivity)getActivity()).navigateToFragment(R.id.action_SettingsToInfoFragment);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
|
|
||||||
// Load cameras
|
|
||||||
settings = Settings.fromDisk(getContext());
|
|
||||||
List<Camera> cams = settings.getCameras();
|
|
||||||
|
|
||||||
// Set the adapter
|
|
||||||
RecyclerView recyclerView = binding.list;
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
SettingsRecyclerViewAdapter adapter = new SettingsRecyclerViewAdapter(cams);
|
|
||||||
ItemTouchHelper.Callback callback =
|
|
||||||
new ItemMoveCallback(adapter);
|
|
||||||
ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
|
|
||||||
touchHelper.attachToRecyclerView(recyclerView);
|
|
||||||
adapter.setOnDragListener(touchHelper::startDrag);
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
// Onclick listener
|
|
||||||
adapter.setOnClickListener(new SettingsRecyclerViewAdapter.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemClick(int pos) {
|
|
||||||
Bundle b = new Bundle();
|
|
||||||
b.putInt(StreamUrlFragment.ARG_CAMERA, pos);
|
|
||||||
((SettingsActivity)getActivity()).navigateToFragment(R.id.action_settingsToCameraUrl, b);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause() {
|
|
||||||
super.onPause();
|
|
||||||
|
|
||||||
// Save cameras
|
|
||||||
List<Camera> cams = ((SettingsRecyclerViewAdapter)binding.list.getAdapter()).getItems();
|
|
||||||
this.settings.setCameras(cams);
|
|
||||||
this.settings.save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,7 +1,6 @@
|
|||||||
package it.danieleverducci.ojo.ui;
|
package it.danieleverducci.ojo.ui;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@ -13,15 +12,13 @@ import android.view.View;
|
|||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.view.ViewTreeObserver;
|
import android.view.ViewTreeObserver;
|
||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowInsets;
|
||||||
|
import android.view.WindowInsetsController;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
|
|
||||||
import androidx.core.view.WindowCompat;
|
|
||||||
import androidx.core.view.WindowInsetsCompat;
|
|
||||||
import androidx.core.view.WindowInsetsControllerCompat;
|
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
import org.videolan.libvlc.IVLCVout;
|
import org.videolan.libvlc.interfaces.IVLCVout;
|
||||||
import org.videolan.libvlc.LibVLC;
|
import org.videolan.libvlc.LibVLC;
|
||||||
import org.videolan.libvlc.Media;
|
import org.videolan.libvlc.Media;
|
||||||
import org.videolan.libvlc.MediaPlayer;
|
import org.videolan.libvlc.MediaPlayer;
|
||||||
@ -55,97 +52,55 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
|
|
||||||
private FragmentSurveillanceBinding binding;
|
private FragmentSurveillanceBinding binding;
|
||||||
private List<CameraView> cameraViews = new ArrayList<>();
|
private List<CameraView> cameraViews = new ArrayList<>();
|
||||||
private boolean fullscreenCameraView = false;
|
int viewMargin;
|
||||||
private LinearLayout.LayoutParams cameraViewLayoutParams;
|
|
||||||
private LinearLayout.LayoutParams rowLayoutParams;
|
|
||||||
private LinearLayout.LayoutParams hiddenLayoutParams;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(
|
public View onCreateView(
|
||||||
LayoutInflater inflater, ViewGroup container,
|
LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState
|
Bundle savedInstanceState
|
||||||
) {
|
) {
|
||||||
int viewMargin = DpiUtils.DpToPixels(container.getContext(), 2);
|
viewMargin = DpiUtils.DpToPixels(container.getContext(), 2);
|
||||||
cameraViewLayoutParams = new LinearLayout.LayoutParams(
|
|
||||||
0,
|
|
||||||
LinearLayout.LayoutParams.MATCH_PARENT,
|
|
||||||
1.0f
|
|
||||||
);
|
|
||||||
cameraViewLayoutParams.setMargins(viewMargin,viewMargin,viewMargin,viewMargin);
|
|
||||||
|
|
||||||
rowLayoutParams = new LinearLayout.LayoutParams(
|
|
||||||
LinearLayout.LayoutParams.MATCH_PARENT,
|
|
||||||
LinearLayout.LayoutParams.WRAP_CONTENT,
|
|
||||||
1.0f
|
|
||||||
);
|
|
||||||
|
|
||||||
// 1,1 instead of 0,0 because the latter doesn't work on android 13+
|
|
||||||
hiddenLayoutParams = new LinearLayout.LayoutParams(1, 1);
|
|
||||||
|
|
||||||
binding = FragmentSurveillanceBinding.inflate(inflater, container, false);
|
binding = FragmentSurveillanceBinding.inflate(inflater, container, false);
|
||||||
return binding.getRoot();
|
return binding.getRoot();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
|
|
||||||
leanbackMode(true);
|
// Leanback mode (fullscreen)
|
||||||
|
Window window = getActivity().getWindow();
|
||||||
|
if (window != null) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
||||||
|
final WindowInsetsController controller = window.getInsetsController();
|
||||||
|
|
||||||
|
if (controller != null)
|
||||||
|
controller.hide(WindowInsets.Type.statusBars());
|
||||||
|
} else {
|
||||||
|
window.getDecorView().setSystemUiVisibility(
|
||||||
|
View.SYSTEM_UI_FLAG_FULLSCREEN
|
||||||
|
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
||||||
|
| View.SYSTEM_UI_FLAG_IMMERSIVE
|
||||||
|
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE
|
||||||
|
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
|
||||||
|
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fullscreenCameraView = false;
|
|
||||||
addAllCameras();
|
addAllCameras();
|
||||||
|
|
||||||
// Start playback for all streams
|
// Start playback for all streams
|
||||||
for (CameraView cv : cameraViews) {
|
for (CameraView cv : cameraViews) {
|
||||||
cv.startPlayback();
|
cv.startPlayback();
|
||||||
}
|
}
|
||||||
|
|
||||||
expandToCameraViewIfRequired();
|
|
||||||
|
|
||||||
// Register for back pressed events
|
|
||||||
((MainActivity)getActivity()).setOnBackButtonPressedListener(new OnBackButtonPressedListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onBackPressed() {
|
|
||||||
if(fullscreenCameraView && cameraViews.size() > 1) {
|
|
||||||
fullscreenCameraView = false;
|
|
||||||
showAllCameras();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Goes fullscreen igoring the device screen insets (camera etc)
|
|
||||||
*/
|
|
||||||
private void leanbackMode(boolean leanback) {
|
|
||||||
Window w = requireActivity().getWindow();
|
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (leanback) {
|
|
||||||
w.getAttributes().layoutInDisplayCutoutMode =
|
|
||||||
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
|
|
||||||
|
|
||||||
// Hide system bar
|
|
||||||
WindowInsetsControllerCompat windowInsetsController = WindowCompat.getInsetsController(w, w.getDecorView());
|
|
||||||
windowInsetsController.hide(WindowInsetsCompat.Type.systemBars());
|
|
||||||
// System bar is hidden when not touched for a while
|
|
||||||
windowInsetsController.setSystemBarsBehavior(WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
|
|
||||||
} else {
|
|
||||||
// Show system bar
|
|
||||||
//WindowInsetsControllerCompat windowInsetsController = WindowCompat.getInsetsController(w, w.getDecorView());
|
|
||||||
//windowInsetsController.show(WindowInsetsCompat.Type.systemBars());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPause() {
|
public void onPause() {
|
||||||
super.onPause();
|
super.onPause();
|
||||||
|
|
||||||
leanbackMode(false);
|
|
||||||
|
|
||||||
disposeAllCameras();
|
disposeAllCameras();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -154,35 +109,34 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
Settings settings = Settings.fromDisk(getContext());
|
Settings settings = Settings.fromDisk(getContext());
|
||||||
List<Camera> cc = settings.getCameras();
|
List<Camera> cc = settings.getCameras();
|
||||||
|
|
||||||
int[] gridSize = calcGridDimensionsBasedOnNumberOfElements(cc.size());
|
int elemsPerSide = calcGridSideElements(cc.size());
|
||||||
int camIdx = 0;
|
int camIdx = 0;
|
||||||
for (int r = 0; r < gridSize[0]; r++) {
|
for (int r = 0; r < elemsPerSide; r++) {
|
||||||
// Create row and add to row container
|
// Create row and add to row container
|
||||||
LinearLayout row = new LinearLayout(getContext());
|
LinearLayout row = new LinearLayout(getContext());
|
||||||
binding.gridRowContainer.addView(row, rowLayoutParams);
|
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
||||||
|
LinearLayout.LayoutParams.MATCH_PARENT,
|
||||||
|
0,
|
||||||
|
1.0f
|
||||||
|
);
|
||||||
|
binding.gridRowContainer.addView(row, params);
|
||||||
// Add camera viewers to the row
|
// Add camera viewers to the row
|
||||||
for (int c = 0; c < gridSize[1]; c++) {
|
for (int c = 0; c < elemsPerSide; c++) {
|
||||||
if ( camIdx < cc.size() ) {
|
if ( camIdx < cc.size() ) {
|
||||||
Camera cam = cc.get(camIdx);
|
Camera cam = cc.get(camIdx);
|
||||||
CameraView cv = addCameraView(cam, row);
|
CameraView cv = addCameraView(cam, row);
|
||||||
cv.startPlayback();
|
cv.startPlayback();
|
||||||
cv.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
// Toggle single/multi camera views
|
|
||||||
fullscreenCameraView = !fullscreenCameraView;
|
|
||||||
if (fullscreenCameraView) {
|
|
||||||
hideAllCameraViewsButNot(v);
|
|
||||||
} else {
|
|
||||||
showAllCameras();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
// Cameras are less than the maximum number of cells in grid: fill remaining cells with empty views
|
// Cameras are less than the maximum number of cells in grid: fill remaining cells with empty views
|
||||||
View ev = new View(getContext());
|
View ev = new View(getContext());
|
||||||
ev.setBackgroundColor(getResources().getColor(R.color.purple_700));
|
ev.setBackgroundColor(getResources().getColor(R.color.purple_700));
|
||||||
row.addView(ev, cameraViewLayoutParams);
|
LinearLayout.LayoutParams evParams = new LinearLayout.LayoutParams(
|
||||||
|
0,
|
||||||
|
LinearLayout.LayoutParams.MATCH_PARENT,
|
||||||
|
1.0f
|
||||||
|
);
|
||||||
|
evParams.setMargins(viewMargin,viewMargin,viewMargin,viewMargin);
|
||||||
|
row.addView(ev, evParams);
|
||||||
}
|
}
|
||||||
camIdx++;
|
camIdx++;
|
||||||
}
|
}
|
||||||
@ -202,26 +156,22 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
protected void hideAllCameraViewsButNot(View cameraView) {
|
protected void hideAllCameraViewsButNot(View cameraView) {
|
||||||
for (int i = 0; i < binding.gridRowContainer.getChildCount(); i++) {
|
for (int i = 0; i < binding.gridRowContainer.getChildCount(); i++) {
|
||||||
LinearLayout row = (LinearLayout) binding.gridRowContainer.getChildAt(i);
|
LinearLayout row = (LinearLayout) binding.gridRowContainer.getChildAt(i);
|
||||||
boolean emptyRow = true;
|
|
||||||
for (int j = 0; j < row.getChildCount(); j++) {
|
for (int j = 0; j < row.getChildCount(); j++) {
|
||||||
View cam = row.getChildAt(j);
|
View cam = row.getChildAt(j);
|
||||||
if (cameraView == cam)
|
if (cameraView.getId() == cam.getId())
|
||||||
emptyRow = false;
|
cam.setVisibility(View.VISIBLE);
|
||||||
else
|
else
|
||||||
cam.setLayoutParams(hiddenLayoutParams);
|
cam.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
if (emptyRow)
|
|
||||||
row.setLayoutParams(hiddenLayoutParams);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void showAllCameras() {
|
protected void showAllCameras() {
|
||||||
for (int i = 0; i < binding.gridRowContainer.getChildCount(); i++) {
|
for (int i = 0; i < binding.gridRowContainer.getChildCount(); i++) {
|
||||||
LinearLayout row = (LinearLayout) binding.gridRowContainer.getChildAt(i);
|
LinearLayout row = (LinearLayout) binding.gridRowContainer.getChildAt(i);
|
||||||
row.setLayoutParams(rowLayoutParams);
|
|
||||||
for (int j = 0; j < row.getChildCount(); j++) {
|
for (int j = 0; j < row.getChildCount(); j++) {
|
||||||
View cam = row.getChildAt(j);
|
View cam = row.getChildAt(j);
|
||||||
cam.setLayoutParams(cameraViewLayoutParams);
|
cam.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -233,67 +183,26 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Add to layout
|
// Add to layout
|
||||||
rowContainer.addView(cv.surfaceView, cameraViewLayoutParams);
|
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
||||||
|
0,
|
||||||
|
LinearLayout.LayoutParams.MATCH_PARENT,
|
||||||
|
1.0f
|
||||||
|
);
|
||||||
|
params.setMargins(viewMargin,viewMargin,viewMargin,viewMargin);
|
||||||
|
rowContainer.addView(cv.surfaceView, params);
|
||||||
|
|
||||||
cameraViews.add(cv);
|
cameraViews.add(cv);
|
||||||
return cv;
|
return cv;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the dimensions of the grid based on the number of elements.
|
* Returns the number of elements per side needed to create a grid that can contain the provided elements number.
|
||||||
* Es: to display 3 elements is needed a 4-element grid, with 2 elements per side (a 2x2 grid)
|
* Es: to display 3 elements is needed a 4-element grid, with 2 elements per side (a 2x2 grid)
|
||||||
* Es: to display 6 elements is needed a 9-element grid, with 3 elements per side (a 2x3 grid)
|
|
||||||
* Es: to display 7 elements is needed a 9-element grid, with 3 elements per side (a 3x3 grid)
|
* Es: to display 7 elements is needed a 9-element grid, with 3 elements per side (a 3x3 grid)
|
||||||
* @param elements
|
* @param elements
|
||||||
*/
|
*/
|
||||||
private int[] calcGridDimensionsBasedOnNumberOfElements(int elements) {
|
private int calcGridSideElements(int elements) {
|
||||||
int rows = 1;
|
return (int)(Math.ceil(Math.sqrt(elements)));
|
||||||
int cols = 1;
|
|
||||||
while (rows * cols < elements) {
|
|
||||||
cols += 1;
|
|
||||||
if (rows * cols >= elements) break;
|
|
||||||
rows += 1;
|
|
||||||
}
|
|
||||||
int[] dimensions = {rows, cols};
|
|
||||||
return dimensions;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void expandToCameraViewIfRequired() {
|
|
||||||
final String EXTRA_CAMERA_NUMBER = "it.danieleverducci.ojo.CAMERA_NUMBER";
|
|
||||||
final String EXTRA_CAMERA_NAME = "it.danieleverducci.ojo.CAMERA_NAME";
|
|
||||||
final String OPEN_CAMERA = "it.danieleverducci.ojo.OPEN_CAMERA";
|
|
||||||
|
|
||||||
if (this.getActivity() == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Intent intent = this.getActivity().getIntent();
|
|
||||||
|
|
||||||
if (OPEN_CAMERA.equals(intent.getAction())) {
|
|
||||||
String cameraName = intent.getStringExtra(EXTRA_CAMERA_NAME);
|
|
||||||
if (cameraName == null) {
|
|
||||||
int cameraNumber = intent.getIntExtra(EXTRA_CAMERA_NUMBER, 0) - 1;
|
|
||||||
expandByIndex(cameraNumber);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
expandByName(cameraName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void expandByIndex(int index) {
|
|
||||||
if (index < 0 || cameraViews.size() <= index) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
hideAllCameraViewsButNot(cameraViews.get(index).surfaceView);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void expandByName(String name) {
|
|
||||||
for(CameraView cameraView: cameraViews) {
|
|
||||||
if (cameraView.camera.getName().equals(name)) {
|
|
||||||
hideAllCameraViewsButNot(cameraView.surfaceView);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -314,10 +223,9 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
surfaceView.setOnClickListener(new View.OnClickListener() {
|
surfaceView.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
SurveillanceFragment.this.hideAllCameraViewsButNot(v);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
surfaceView.setOnFocusChangeListener((view, hasFocus) -> view.setBackgroundResource(hasFocus ? R.drawable.focus_border : 0));
|
|
||||||
SurfaceHolder holder = surfaceView.getHolder();
|
SurfaceHolder holder = surfaceView.getHolder();
|
||||||
|
|
||||||
holder.setKeepScreenOn(true);
|
holder.setKeepScreenOn(true);
|
||||||
@ -342,10 +250,6 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOnClickListener(View.OnClickListener listener) {
|
|
||||||
surfaceView.setOnClickListener(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Starts the playback.
|
* Starts the playback.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,137 +0,0 @@
|
|||||||
package it.danieleverducci.ojo.ui.adapters;
|
|
||||||
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.MotionEvent;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import it.danieleverducci.ojo.R;
|
|
||||||
import it.danieleverducci.ojo.databinding.FragmentSettingsItemBinding;
|
|
||||||
import it.danieleverducci.ojo.entities.Camera;
|
|
||||||
import it.danieleverducci.ojo.utils.ItemMoveCallback;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link RecyclerView.Adapter} that can display a {@link Camera}.
|
|
||||||
* TODO: Replace the implementation with code for your data type.
|
|
||||||
*/
|
|
||||||
public class SettingsRecyclerViewAdapter extends RecyclerView.Adapter<SettingsRecyclerViewAdapter.ViewHolder> implements ItemMoveCallback.ItemTouchHelperContract {
|
|
||||||
|
|
||||||
private final List<Camera> mValues;
|
|
||||||
private OnDragListener dragListener;
|
|
||||||
private OnClickListener clickListener;
|
|
||||||
|
|
||||||
public SettingsRecyclerViewAdapter(List<Camera> items) {
|
|
||||||
mValues = items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
|
||||||
ViewHolder vh = new ViewHolder(FragmentSettingsItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
|
|
||||||
vh.dragHandle.setOnTouchListener((v, event) -> {
|
|
||||||
if (event.getAction() == MotionEvent.ACTION_DOWN) {
|
|
||||||
dragListener.onItemDrag(vh);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
return vh;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(final ViewHolder holder, int position) {
|
|
||||||
String cameraName = mValues.get(position).getName();
|
|
||||||
if (cameraName == null || cameraName.length() == 0)
|
|
||||||
cameraName = holder.name.getContext().getString(R.string.stream_list_default_camera_name).replace("{camNo}", (position+1)+"");
|
|
||||||
holder.name.setText(cameraName);
|
|
||||||
holder.url.setText(mValues.get(position).getRtspUrl());
|
|
||||||
|
|
||||||
holder.root.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View view) {
|
|
||||||
clickListener.onItemClick(holder.getBindingAdapterPosition());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
holder.deleteButton.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View view) {
|
|
||||||
mValues.remove(holder.getBindingAdapterPosition());
|
|
||||||
notifyItemRemoved(holder.getBindingAdapterPosition());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return mValues.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ============= Drag&Drop TouchHelper methods =============
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRowMoved(int fromPosition, int toPosition) {
|
|
||||||
if (fromPosition < toPosition) {
|
|
||||||
for (int i = fromPosition; i < toPosition; i++) {
|
|
||||||
Collections.swap(mValues, i, i + 1);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (int i = fromPosition; i > toPosition; i--) {
|
|
||||||
Collections.swap(mValues, i, i - 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
notifyItemMoved(fromPosition, toPosition);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRowSelected(RecyclerView.ViewHolder myViewHolder) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRowClear(RecyclerView.ViewHolder myViewHolder) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnDragListener(OnDragListener dragListener) {
|
|
||||||
this.dragListener = dragListener;
|
|
||||||
}
|
|
||||||
public void setOnClickListener(OnClickListener clickListener) {
|
|
||||||
this.clickListener = clickListener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Camera> getItems() {
|
|
||||||
return mValues;
|
|
||||||
}
|
|
||||||
|
|
||||||
public class ViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
public View root;
|
|
||||||
public TextView name;
|
|
||||||
public TextView url;
|
|
||||||
public View deleteButton;
|
|
||||||
public View dragHandle;
|
|
||||||
|
|
||||||
public ViewHolder(FragmentSettingsItemBinding binding) {
|
|
||||||
super(binding.getRoot());
|
|
||||||
|
|
||||||
this.root = binding.getRoot();
|
|
||||||
this.name = binding.cameraName;
|
|
||||||
this.url = binding.cameraUrl;
|
|
||||||
this.deleteButton = binding.cameraDelete;
|
|
||||||
this.dragHandle = binding.cameraDragHandle;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface OnDragListener {
|
|
||||||
void onItemDrag(ViewHolder vh);
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface OnClickListener {
|
|
||||||
void onItemClick(int pos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
package it.danieleverducci.ojo.utils;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Implementation of recycleview drag&drop
|
|
||||||
*/
|
|
||||||
public class ItemMoveCallback extends ItemTouchHelper.Callback {
|
|
||||||
|
|
||||||
private final ItemTouchHelperContract mAdapter;
|
|
||||||
|
|
||||||
public ItemMoveCallback(ItemTouchHelperContract adapter) {
|
|
||||||
mAdapter = adapter;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isLongPressDragEnabled() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isItemViewSwipeEnabled() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
|
|
||||||
int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
|
|
||||||
return makeMovementFlags(dragFlags, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onMove(@NonNull RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
|
|
||||||
RecyclerView.ViewHolder target) {
|
|
||||||
mAdapter.onRowMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSelectedChanged(RecyclerView.ViewHolder viewHolder,
|
|
||||||
int actionState) {
|
|
||||||
if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
|
|
||||||
mAdapter.onRowSelected(viewHolder);
|
|
||||||
}
|
|
||||||
super.onSelectedChanged(viewHolder, actionState);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void clearView(@NonNull RecyclerView recyclerView,
|
|
||||||
@NonNull RecyclerView.ViewHolder viewHolder) {
|
|
||||||
super.clearView(recyclerView, viewHolder);
|
|
||||||
mAdapter.onRowClear(viewHolder);
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface ItemTouchHelperContract {
|
|
||||||
void onRowMoved(int fromPosition, int toPosition);
|
|
||||||
void onRowSelected(RecyclerView.ViewHolder myViewHolder);
|
|
||||||
void onRowClear(RecyclerView.ViewHolder myViewHolder);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="#FFFFFF"
|
|
||||||
android:alpha="0.8">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="#FFFFFF"
|
|
||||||
android:alpha="0.8">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="#FFFFFF"
|
|
||||||
android:alpha="0.8">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="#FFFFFF"
|
|
||||||
android:alpha="0.8">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M12,14m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M16,3.33c2.58,0 4.67,2.09 4.67,4.67H22c0,-3.31 -2.69,-6 -6,-6v1.33M16,6c1.11,0 2,0.89 2,2h1.33c0,-1.84 -1.49,-3.33 -3.33,-3.33V6"/>
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M17,9c0,-1.11 -0.89,-2 -2,-2L15,4L9,4L7.17,6L4,6c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,9h-5zM12,19c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="#FFFFFF"
|
|
||||||
android:alpha="0.8">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="#FFFFFF"
|
|
||||||
android:alpha="0.8">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
|
|
||||||
</vector>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 178 B |
Binary file not shown.
|
Before Width: | Height: | Size: 267 B |
Binary file not shown.
|
Before Width: | Height: | Size: 145 B |
Binary file not shown.
|
Before Width: | Height: | Size: 538 B |
Binary file not shown.
|
Before Width: | Height: | Size: 483 B |
Binary file not shown.
|
Before Width: | Height: | Size: 517 B |
Binary file not shown.
|
Before Width: | Height: | Size: 120 B |
Binary file not shown.
|
Before Width: | Height: | Size: 189 B |
Binary file not shown.
|
Before Width: | Height: | Size: 113 B |
Binary file not shown.
|
Before Width: | Height: | Size: 327 B |
Binary file not shown.
|
Before Width: | Height: | Size: 337 B |
Binary file not shown.
|
Before Width: | Height: | Size: 328 B |
Binary file not shown.
|
Before Width: | Height: | Size: 159 B |
Binary file not shown.
|
Before Width: | Height: | Size: 294 B |
Binary file not shown.
|
Before Width: | Height: | Size: 142 B |
Binary file not shown.
|
Before Width: | Height: | Size: 682 B |
Binary file not shown.
|
Before Width: | Height: | Size: 653 B |
Binary file not shown.
|
Before Width: | Height: | Size: 627 B |
Binary file not shown.
|
Before Width: | Height: | Size: 260 B |
Binary file not shown.
|
Before Width: | Height: | Size: 399 B |
Binary file not shown.
|
Before Width: | Height: | Size: 176 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 913 B |
Binary file not shown.
|
Before Width: | Height: | Size: 908 B |
@ -1,6 +0,0 @@
|
|||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="rectangle">
|
|
||||||
<stroke
|
|
||||||
android:width="1dip"
|
|
||||||
android:color="@color/white" />
|
|
||||||
</shape>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
|
|
||||||
</vector>
|
|
||||||
10
app/src/main/res/drawable/ic_add_camera.xml
Normal file
10
app/src/main/res/drawable/ic_add_camera.xml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24"
|
||||||
|
android:tint="?attr/colorControlNormal">
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M3,4V1h2v3h3v2H5v3H3V6H0V4H3zM6,10V7h3V4h7l1.83,2H21c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H5c-1.1,0 -2,-0.9 -2,-2V10H6zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5s-5,2.24 -5,5S10.24,19 13,19zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2s-1.43,-3.2 -3.2,-3.2S9.8,12.23 9.8,14z"/>
|
||||||
|
</vector>
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,13 +1,13 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:width="108dp"
|
android:width="108dp"
|
||||||
android:height="108dp"
|
android:height="108dp"
|
||||||
android:viewportWidth="24"
|
android:viewportWidth="108"
|
||||||
android:viewportHeight="24"
|
android:viewportHeight="108"
|
||||||
android:tint="#FFFFFF">
|
android:tint="#FFFFFF">
|
||||||
<group android:scaleX="0.58"
|
<group android:scaleX="2.61"
|
||||||
android:scaleY="0.58"
|
android:scaleY="2.61"
|
||||||
android:translateX="5.04"
|
android:translateX="22.68"
|
||||||
android:translateY="5.04">
|
android:translateY="22.68">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@android:color/white"
|
android:fillColor="@android:color/white"
|
||||||
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
|
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
|
||||||
|
|||||||
@ -1,16 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M12,14m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M16,3.33c2.58,0 4.67,2.09 4.67,4.67H22c0,-3.31 -2.69,-6 -6,-6v1.33M16,6c1.11,0 2,0.89 2,2h1.33c0,-1.84 -1.49,-3.33 -3.33,-3.33V6"/>
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M17,9c0,-1.11 -0.89,-2 -2,-2L15,4L9,4L7.17,6L4,6c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,9h-5zM12,19c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
|
|
||||||
</vector>
|
|
||||||
@ -6,12 +6,7 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".ui.MainActivity">
|
tools:context=".ui.MainActivity">
|
||||||
|
|
||||||
<androidx.fragment.app.FragmentContainerView
|
<include layout="@layout/content_main" />
|
||||||
android:id="@+id/fragment_surveillance"
|
|
||||||
android:name="it.danieleverducci.ojo.ui.SurveillanceFragment"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:layout="@layout/fragment_surveillance" />
|
|
||||||
|
|
||||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/fab"
|
android:id="@+id/fab"
|
||||||
@ -19,12 +14,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="bottom|end"
|
android:layout_gravity="bottom|end"
|
||||||
android:layout_margin="@dimen/fab_margin"
|
android:layout_margin="@dimen/fab_margin"
|
||||||
android:src="@drawable/ic_settings"
|
app:srcCompat="@drawable/ic_add_camera"
|
||||||
app:srcCompat="@drawable/ic_settings"
|
app:tint="@color/purple_500"/>
|
||||||
app:tint="@color/white"
|
|
||||||
android:tint="@color/white"
|
|
||||||
android:backgroundTint="@color/fab_background"
|
|
||||||
android:hint="@string/fab_add_camera"
|
|
||||||
android:contentDescription="@string/fab_add_camera"/>
|
|
||||||
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context=".ui.SettingsActivity">
|
|
||||||
|
|
||||||
<include layout="@layout/content_settings" />
|
|
||||||
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
||||||
@ -6,7 +6,7 @@
|
|||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/nav_host_fragment_content_settings"
|
android:id="@+id/nav_host_fragment_content_main"
|
||||||
android:name="androidx.navigation.fragment.NavHostFragment"
|
android:name="androidx.navigation.fragment.NavHostFragment"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
@ -14,32 +14,14 @@
|
|||||||
android:gravity="center_horizontal">
|
android:gravity="center_horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="100dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="100dp"
|
android:layout_height="wrap_content"
|
||||||
android:padding="20dp"
|
|
||||||
android:layout_marginBottom="50dp"
|
android:layout_marginBottom="50dp"
|
||||||
android:background="@color/ic_launcher_background"
|
android:src="@mipmap/ic_launcher_round"/>
|
||||||
android:src="@drawable/ic_eye"/>
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/add_stream_name"/>
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/stream_name"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:hint="@string/add_stream_placeholder_name"
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:inputType="textUri"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="30dp"
|
|
||||||
android:text="@string/add_stream"/>
|
android:text="@string/add_stream"/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
@ -59,6 +41,48 @@
|
|||||||
android:layout_marginTop="30dp"
|
android:layout_marginTop="30dp"
|
||||||
android:text="@string/add_stream_save"/>
|
android:text="@string/add_stream_save"/>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="50dp"
|
||||||
|
android:background="@color/purple_200"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Title"
|
||||||
|
android:textColor="@color/purple_500"
|
||||||
|
android:text="@string/app_info_title"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:text="@string/app_info_creator_desc"
|
||||||
|
android:autoLink="web"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:text="@string/app_info_license_desc"
|
||||||
|
android:autoLink="web"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:text="@string/app_info_repo_desc"
|
||||||
|
android:autoLink="web"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:text="@string/app_info_lib_desc"
|
||||||
|
android:autoLink="web"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
@ -1,76 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:padding="50dp">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="100dp"
|
|
||||||
android:layout_height="100dp"
|
|
||||||
android:padding="20dp"
|
|
||||||
android:background="@color/ic_launcher_background"
|
|
||||||
android:src="@drawable/ic_eye"/>
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:layout_margin="50dp"
|
|
||||||
android:background="@color/purple_200"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Title"
|
|
||||||
android:textColor="@color/purple_500"
|
|
||||||
android:text="@string/app_info_title"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:text="@string/app_info_creator_desc"
|
|
||||||
android:autoLink="web"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:text="@string/app_info_license_desc"
|
|
||||||
android:autoLink="web"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:text="@string/app_info_repo_desc"
|
|
||||||
android:autoLink="web"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:text="@string/app_info_lib_desc"
|
|
||||||
android:autoLink="web"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:text="@string/app_info_translators_title"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:text="@string/app_info_translators_names"/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</ScrollView>
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="@dimen/text_margin"
|
|
||||||
android:paddingBottom="@dimen/text_margin"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
app:srcCompat="@drawable/ic_network_camera"
|
|
||||||
app:tint="@color/design_default_color_primary"/>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/camera_name"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="5sp"
|
|
||||||
android:textAppearance="?attr/textAppearanceListItem"
|
|
||||||
android:textColor="@color/design_default_color_primary"
|
|
||||||
android:lines="1"
|
|
||||||
android:text="@tools:sample/lorem/random"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/camera_url"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textAppearance="?attr/textAppearanceListItemSecondary"
|
|
||||||
android:lines="1"
|
|
||||||
android:text="@tools:sample/lorem/random" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/camera_delete"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
app:srcCompat="@drawable/ic_delete"
|
|
||||||
app:tint="@color/purple_200" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/camera_drag_handle"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:layout_weight="0"
|
|
||||||
app:srcCompat="@drawable/ic_drag_handle"
|
|
||||||
app:tint="@color/purple_200" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.Toolbar
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:id="@+id/settingsToolbar"
|
|
||||||
app:title="@string/app_name"
|
|
||||||
style="@style/ToolBarStyle"
|
|
||||||
android:focusable="true"/>
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/list"
|
|
||||||
android:name="it.danieleverducci.ojo.ui.SettingsFragment"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:layout_marginLeft="16dp"
|
|
||||||
android:layout_marginRight="16dp"
|
|
||||||
app:layoutManager="LinearLayoutManager"
|
|
||||||
tools:context=".ui.SettingsFragment"
|
|
||||||
tools:listitem="@layout/fragment_settings_item"
|
|
||||||
android:focusable="true" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
@ -6,7 +6,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
tools:context=".ui.StreamUrlFragment"
|
tools:context=".ui.AddStreamFragment"
|
||||||
android:background="@color/purple_500">
|
android:background="@color/purple_500">
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
||||||
|
|
||||||
<item android:id="@+id/menuitem_add_camera"
|
|
||||||
android:icon="@drawable/ic_add"
|
|
||||||
android:title="@string/menuitem_add_camera"
|
|
||||||
app:showAsAction="always"/>
|
|
||||||
|
|
||||||
<item android:id="@+id/menuitem_allow_rotation"
|
|
||||||
android:title="@string/menuitem_allow_rotation"
|
|
||||||
app:showAsAction="never"/>
|
|
||||||
|
|
||||||
<item android:id="@+id/menuitem_info"
|
|
||||||
android:title="@string/menuitem_info"
|
|
||||||
app:showAsAction="never"/>
|
|
||||||
|
|
||||||
</menu>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
@ -3,32 +3,26 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/nav_graph"
|
android:id="@+id/nav_graph"
|
||||||
app:startDestination="@id/SettingsFragment">
|
app:startDestination="@id/FirstFragment">
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/CameraUrlFragment"
|
android:id="@+id/FirstFragment"
|
||||||
android:name="it.danieleverducci.ojo.ui.StreamUrlFragment"
|
android:name="it.danieleverducci.ojo.ui.SurveillanceFragment"
|
||||||
|
android:label="@string/first_fragment_label"
|
||||||
|
tools:layout="@layout/fragment_surveillance">
|
||||||
|
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_FirstFragment_to_SecondFragment"
|
||||||
|
app:destination="@id/SecondFragment" />
|
||||||
|
</fragment>
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/SecondFragment"
|
||||||
|
android:name="it.danieleverducci.ojo.ui.AddStreamFragment"
|
||||||
android:label="@string/second_fragment_label"
|
android:label="@string/second_fragment_label"
|
||||||
tools:layout="@layout/fragment_add_stream">
|
tools:layout="@layout/fragment_add_stream">
|
||||||
<action
|
|
||||||
android:id="@+id/action_cameraUrlToSettings"
|
|
||||||
app:destination="@id/SettingsFragment" />
|
|
||||||
</fragment>
|
|
||||||
<fragment
|
|
||||||
android:id="@+id/SettingsFragment"
|
|
||||||
android:name="it.danieleverducci.ojo.ui.SettingsFragment"
|
|
||||||
android:label="fragment_settings_item_list"
|
|
||||||
tools:layout="@layout/fragment_settings_item_list" >
|
|
||||||
|
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_settingsToCameraUrl"
|
android:id="@+id/action_SecondFragment_to_FirstFragment"
|
||||||
app:destination="@id/CameraUrlFragment" />
|
app:destination="@id/FirstFragment" />
|
||||||
<action
|
|
||||||
android:id="@+id/action_SettingsToInfoFragment"
|
|
||||||
app:destination="@id/infoFragment" />
|
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
|
||||||
android:id="@+id/infoFragment"
|
|
||||||
android:name="it.danieleverducci.ojo.ui.InfoFragment"
|
|
||||||
android:label="InfoFragment" />
|
|
||||||
</navigation>
|
</navigation>
|
||||||
@ -5,29 +5,16 @@
|
|||||||
<string name="first_fragment_label">First Fragment</string>
|
<string name="first_fragment_label">First Fragment</string>
|
||||||
<string name="second_fragment_label">Second Fragment</string>
|
<string name="second_fragment_label">Second Fragment</string>
|
||||||
|
|
||||||
<string name="fab_add_camera">Add</string>
|
|
||||||
|
|
||||||
<string name="stream_list_default_camera_name">Videocamera senza nome n°{camNo}</string>
|
|
||||||
|
|
||||||
<string name="add_stream_placeholder_url">rtsp://username:password@192.168.1.123:554</string>
|
<string name="add_stream_placeholder_url">rtsp://username:password@192.168.1.123:554</string>
|
||||||
<string name="add_stream_placeholder_name">Nome della IP Camera</string>
|
<string name="add_stream">Inserisci l\'url dello stream RTSP della tua IP Camera. Nota che questo differisce tra un modello e l\'altro. Consulta il pannello di configurazione o il manuale della tua IP Camera.</string>
|
||||||
<string name="add_stream_name">Nome della IP Camera</string>
|
|
||||||
<string name="add_stream_save">Salva</string>
|
<string name="add_stream_save">Salva</string>
|
||||||
<string name="add_stream_invalid_url">L\'URL RTSP non è valido</string>
|
<string name="add_stream_invalid_url">L\'URL RTSP non è valido</string>
|
||||||
<string name="add_stream_invalid_url_dismiss">Chiudi</string>
|
<string name="add_stream_invalid_url_dismiss">Chiudi</string>
|
||||||
<string name="add_stream_error_saving">Si è verificato un errore durante il salvataggio della configurazione.</string>
|
<string name="add_stream_error_saving">Si è verificato un errore durante il salvataggio della configurazione.</string>
|
||||||
<string name="add_stream">Inserisci l\'url dello stream RTSP della tua IP Camera. Nota che questo differisce tra un modello e l\'altro. Consulta il pannello di configurazione o il manuale della tua IP Camera.</string>
|
|
||||||
<string name="menuitem_allow_rotation">Allow screen rotation</string>
|
|
||||||
<string name="menuitem_deny_rotation">Landscape only</string>
|
|
||||||
<string name="menuitem_info">Info</string>
|
|
||||||
<string name="menuitem_add_camera">Aggiungi</string>
|
|
||||||
|
|
||||||
<string name="app_info_title">Informazioni su Ojo</string>
|
<string name="app_info_title">Informazioni su Ojo</string>
|
||||||
<string name="app_info_creator_desc">Creato da Daniele Verducci.</string>
|
<string name="app_info_creator_desc">Creato da Daniele Verducci.</string>
|
||||||
<string name="app_info_license_desc">Questa app è rilasciata sotto licenza GNU GENERAL PUBLIC LICENSE v3+. Puoi ottenerne una copia qui: https://raw.githubusercontent.com/penguin86/ojo/master/LICENSE</string>
|
<string name="app_info_license_desc">Questa app è rilasciata sotto licenza GNU GENERAL PUBLIC LICENSE v3+. Puoi ottenerne una copia qui: https://raw.githubusercontent.com/penguin86/ojo/master/LICENSE</string>
|
||||||
<string name="app_info_repo_desc">Puoi trovare il codice sorgente al repository: https://github.com/penguin86/ojo</string>
|
<string name="app_info_repo_desc">Puoi trovare il codice sorgente al repository: https://github.com/penguin86/ojo</string>
|
||||||
<string name="app_info_lib_desc">Questa app è resa possibile dal magnifico lavoro dei team vlc and vlc-android! Per saperne di più o ottenere il codice sorgente: https://code.videolan.org/videolan/vlc-android</string>
|
<string name="app_info_lib_desc">Questa app è resa possibile dal magnifico lavoro dei team vlc and vlc-android! Per saperne di più o ottenere il codice sorgente: https://code.videolan.org/videolan/vlc-android</string>
|
||||||
<string name="app_info_translators_title">Traduttori:</string>
|
|
||||||
<string name="app_info_translators_names">Yurt Page (Russian)</string>
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<string name="app_name">Ojo</string>
|
|
||||||
<!-- Strings used for fragments for navigation -->
|
|
||||||
<string name="first_fragment_label">Первый Фрагмент</string>
|
|
||||||
<string name="second_fragment_label">Второй Фрагмент</string>
|
|
||||||
|
|
||||||
<string name="fab_add_camera">Добавить</string>
|
|
||||||
|
|
||||||
<string name="stream_list_default_camera_name">VidБезымянная камера №{camNo}</string>
|
|
||||||
|
|
||||||
<string name="add_stream_placeholder_url">rtsp://username:password@192.168.1.123:554</string>
|
|
||||||
<string name="add_stream_placeholder_name">Название IP камеры</string>
|
|
||||||
<string name="add_stream_name">Нзвание потока IP камеры</string>
|
|
||||||
<string name="add_stream_save">Сохранить</string>
|
|
||||||
<string name="add_stream_invalid_url">Неправильный RTSP URL</string>
|
|
||||||
<string name="add_stream_invalid_url_dismiss">Закрыть</string>
|
|
||||||
<string name="add_stream_error_saving">Произошла ошибка при сохранении конфигурации</string>
|
|
||||||
<string name="add_stream">Пожалуйста введите RTSP поток вашей камеры. Обратите внимание, что URL отличается от камеры к камере: вы можете найти полный URL адрес в настройках вашей камеры или руководстве пользователя.</string>
|
|
||||||
<string name="menuitem_allow_rotation">Разрешить вращение экрана</string>
|
|
||||||
<string name="menuitem_deny_rotation">Только альбомная</string>
|
|
||||||
<string name="menuitem_info">Инфо</string>
|
|
||||||
<string name="menuitem_add_camera">Добавить</string>
|
|
||||||
|
|
||||||
<string name="app_info_title">О программе</string>
|
|
||||||
<string name="app_info_creator_desc">Автор: Daniele Verducci.</string>
|
|
||||||
<string name="app_info_license_desc">Это приложение лицензировано в соответствии с GNU GENERAL PUBLIC LICENSE v3+. Ознакомьтесь тут: https://raw.githubusercontent.com/penguin86/ojo/master/LICENSE</string>
|
|
||||||
<string name="app_info_repo_desc">Исходный код в репозитории на GitHub:: https://github.com/penguin86/ojo</string>
|
|
||||||
<string name="app_info_lib_desc">Это приложение стало возможным благодаря усилиям команды VLC и VLC-Android! Вы можете узнать больше или получить исходный код тут: https://code.videolan.org/videolan/vlc-android</string>
|
|
||||||
|
|
||||||
</resources>
|
|
||||||
@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
<style name="Theme.Ojo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
<style name="Theme.Ojo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||||
|
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
||||||
<item name="windowActionBar">false</item>
|
<item name="windowActionBar">false</item>
|
||||||
<item name="windowNoTitle">true</item>
|
<item name="windowNoTitle">true</item>
|
||||||
<!-- Primary brand color. -->
|
<!-- Primary brand color. -->
|
||||||
@ -12,8 +13,7 @@
|
|||||||
<item name="colorSecondaryVariant">@color/purple_700</item>
|
<item name="colorSecondaryVariant">@color/purple_700</item>
|
||||||
<item name="colorOnSecondary">@color/black</item>
|
<item name="colorOnSecondary">@color/black</item>
|
||||||
<!-- Status bar color. -->
|
<!-- Status bar color. -->
|
||||||
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
|
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
|
||||||
<!-- Customize your theme here. -->
|
<!-- Customize your theme here. -->
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
@ -5,7 +5,4 @@
|
|||||||
<color name="purple_700">#FF3700B3</color>
|
<color name="purple_700">#FF3700B3</color>
|
||||||
<color name="black">#FF000000</color>
|
<color name="black">#FF000000</color>
|
||||||
<color name="white">#FFFFFFFF</color>
|
<color name="white">#FFFFFFFF</color>
|
||||||
|
|
||||||
<color name="fab_foreground">@color/purple_500</color>
|
|
||||||
<color name="fab_background">@color/purple_200</color>
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -1,4 +1,3 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<dimen name="fab_margin">16dp</dimen>
|
<dimen name="fab_margin">16dp</dimen>
|
||||||
<dimen name="text_margin">16dp</dimen>
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -4,28 +4,16 @@
|
|||||||
<string name="first_fragment_label">First Fragment</string>
|
<string name="first_fragment_label">First Fragment</string>
|
||||||
<string name="second_fragment_label">Second Fragment</string>
|
<string name="second_fragment_label">Second Fragment</string>
|
||||||
|
|
||||||
<string name="fab_add_camera">Add</string>
|
|
||||||
|
|
||||||
<string name="stream_list_default_camera_name">Unnamed camera {camNo}</string>
|
|
||||||
|
|
||||||
<string name="add_stream_placeholder_url">rtsp://username:password@192.168.1.123:554</string>
|
<string name="add_stream_placeholder_url">rtsp://username:password@192.168.1.123:554</string>
|
||||||
<string name="add_stream_placeholder_name">Camera name</string>
|
<string name="add_stream">Please insert your camera\'s RTSP stream. Note that the URL differs from camera to camera: you can find the complete URL in your camera\'s settings or user manual.</string>
|
||||||
<string name="add_stream_name">Camera name</string>
|
|
||||||
<string name="add_stream_save">Save</string>
|
<string name="add_stream_save">Save</string>
|
||||||
<string name="add_stream_invalid_url">Invalid RTSP url</string>
|
<string name="add_stream_invalid_url">Invalid RTSP url</string>
|
||||||
<string name="add_stream_invalid_url_dismiss">Dismiss</string>
|
<string name="add_stream_invalid_url_dismiss">Dismiss</string>
|
||||||
<string name="add_stream_error_saving">An error has occurred while saving configuration</string>
|
<string name="add_stream_error_saving">An error has occurred while saving configuration</string>
|
||||||
<string name="add_stream">Please insert your camera\'s RTSP stream. Note that the URL differs from camera to camera: you can find the complete URL in your camera\'s settings or user manual.</string>
|
|
||||||
<string name="menuitem_allow_rotation">Allow screen rotation</string>
|
|
||||||
<string name="menuitem_deny_rotation">Landscape only</string>
|
|
||||||
<string name="menuitem_info">Info</string>
|
|
||||||
<string name="menuitem_add_camera">Add</string>
|
|
||||||
|
|
||||||
<string name="app_info_title">About Ojo</string>
|
<string name="app_info_title">About Ojo</string>
|
||||||
<string name="app_info_creator_desc">Created by Daniele Verducci.</string>
|
<string name="app_info_creator_desc">Created by Daniele Verducci.</string>
|
||||||
<string name="app_info_license_desc">This application is licensed under the GNU GENERAL PUBLIC LICENSE v3+. You can obtain a copy here: https://raw.githubusercontent.com/penguin86/ojo/master/LICENSE</string>
|
<string name="app_info_license_desc">This application is licensed under the GNU GENERAL PUBLIC LICENSE v3+. You can obtain a copy here: https://raw.githubusercontent.com/penguin86/ojo/master/LICENSE</string>
|
||||||
<string name="app_info_repo_desc">The source code can be obtained at the GitHub repository: https://github.com/penguin86/ojo</string>
|
<string name="app_info_repo_desc">The source code can be obtained at the github repository: https://github.com/penguin86/ojo</string>
|
||||||
<string name="app_info_lib_desc">This app is made possible by the gorgeous VLC and VLC-Android teams effort! You can know more or obtain the source code at https://code.videolan.org/videolan/vlc-android</string>
|
<string name="app_info_lib_desc">This app is made possible by the gourgeous vlc and vlc-android teams effort! You can know more or obtain the source code at https://code.videolan.org/videolan/vlc-android</string>
|
||||||
<string name="app_info_translators_title">Translators:</string>
|
|
||||||
<string name="app_info_translators_names" translatable="false">Yurt Page (Russian)</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -12,16 +12,6 @@
|
|||||||
<item name="colorSecondary">@color/purple_500</item>
|
<item name="colorSecondary">@color/purple_500</item>
|
||||||
<item name="colorSecondaryVariant">@color/purple_700</item>
|
<item name="colorSecondaryVariant">@color/purple_700</item>
|
||||||
<item name="colorOnSecondary">@color/white</item>
|
<item name="colorOnSecondary">@color/white</item>
|
||||||
|
|
||||||
<item name="colorAccent">@color/white</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ToolBarStyle" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
|
|
||||||
<item name="android:background">@color/purple_500</item>
|
|
||||||
<item name="titleTextColor">@color/white</item>
|
|
||||||
<item name="actionMenuTextColor">@color/white</item>
|
|
||||||
<item name="android:actionMenuTextColor">@color/white</item>
|
|
||||||
<item name="colorOnPrimary">@color/white</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -5,7 +5,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.4.0'
|
classpath "com.android.tools.build:gradle:4.2.2"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
Downgraded LibVLC library to fix black screen bug on certain devices
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
RTSP Streams can be removed, edited and reordered.
|
|
||||||
Now supporting screen rotation (disabled by default).
|
|
||||||
Better back button handling in full screen mode.
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
App can be opened with url intent ojo://view
|
|
||||||
Backported to Android >= 4.0.3
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
Added russian translation (thanks to Yurt Page!)
|
|
||||||
|
|
||||||
@ -1,16 +1,6 @@
|
|||||||
Ojo is a basic IP Camera surveillance wall.
|
Ojo is a basic IP Camera surveillance wall.
|
||||||
IP camera's RTSP streams are added via its url and shown in the classic tile configuration. The number of tiles is automatically chosen based on the number of configured cameras: a single camera goes full screen, adding more cameras the app switches to a grid view: 2x2, 3x3, 4x4 and so on.
|
IP camera's RTSP streams are added via its url and shown in the classic tile configuration. The number of tiles is automatically choosen based on the number of configured cameras: a single camera goes full screen, adding more cameras the app switches to a grid view: 2x2, 3x3, 4x4 and so on.
|
||||||
The maximum number of cameras is determined by the device's capabilities.
|
The maximum number of cameras is determined by the device's capabilities.
|
||||||
|
|
||||||
The stream decoding and rendering is demanded to VLC's library: without their effort this app wouldn't be possible.
|
The stream decoding and rendering is demanded to VLC's library: without their effort this app wouldn't be possible.
|
||||||
This app was specifically developed for F-Droid, as I couldn't find any open source RTSP viewers in the main repository.
|
This app was specifically developed for F-Droid, as I couldn't find any open source RTSP vievers in the main repository.
|
||||||
|
|
||||||
The app can be opened deeplinking to url ojo://view
|
|
||||||
To open the app with focus on a specific camera, you can use an intent (it.danieleverducci.ojo.OPEN_CAMERA) to specify which camera you want to view.
|
|
||||||
The extra argument it.danieleverducci.ojo.CAMERA_NAME will open the app with the camera with the name you specified while adding the camera.
|
|
||||||
The extra argument it.danieleverducci.ojo.CAMERA_NUMBER starting at 1 could be used as well, if you have multiple cameras with the same name.
|
|
||||||
|
|
||||||
See below an example how to use the intent. The flag (-f 268468224) could be useful if you want to switch to another camera while the app is running:
|
|
||||||
|
|
||||||
adb -s <YOUR_DEVICE> shell am start -a it.danieleverducci.ojo.OPEN_CAMERA -f 268468224 --es it.danieleverducci.ojo.CAMERA_NAME <YOUR_CAMERA_NAME>
|
|
||||||
adb -s <YOUR_DEVICE> shell am start -a it.danieleverducci.ojo.OPEN_CAMERA -f 268468224 --es it.danieleverducci.ojo.CAMERA_NUMBER <YOUR_CAMERA_NUMBER>
|
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
Downgrade della libreria libVLC per risolvere il bug della schermata nera in determinati dispositivi
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
Possibilità di rimuovere, modificare e riordinare gli stream RTSP.
|
|
||||||
Supporto per la rotazione dello schermo (disabilitato di default).
|
|
||||||
Migliorato il comportamento quando si preme il bottone Indietro in fullscreen.
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
L'app può essere aperta con intent url ojo://view
|
|
||||||
Aggiunta compatibilità con vecchie versioni di Android >= 4.0.3
|
|
||||||
@ -1 +0,0 @@
|
|||||||
Aggiunta traduzione in russo (grazie a Yurt Page!)
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
OJO это базовый просмотрщик IP камер наблюдения.
|
|
||||||
RTSP потоки IP камеры добавляются через его URL адрес и показаны в классической плиточной конфигурации. Количество плиток автоматически выбирается на основе количества настроенных камер: одна камера показана на весь экран, добавление больше камер переключает на сетку: 2x2, 3x3, 4x4 и т. д.
|
|
||||||
|
|
||||||
Максимальное количество камер определяется возможностями устройства.
|
|
||||||
|
|
||||||
Декодирование и рендеринг потока требует библиотеки VLC: без их стараний это приложение не было бы возможно.
|
|
||||||
|
|
||||||
Это приложение было специально разработано для F-Droid, так как я не мог найти каких-либо просмотрщиков RTSP с открытым исходным кодом в основном репозитории.
|
|
||||||
|
|
||||||
Приложение может быть открыто с глубокой ссылкой по URL ojo://view.
|
|
||||||
Чтобы открыть приложение с фокусом на определенной камере, вы можете использовать intent (it.danieleverducci.ojo.OPEN_CAMERA) чтобы указать какую камеру вы хотите просмотреть.
|
|
||||||
Дополнительный аргумент it.danieleverducci.ojo.CAMERA_NAME откроет приложение с камерой с указанным вами названием при добавлении камеры.
|
|
||||||
Дополнительный аргумент it.danieleverducci.ojo.CAMERA_NUMBER начиная с 1 также может использоваться, если у вас есть несколько камер с одним и тем же названием.
|
|
||||||
|
|
||||||
Ниже пример как использовать intent. Флаг (-F 268468224) может быть полезен, если вы хотите переключиться на другую камеру во время работы приложения:
|
|
||||||
|
|
||||||
adb -s <ВАШЕ_УСТРОЙСТВО> shell am start -a it.danieleverducci.ojo.OPEN_CAMERA -f 268468224 --es it.danieleverducci.ojo.CAMERA_NAME <ИМЯ_ВАШЕЙ_КАМЕРЫ>
|
|
||||||
adb -s <ВАШЕ_УСТРОЙСТВО> shell am start -a it.danieleverducci.ojo.OPEN_CAMERA -f 268468224 --es it.danieleverducci.ojo.CAMERA_NUMBER <НОМЕР_ВАШЕЙ_КАМЕРЫ>
|
|
||||||
|
|
||||||
@ -1 +0,0 @@
|
|||||||
OJO это базовый просмотрщик IP камер наблюдения.
|
|
||||||
@ -1 +0,0 @@
|
|||||||
Ojo RTSP просмотрщик IP Камер
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user