StenFreddSoft/SleppyOwl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Search, favourites, person page and settings

Browse Source
This commit is contained in:
StenFredd
2026-10-20 12:00:01 +03:00
parent 757ef213f8
commit 4b8427310f
45 changed files with 6494 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
app/src/main/assets/licenses/Apache-2.0.txt Normal file
View File

@@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

674
app/src/main/assets/licenses/GPL-3.0.txt Normal file
View File

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

5
app/src/main/assets/licenses/ISC.txt Normal file
View File

@@ -0,0 +1,5 @@
ISC License
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

502
app/src/main/assets/licenses/LGPL-2.1.txt Normal file
View File

@@ -0,0 +1,502 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
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 this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
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
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser 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 Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "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
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY 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
LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey 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 library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!

165
app/src/main/assets/licenses/LGPL-3.0.txt Normal file
View File

@@ -0,0 +1,165 @@
GNU LESSER 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.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser 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
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.

7
app/src/main/assets/licenses/MIT.txt Normal file
View File

@@ -0,0 +1,7 @@
MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

62
app/src/main/kotlin/ru/stenfredd/movies/MainActivity.kt
View File

@@ -27,19 +27,29 @@ import androidx.navigation3.runtime.NavEntry
import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
import androidx.navigation3.ui.NavDisplay
import dagger.hilt.android.AndroidEntryPoint
import androidx.compose.runtime.produceState
import ru.stenfredd.movies.core.data.LibraryRepository
import ru.stenfredd.movies.core.data.model.LibraryType
import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import ru.stenfredd.movies.playback.api.EngineId
import ru.stenfredd.movies.playback.api.StreamSelection
import ru.stenfredd.movies.ui.ItemsScreen
import ru.stenfredd.movies.ui.PrototypeScreen
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.TourScreen
import ru.stenfredd.movies.ui.details.DetailsScreen
import ru.stenfredd.movies.ui.home.HomeScreen
import ru.stenfredd.movies.ui.favorites.FavoritesScreen
import ru.stenfredd.movies.ui.library.LibraryMemory
import ru.stenfredd.movies.ui.library.LibraryScreen
import ru.stenfredd.movies.ui.person.PersonScreen
import ru.stenfredd.movies.ui.search.SearchScreen
import ru.stenfredd.movies.ui.settings.LicenseScreen
import ru.stenfredd.movies.ui.settings.SettingsScreen
import ru.stenfredd.movies.ui.player.PlayerScreen
import ru.stenfredd.movies.ui.series.SeriesScreen
import ru.stenfredd.movies.ui.login.LoginScreen
import ru.stenfredd.movies.ui.components.AppIcon
import ru.stenfredd.movies.ui.shell.RailLibrary
import ru.stenfredd.movies.ui.shell.Shell
import ru.stenfredd.movies.ui.shell.Tab
import ru.stenfredd.movies.ui.theme.AppColors
@@ -51,6 +61,11 @@ import javax.inject.Inject
@AndroidEntryPoint
class MainActivity : ComponentActivity() {
@Inject lateinit var session: JellyfinSession
@Inject lateinit var libraryRepository: LibraryRepository
@Inject lateinit var libraryMemory: LibraryMemory
/** Account → its libraries on the rail, see [Root]. */
private var railLibraries: Pair<String, List<RailLibrary>> = "" to emptyList()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -107,17 +122,29 @@ class MainActivity : ComponentActivity() {
NavEntry(screen) {
when (screen) {
Screen.Login -> LoginScreen(onDone = { resetTo(root(Tab.Home)) })
is Screen.Root -> Root(screen.tab, onTab = { resetTo(root(it)) }, onOpen = ::open, onLogout = { resetTo(Screen.Login) })
Screen.Prototype -> Legacy { PrototypeScreen(onOpen = ::open, onLogout = { resetTo(Screen.Login) }) }
is Screen.Root -> Root(
screen.tab,
onTab = { resetTo(root(it)) },
onLibrary = { id ->
val account = session.session.value?.accountId.orEmpty()
libraryMemory.setLibrary(account, id)
resetTo(Screen.Root(Tab.Library, account, library = id))
},
onOpen = ::open,
onSignedOut = { resetTo(Screen.Login) },
onSwitched = { resetTo(root(Tab.Home)) },
)
is Screen.Items -> Legacy { ItemsScreen(screen, onOpen = ::open) }
is Screen.Detail -> DetailsScreen(screen, onOpen = ::open)
is Screen.Series -> SeriesScreen(screen, onOpen = ::open)
is Screen.Person -> PersonScreen(screen, onOpen = ::open)
is Screen.Player -> PlayerScreen(
screen,
onExit = ::back,
onOpenDetails = { id -> showDetails(id) },
onOpenSeries = { seriesId, episodeId -> showSeries(seriesId, episodeId) },
)
is Screen.License -> LicenseScreen(screen)
is Screen.Tour -> TourScreen(screen.startIndex, onExit = ::back)
}
}
@@ -128,21 +155,37 @@ class MainActivity : ComponentActivity() {
private fun root(tab: Tab) = Screen.Root(tab, session.session.value?.accountId.orEmpty())
@Composable
private fun Root(tab: Tab, onTab: (Tab) -> Unit, onOpen: (Screen) -> Unit, onLogout: () -> Unit) {
private fun Root(tab: Tab, onTab: (Tab) -> Unit, onLibrary: (UUID) -> Unit, onOpen: (Screen) -> Unit, onSignedOut: () -> Unit, onSwitched: () -> Unit) {
val user by session.session.collectAsStateWithLifecycle()
// Cached by the repository (shared with home and the library tab); the rail just goes without them on failure.
// The last list starts the next tab's rail, so it does not appear a frame later on every tab switch.
val account = user?.accountId.orEmpty()
val libraries by produceState(railLibraries.takeIf { it.first == account }?.second.orEmpty(), account) {
value = runCatching { libraryRepository.views() }.getOrNull().orEmpty().map { view ->
val icon = when (view.type) {
LibraryType.Movies -> AppIcon.Film
LibraryType.Shows -> AppIcon.Tv
else -> AppIcon.Library
}
RailLibrary(view.id, view.name, icon)
}
railLibraries = account to value
}
Shell(
current = tab,
userName = user?.userName.orEmpty(),
userSeed = user?.userId?.toString().orEmpty(),
libraries = libraries,
onTab = onTab,
onLibrary = onLibrary,
onProfile = { onOpen(Screen.Login) },
) {
when (tab) {
Tab.Home -> HomeScreen(onOpen = onOpen)
Tab.Library -> LibraryScreen(onOpen = onOpen)
// Until stage 8 the search tab is the old prototype: text search, debug tour, logout.
Tab.Search -> Legacy { PrototypeScreen(onOpen = onOpen, onLogout = onLogout) }
Tab.Favorites -> Placeholder("${tab.label}: скоро")
Tab.Search -> SearchScreen(onOpen = onOpen)
Tab.Favorites -> FavoritesScreen(onOpen = onOpen)
Tab.Settings -> SettingsScreen(onOpen = onOpen, onSignedOut = onSignedOut, onSwitched = onSwitched)
}
}
}
@@ -153,11 +196,6 @@ class MainActivity : ComponentActivity() {
Surface(Modifier.fillMaxSize(), colors = SurfaceDefaults.colors(containerColor = Color.Transparent, contentColor = AppColors.Text)) { content() }
}
@Composable
private fun Placeholder(text: String) {
Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { BasicText(text, style = AppType.Body) }
}
/**
* Opens an item from the launch intent:
* `adb shell am start -S -n ru.stenfredd.movies/.MainActivity --es item <id> [--ez play true] [--el start <ms>]

66
app/src/main/kotlin/ru/stenfredd/movies/ui/BrowseScreens.kt
View File

@@ -55,72 +55,6 @@ private fun BaseItemDto.target(): Screen = when {
else -> Screen.Items(id, name.orEmpty())
}
@Composable
fun PrototypeScreen(onOpen: (Screen) -> Unit, onLogout: () -> Unit, vm: BrowseViewModel = hiltViewModel()) {
var views by remember { mutableStateOf(emptyList<BaseItemDto>()) }
var resume by remember { mutableStateOf(emptyList<BaseItemDto>()) }
var results by remember { mutableStateOf(emptyList<BaseItemDto>()) }
var query by remember { mutableStateOf("") }
val searchInput = rememberTextInputState()
var error by remember { mutableStateOf<String?>(null) }
var confirmLogout by remember { mutableStateOf(false) }
val scope = rememberCoroutineScope()
val context = LocalContext.current
val tourAvailable = remember { TourEntry.available(context) }
LaunchedEffect(Unit) {
runCatching {
views = vm.library.views()
resume = vm.library.resume()
}.onFailure { error = it.message }
}
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(48.dp, 32.dp),
verticalArrangement = Arrangement.spacedBy(24.dp),
) {
item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
views.forEach { v -> Button(onClick = { onOpen(Screen.Items(v.id, v.name.orEmpty())) }) { Text(v.name.orEmpty()) } }
if (tourAvailable) Button(onClick = { onOpen(Screen.Tour()) }) { Text("Режим отладки") }
// Focus may land here when the tab opens: the first OK only asks, the second one signs out.
Button(onClick = {
if (!confirmLogout) {
confirmLogout = true
} else {
scope.launch {
vm.session.logout()
onLogout()
}
}
}) { Text(if (confirmLogout) "Точно выйти?" else "Выйти") }
}
}
item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
TextInput(query, { query = it }, searchInput, Modifier.width(400.dp), placeholder = "Поиск", textStyle = AppType.BodyLarge.copy(color = AppColors.Text))
Button(onClick = { scope.launch { results = runCatching { vm.library.search(query) }.getOrDefault(emptyList()) } }) {
Text("Найти")
}
}
}
error?.let { item { Text(it, color = MaterialTheme.colorScheme.error) } }
if (results.isNotEmpty()) item { Shelf("Результаты поиска", results, vm.library, onOpen) }
if (resume.isNotEmpty()) item { Shelf("Продолжить просмотр", resume, vm.library, onOpen) }
}
}
@Composable
private fun Shelf(title: String, items: List<BaseItemDto>, library: Library, onOpen: (Screen) -> Unit) {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text(title, style = MaterialTheme.typography.titleLarge)
LazyRow(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
items(items, key = { it.id }) { item -> Poster(item, library, Modifier.width(160.dp)) { onOpen(item.target()) } }
}
}
}
@Composable
fun ItemsScreen(screen: Screen.Items, onOpen: (Screen) -> Unit, vm: BrowseViewModel = hiltViewModel()) {
var items by remember { mutableStateOf<List<BaseItemDto>?>(null) }

40
app/src/main/kotlin/ru/stenfredd/movies/ui/Library.kt
View File

@@ -2,7 +2,6 @@ package ru.stenfredd.movies.ui
import org.jellyfin.sdk.api.client.extensions.imageApi
import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.api.client.extensions.userViewApi
import org.jellyfin.sdk.model.api.BaseItemDto
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.ImageType
@@ -11,14 +10,11 @@ import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import java.util.UUID
import javax.inject.Inject
/** Plain item lists of the old prototype, still used for collections and folders ([ItemsScreen]). */
class Library @Inject constructor(private val session: JellyfinSession) {
private val api get() = session.api
private val userId get() = session.requireSession().userId
suspend fun views(): List<BaseItemDto> = session.call { userViewApi.getUserViews(userId = userId).content.items }
suspend fun resume(): List<BaseItemDto> = session.call { libraryApi.getResumeItems(userId = userId, limit = 20).content.items }
suspend fun children(parentId: UUID): List<BaseItemDto> = session.call {
libraryApi.getItems(
userId = userId,
@@ -28,40 +24,6 @@ class Library @Inject constructor(private val session: JellyfinSession) {
).content.items
}
suspend fun search(term: String): List<BaseItemDto> = session.call {
libraryApi.getItems(
userId = userId,
searchTerm = term,
recursive = true,
includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES, BaseItemKind.EPISODE),
limit = 60,
).content.items
}
suspend fun latest(parentId: UUID? = null, limit: Int = 20): List<BaseItemDto> = session.call {
libraryApi.getLatestMedia(userId = userId, parentId = parentId, limit = limit, groupItems = true).content
}
/** Newest movies and series of a library, with the total count. */
suspend fun libraryItems(parentId: UUID, limit: Int = 20): Pair<List<BaseItemDto>, Int> = session.call {
val r = libraryApi.getItems(
userId = userId,
parentId = parentId,
recursive = true,
includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
sortBy = listOf(ItemSortBy.DATE_CREATED),
sortOrder = listOf(org.jellyfin.sdk.model.api.SortOrder.DESCENDING),
limit = limit,
).content
r.items to r.totalRecordCount
}
/** Image of exactly the displayed size (px), so the TV only decodes. */
fun imageUrl(id: UUID, type: ImageType, tag: String, widthPx: Int, heightPx: Int): String =
api.imageApi.getItemImageUrl(id, type, fillWidth = widthPx, fillHeight = heightPx, quality = 90, tag = tag)
suspend fun item(id: UUID): BaseItemDto = session.call { libraryApi.getItem(id, userId).content }
fun posterUrl(item: BaseItemDto): String? {
val tag = item.imageTags?.get(ImageType.PRIMARY) ?: return null
return api.imageApi.getItemImageUrl(item.id, ImageType.PRIMARY, maxHeight = 360, tag = tag)

12
app/src/main/kotlin/ru/stenfredd/movies/ui/Screen.kt
View File

@@ -11,14 +11,17 @@ sealed interface Screen {
/**
* Root screens with the side rail. [account] keeps each account's screens (and their view models) apart:
* after a profile switch the stack is rebuilt, and an equal entry would be kept with the old account's state.
* [library]: the library tab opened on a library from the rail; a new entry, so the tab starts over on it.
*/
data class Root(val tab: ru.stenfredd.movies.ui.shell.Tab, val account: String) : Screen
data class Root(val tab: ru.stenfredd.movies.ui.shell.Tab, val account: String, val library: UUID? = null) : Screen
/** Old prototype home (libraries, text search, logout, debug tour) while the real screens are being built. */
data object Prototype : Screen
/** Collections and folders: the prototype's plain grid until they get a real screen. */
data class Items(val parentId: UUID, val title: String) : Screen
data class Detail(val itemId: UUID) : Screen
/** A person: photo, name and their movies and series. */
data class Person(val personId: UUID) : Screen
/** Series page; [episodeId] = the episode to show first (a new episode, continue watching), else the next one to watch. */
data class Series(val seriesId: UUID, val episodeId: UUID? = null) : Screen
data class Player(
@@ -31,6 +34,9 @@ sealed interface Screen {
val startFraction: Double? = null,
) : Screen
/** Text of a licence from "О приложении" in the settings; [asset] is a file in `assets/licenses`. */
data class License(val name: String, val license: String, val asset: String) : Screen
/** Debug tour: plays a prepared list of files covering every format on the server, see [TourScreen]. */
data class Tour(val startIndex: Int = 0) : Screen
}

5
app/src/main/kotlin/ru/stenfredd/movies/ui/components/Buttons.kt
View File

@@ -95,9 +95,9 @@ fun CircleButton(icon: AppIcon, onClick: () -> Unit, modifier: Modifier = Modifi
}
}
/** Option chip: "Русский TrueHD Atmos 7.1"; selected = violet, focused = light fill. */
/** Option chip: "Русский TrueHD Atmos 7.1" (or "● Жёлтый" with a [swatch]); selected = violet, focused = light fill. */
@Composable
fun Chip(label: String, selected: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier, detail: String? = null) {
fun Chip(label: String, selected: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier, detail: String? = null, swatch: Color? = null) {
var focused by remember { mutableStateOf(false) }
val shape = RoundedCornerShape(14.5.dp)
val textColor = when {
@@ -124,6 +124,7 @@ fun Chip(label: String, selected: Boolean, onClick: () -> Unit, modifier: Modifi
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(5.dp),
) {
swatch?.let { Box(Modifier.size(9.dp).background(it, CircleShape).border(0.5.dp, Color(0x4D000000), CircleShape)) }
BasicText(label, Modifier.widthIn(max = 190.dp), style = AppType.Button.copy(fontSize = 11.sp, fontWeight = FontWeight.Normal, color = textColor), maxLines = 1, overflow = TextOverflow.Ellipsis)
detail?.let { BasicText(it, style = AppType.MonoCaption.copy(fontSize = 8.5.sp, color = textColor.copy(alpha = 0.65f)), maxLines = 1) }
}

22
app/src/main/kotlin/ru/stenfredd/movies/ui/components/Cards.kt
View File

@@ -45,6 +45,8 @@ data class PosterModel(
val progress: Float? = null,
val isNew: Boolean = false,
val watched: Boolean = false,
/** Heart in the corner (favourites); shown instead of the watched mark. */
val favorite: Boolean = false,
)
/** Episode still or backdrop with a title over it: "Continue watching" cards. */
@@ -75,7 +77,11 @@ fun PosterCard(model: PosterModel, onClick: () -> Unit, modifier: Modifier = Mod
) {
RemoteImage(model.image, PosterCorner, Modifier.fillMaxSize())
if (model.isNew) NewBadge(Modifier.align(Alignment.TopStart).padding(6.dp))
if (model.watched) WatchedBadge(Modifier.align(Alignment.TopEnd).padding(6.dp))
if (model.favorite) {
FavoriteBadge(Modifier.align(Alignment.TopEnd).padding(6.dp))
} else if (model.watched) {
WatchedBadge(Modifier.align(Alignment.TopEnd).padding(6.dp))
}
// The mockup's bottom shade under the badge costs a card-sized blend; a small dark plate does the same job.
model.badge?.let {
BasicText(
@@ -241,3 +247,17 @@ fun WatchedBadge(modifier: Modifier = Modifier) {
CheckIcon(Modifier.size(9.dp), AppColors.Green)
}
}
/** Pink heart in a dark circle (`rgba(10,11,16,.6)`, pink border): favourites. */
@Composable
fun FavoriteBadge(modifier: Modifier = Modifier) {
Box(
modifier
.size(19.dp)
.background(Color(0x990A0B10), CircleShape)
.border(0.5.dp, AppColors.Pink.copy(alpha = 0.6f), CircleShape),
contentAlignment = Alignment.Center,
) {
Icon(AppIcon.HeartFilled, AppColors.Pink, Modifier.size(10.dp))
}
}

27
app/src/main/kotlin/ru/stenfredd/movies/ui/components/Grid.kt Normal file
View File

@@ -0,0 +1,27 @@
package ru.stenfredd.movies.ui.components
import androidx.compose.foundation.lazy.grid.GridItemSpan
import androidx.compose.foundation.lazy.grid.LazyGridScope
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.layout
import androidx.compose.ui.unit.Dp
/*
* Screens built as one lazy grid of posters (library, favourites, search results, a person's films): headers and
* rows of cards are full-width items of the grid, posters are its cells, so only what is on screen is composed.
*/
/** A full-width item of the grid (header, row of cards). */
fun LazyGridScope.fullItem(key: String, type: String, content: @Composable () -> Unit) =
item(key = key, span = { GridItemSpan(maxLineSpan) }, contentType = type) { content() }
/**
* Lays a full-width item out [width] wide starting [side] to the left of the grid's content, i.e. outside the grid's
* side padding: rows of cards then scroll from the screen edge to edge, as on home.
*/
fun Modifier.bleed(width: Dp, side: Dp) = layout { measurable, constraints ->
val w = width.roundToPx()
val placeable = measurable.measure(constraints.copy(minWidth = w, maxWidth = w))
layout(constraints.maxWidth, placeable.height) { placeable.place(-side.roundToPx(), 0) }
}

5
app/src/main/kotlin/ru/stenfredd/movies/ui/components/Icons.kt
View File

@@ -41,6 +41,11 @@ enum class AppIcon(val pathData: String, val stroked: Boolean = true) {
Next("M5 5v14l10-7zM16 5h3v14h-3z", stroked = false),
ChevronDown("M6 9l6 6 6-6"),
ChevronRight("M9 6l6 6-6 6"),
Settings("M4 7h9M17 7h3M4 17h3M11 17h9M15 4.5v5M9 14.5v5"),
/** A movie library on the rail. */
Film("M5 4h14a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1zM8 4v16M16 4v16M4 9h4M4 15h4M16 9h4M16 15h4"),
/** A series library on the rail. */
Tv("M5 7h14a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V8a1 1 0 0 1 1-1zM8.5 3l3.5 4 3.5-4"),
;
internal val path: Path by lazy { PathParser().parsePathString(pathData).toPath() }

13
app/src/main/kotlin/ru/stenfredd/movies/ui/details/DetailsScreen.kt
View File

@@ -2,6 +2,7 @@ package ru.stenfredd.movies.ui.details
import android.graphics.RectF
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.border
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Arrangement
@@ -99,7 +100,7 @@ fun DetailsScreen(
.padding(bottom = 200.dp),
) {
Hero(item, state, focus, vm, onOpen, Modifier.anchoredRow(anchored))
if (item.cast.isNotEmpty()) Cast(item, focus, Modifier.anchoredRow(anchored))
if (item.cast.isNotEmpty()) Cast(item, focus, onOpen, Modifier.anchoredRow(anchored))
if (state.similar.isNotEmpty()) {
ContentRow("Похожие", null, Modifier.anchoredRow(anchored).padding(top = 6.dp)) {
items(state.similar, key = { it.key }, contentType = { "poster" }) { p ->
@@ -291,7 +292,7 @@ private fun OptionRow(title: String, color: Color, options: List<TrackOption>, s
}
@Composable
private fun Cast(item: DetailsModel, focus: ScreenFocus, modifier: Modifier) {
private fun Cast(item: DetailsModel, focus: ScreenFocus, onOpen: (Screen) -> Unit, modifier: Modifier) {
Column(modifier.padding(top = 10.dp)) {
SectionTitle(item.castTitle, null)
DefaultScrolling {
@@ -301,7 +302,7 @@ private fun Cast(item: DetailsModel, focus: ScreenFocus, modifier: Modifier) {
contentPadding = PaddingValues(horizontal = AppDimens.CONTENT_START.dp, vertical = 15.dp),
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
items(item.cast, key = { it.key }) { p -> CastChip(p, Modifier.remembered(focus, p.key)) }
items(item.cast, key = { it.key }) { p -> CastChip(p, { p.personId?.let { onOpen(Screen.Person(it)) } }, Modifier.remembered(focus, p.key)) }
}
}
}
@@ -309,9 +310,9 @@ private fun Cast(item: DetailsModel, focus: ScreenFocus, modifier: Modifier) {
private val CastFocus = FocusStyle(scale = 1.03f, corner = 27.5.dp, ring = 1.dp, glows = listOf(FocusStyle.Glow(17.dp, 0.dp, Color(0x737C5CFF))))
/** Actor pill: photo (or initials), name, role. Focusable for scrolling; opening a person comes with search (stage 8). */
/** Actor pill: photo (or initials), name, role; opens the person's page. */
@Composable
private fun CastChip(person: CastModel, modifier: Modifier) {
private fun CastChip(person: CastModel, onClick: () -> Unit, modifier: Modifier) {
var focused by remember { mutableStateOf(false) }
val shape = RoundedCornerShape(27.5.dp)
Row(
@@ -321,7 +322,7 @@ private fun CastChip(person: CastModel, modifier: Modifier) {
.background(if (focused) Color(0xFF1F2238) else AppColors.Surface, shape)
.border(0.5.dp, if (focused) AppColors.Accent else Color(0xFF262A3A), shape)
.onFocusChanged { focused = it.isFocused }
.focusable()
.clickable(interactionSource = null, indication = null, onClick = onClick)
.padding(start = 8.dp, end = 14.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(9.dp),

3
app/src/main/kotlin/ru/stenfredd/movies/ui/details/DetailsViewModel.kt
View File

@@ -41,7 +41,7 @@ import kotlin.math.roundToInt
data class TrackOption(val key: String, val index: Int?, val label: String, val detail: String?)
@Immutable
data class CastModel(val key: String, val name: String, val role: String?, val letters: String, val image: RemoteImageSpec?)
data class CastModel(val key: String, val name: String, val role: String?, val letters: String, val image: RemoteImageSpec?, val personId: UUID? = null)
/** Everything the movie (or episode) page shows, as display strings. */
@Immutable
@@ -243,6 +243,7 @@ class DetailsViewModel @AssistedInject constructor(
role = p.role,
letters = p.name.split(' ').filter { it.isNotBlank() }.take(2).joinToString("") { it.take(1).uppercase() },
image = p.image?.let { RemoteImageSpec(images.url(it, cards.px(DetailsLayout.AVATAR), cards.px(DetailsLayout.AVATAR)), it.blurHash) },
personId = p.id,
)
},
)

108
app/src/main/kotlin/ru/stenfredd/movies/ui/favorites/FavoritesScreen.kt Normal file
View File

@@ -0,0 +1,108 @@
package ru.stenfredd.movies.ui.favorites
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.focusRestorer
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.components.AnchoredScrolling
import ru.stenfredd.movies.ui.components.Chip
import ru.stenfredd.movies.ui.components.PosterCard
import ru.stenfredd.movies.ui.components.anchorViewport
import ru.stenfredd.movies.ui.components.anchoredRow
import ru.stenfredd.movies.ui.components.fullItem
import ru.stenfredd.movies.ui.focus.ForgetMissing
import ru.stenfredd.movies.ui.focus.Restore
import ru.stenfredd.movies.ui.focus.rememberScreenFocus
import ru.stenfredd.movies.ui.focus.remembered
import ru.stenfredd.movies.ui.theme.AppColors
import ru.stenfredd.movies.ui.theme.AppDimens
import ru.stenfredd.movies.ui.theme.AppType
/** Favourites tab (mockup screen «Избранное»): title with the count, library filter chips, grid of posters. */
@Composable
fun FavoritesScreen(onOpen: (Screen) -> Unit, vm: FavoritesViewModel = hiltViewModel()) {
val state by vm.state.collectAsStateWithLifecycle()
val focus = rememberScreenFocus()
val grid = rememberLazyGridState()
when {
state.loading -> Message("Загрузка…")
state.error != null -> Message("Не удалось загрузить: ${state.error}")
else -> AnchoredScrolling(grid, anchor = AppDimens.CONTENT_TOP.dp) { anchored ->
LazyVerticalGrid(
columns = GridCells.FixedSize(AppDimens.POSTER_W.dp),
state = grid,
modifier = Modifier.fillMaxSize().anchorViewport(anchored),
contentPadding = PaddingValues(start = Side, end = Side, top = AppDimens.CONTENT_TOP.dp, bottom = 200.dp),
horizontalArrangement = Arrangement.spacedBy(GridGap),
) {
fullItem("header", "header") {
Column(Modifier.anchoredRow(anchored).padding(bottom = 18.dp)) {
Row(verticalAlignment = Alignment.Bottom, horizontalArrangement = Arrangement.spacedBy(9.dp)) {
BasicText("Избранное", style = AppType.Display.copy(fontSize = 28.sp))
BasicText(state.total, Modifier.padding(bottom = 4.dp), style = AppType.MonoCount.copy(fontSize = 11.sp, color = AppColors.TextDim))
}
Row(Modifier.padding(top = 15.dp).focusRestorer(), horizontalArrangement = Arrangement.spacedBy(5.dp)) {
for (f in state.filters) {
Chip(
f.label,
f.libraryId == state.selected,
{ vm.select(f.libraryId) },
Modifier.remembered(focus, f.key, isDefault = f.key == FavoritesViewModel.ALL_KEY),
detail = f.count.toString(),
)
}
}
}
}
if (state.items.isEmpty()) {
fullItem("empty", "text") {
BasicText(
"Здесь появятся фильмы и сериалы, отмеченные сердечком на их странице.",
Modifier.padding(top = 12.dp).widthIn(max = 550.dp),
style = AppType.Body.copy(fontSize = 14.sp, lineHeight = 20.sp),
)
}
}
items(state.items, key = { it.key }, contentType = { "poster" }) { p ->
PosterCard(
p,
{ vm.target(p.key)?.let(onOpen) },
Modifier.padding(bottom = RowGap).anchoredRow(anchored).remembered(focus, p.key),
)
}
}
}
}
val ready = !state.loading && state.error == null
if (ready) focus.ForgetMissing(state.filters.mapTo(HashSet()) { it.key } + state.items.map { it.key })
focus.Restore(ready = ready)
}
@Composable
private fun Message(text: String) {
Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { BasicText(text, style = AppType.Body) }
}
private val Side = AppDimens.CONTENT_START.dp
private val GridGap = 14.dp
private val RowGap = 18.dp

119
app/src/main/kotlin/ru/stenfredd/movies/ui/favorites/FavoritesViewModel.kt Normal file
View File

@@ -0,0 +1,119 @@
package ru.stenfredd.movies.ui.favorites
import androidx.compose.runtime.Immutable
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.stenfredd.movies.core.data.LibraryRepository
import ru.stenfredd.movies.core.data.SessionCache
import ru.stenfredd.movies.core.data.WatchRepository
import ru.stenfredd.movies.core.data.model.ItemSummary
import ru.stenfredd.movies.core.data.model.LibraryView
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.components.PosterModel
import ru.stenfredd.movies.ui.model.CardMapper
import ru.stenfredd.movies.ui.model.plural
import timber.log.Timber
import java.util.UUID
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
/** "Фильмы 3": a library with favourites, or everything ([libraryId] null). */
@Immutable
data class FavoriteFilter(val key: String, val libraryId: UUID?, val label: String, val count: Int)
@Immutable
data class FavoritesState(
val loading: Boolean = true,
val error: String? = null,
/** "7 тайтлов". */
val total: String = "",
val filters: List<FavoriteFilter> = emptyList(),
val selected: UUID? = null,
val items: List<PosterModel> = emptyList(),
)
/**
* Favourites tab: favourite movies and series of every library, filtered by library (the mockup's Всё / Фильмы /
* Сериалы / Аниме are this server's libraries). Fetched per library with its own item type (fast on the server),
* reloaded when watch state or favourites change.
*/
@HiltViewModel
class FavoritesViewModel @Inject constructor(
private val library: LibraryRepository,
private val watch: WatchRepository,
private val cache: SessionCache,
private val cards: CardMapper,
) : ViewModel() {
private val _state = MutableStateFlow(FavoritesState())
val state: StateFlow<FavoritesState> = _state.asStateFlow()
private var byLibrary: List<Pair<LibraryView, List<ItemSummary>>> = emptyList()
private val targets = ConcurrentHashMap<String, Screen>()
init {
viewModelScope.launch { load() }
viewModelScope.launch { cache.invalidations.collect { load() } }
}
fun target(key: String): Screen? = targets[key]
fun select(libraryId: UUID?) {
if (libraryId == _state.value.selected) return
viewModelScope.launch { publish(libraryId) }
}
private suspend fun load() {
try {
byLibrary = coroutineScope {
library.views().map { view -> async { view to watch.favorites(view) } }.awaitAll()
}
publish(_state.value.selected)
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
Timber.w(e, "Favourites failed")
if (_state.value.loading) _state.value = FavoritesState(loading = false, error = e.message ?: e.toString())
}
}
private suspend fun publish(selected: UUID?) {
val withItems = byLibrary.filter { it.second.isNotEmpty() }
// A library whose last favourite was removed has no chip any more: back to everything.
val filter = selected?.takeIf { id -> withItems.any { it.first.id == id } }
val total = withItems.sumOf { it.second.size }
val shown = withItems.filter { filter == null || it.first.id == filter }.flatMap { it.second }.sortedBy { it.name.lowercase() }
val items = withContext(Dispatchers.Default) {
shown.map { item ->
targets[cards.key(ROW, item)] = cards.target(item)
cards.kindPoster(item, ROW).copy(favorite = true)
}
}
_state.update {
FavoritesState(
loading = false,
total = "$total ${plural(total, "тайтл", "тайтла", "тайтлов")}",
filters = listOf(FavoriteFilter(ALL_KEY, null, "Всё", total)) +
withItems.map { (view, list) -> FavoriteFilter("fav/${view.id}", view.id, view.name, list.size) },
selected = filter,
items = items,
)
}
}
companion object {
const val ALL_KEY = "fav/all"
private const val ROW = "fav"
}
}

12
app/src/main/kotlin/ru/stenfredd/movies/ui/focus/ScreenFocus.kt
View File

@@ -2,6 +2,7 @@ package ru.stenfredd.movies.ui.focus
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.Stable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -61,7 +62,18 @@ fun Modifier.remembered(focus: ScreenFocus, key: String, isDefault: Boolean = fa
fun ScreenFocus.Restore(ready: Boolean) {
LaunchedEffect(ready) {
if (!ready) return@LaunchedEffect
// Two frames: the content may still recompose once (see [ForgetMissing]) before the requester is in place.
withFrameNanos { }
withFrameNanos { }
runCatching { requester.requestFocus() }
}
}
/**
* Forgets the remembered element when it is no longer among [keys] (an item left the list while the screen was in
* the back stack, e.g. removed from favourites), so the default element gets focus instead of none.
*/
@Composable
fun ScreenFocus.ForgetMissing(keys: Set<String>) {
SideEffect { if (lastKey != null && lastKey !in keys) lastKey = null }
}

27
app/src/main/kotlin/ru/stenfredd/movies/ui/library/LibraryScreen.kt
View File

@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.GridItemSpan
import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
@@ -36,7 +35,6 @@ import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.focus.focusRestorer
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.layout
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.style.TextOverflow
@@ -59,6 +57,8 @@ import ru.stenfredd.movies.ui.components.PosterCard
import ru.stenfredd.movies.ui.components.WideCard
import ru.stenfredd.movies.ui.components.anchorViewport
import ru.stenfredd.movies.ui.components.anchoredRow
import ru.stenfredd.movies.ui.components.bleed
import ru.stenfredd.movies.ui.components.fullItem
import ru.stenfredd.movies.ui.components.focusCard
import ru.stenfredd.movies.ui.focus.Restore
import ru.stenfredd.movies.ui.focus.ScreenFocus
@@ -109,7 +109,7 @@ private fun Library(state: LibraryState, vm: LibraryViewModel, focus: ScreenFocu
horizontalArrangement = Arrangement.spacedBy(LibraryLayout.GRID_GAP.dp),
) {
fullItem("tiles", "tiles") {
Tiles(state, vm, focus, Modifier.bleed(fullWidth).anchoredRow(anchored))
Tiles(state, vm, focus, Modifier.bleed(fullWidth, Side).anchoredRow(anchored))
}
if (content == null) {
state.contentError?.let { error -> fullItem("error", "text") { Note("Не удалось загрузить: $error") } }
@@ -152,7 +152,7 @@ private fun androidx.compose.foundation.lazy.grid.LazyGridScope.rows(
val id = content.libraryId
if (content.continueItems.isNotEmpty()) {
fullItem("$id/cont", "wide-row") {
ContentRow("Продолжить просмотр", content.continueItems.size, Modifier.bleed(fullWidth).padding(top = RowGap).anchoredRow(anchored)) {
ContentRow("Продолжить просмотр", content.continueItems.size, Modifier.bleed(fullWidth, Side).padding(top = RowGap).anchoredRow(anchored)) {
items(content.continueItems, key = { it.key }, contentType = { "wide" }) { w ->
WideCard(w, { open(w.key) }, Modifier.remembered(focus, w.key))
}
@@ -162,7 +162,7 @@ private fun androidx.compose.foundation.lazy.grid.LazyGridScope.rows(
for ((name, title, posters) in listOf(Triple("new", "Недавно добавлено", content.latest), Triple("hist", "История просмотра", content.history))) {
if (posters.isEmpty()) continue
fullItem("$id/$name", "poster-row") {
ContentRow(title, posters.size, Modifier.bleed(fullWidth).padding(top = RowGap).anchoredRow(anchored)) {
ContentRow(title, posters.size, Modifier.bleed(fullWidth, Side).padding(top = RowGap).anchoredRow(anchored)) {
items(posters, key = { it.key }, contentType = { "poster" }) { p ->
PosterCard(p, { open(p.key) }, Modifier.remembered(focus, p.key))
}
@@ -171,9 +171,6 @@ private fun androidx.compose.foundation.lazy.grid.LazyGridScope.rows(
}
}
private fun androidx.compose.foundation.lazy.grid.LazyGridScope.fullItem(key: String, type: String, content: @Composable () -> Unit) =
item(key = key, span = { GridItemSpan(maxLineSpan) }, contentType = type) { content() }
/** Library tiles; focusing one selects it, OK moves down into its content. */
@Composable
private fun Tiles(state: LibraryState, vm: LibraryViewModel, focus: ScreenFocus, modifier: Modifier = Modifier) {
@@ -181,7 +178,9 @@ private fun Tiles(state: LibraryState, vm: LibraryViewModel, focus: ScreenFocus,
DefaultScrolling {
LazyRow(
modifier.focusRestorer(),
state = rememberLazyListState(),
// The selected tile in view from the start (it can be far right when opened from the rail): only composed
// tiles can take the first focus, and focusing another one would switch the library.
state = rememberLazyListState((state.tiles.indexOfFirst { it.id == state.selected } - 2).coerceAtLeast(0)),
contentPadding = PaddingValues(horizontal = AppDimens.CONTENT_START.dp, vertical = 8.dp),
horizontalArrangement = Arrangement.spacedBy(AppDimens.ROW_GAP.dp),
) {
@@ -268,16 +267,6 @@ private fun LoadMore(grid: LazyGridState, vm: LibraryViewModel) {
}
}
/**
* A full-width item of the grid laid out [width] wide from the screen's content edge, not inside the grid's side
* padding: rows of cards scroll from edge to edge, as on home.
*/
private fun Modifier.bleed(width: Dp) = layout { measurable, constraints ->
val w = width.roundToPx()
val placeable = measurable.measure(constraints.copy(minWidth = w, maxWidth = w))
layout(constraints.maxWidth, placeable.height) { placeable.place(-Side.roundToPx(), 0) }
}
@Composable
private fun Note(text: String) {
BasicText(text, Modifier.padding(top = 8.dp), style = AppType.Body)

12
app/src/main/kotlin/ru/stenfredd/movies/ui/model/CardMapper.kt
View File

@@ -48,6 +48,18 @@ class CardMapper @Inject constructor(
)
}
/** Poster captioned "Фильм · 2021" / "Сериал · 2020": lists that mix movies and series. */
fun kindPoster(item: ItemSummary, row: String): PosterModel = poster(item, row).copy(
caption = listOfNotNull(
when (item.kind) {
ItemKind.Movie -> "Фильм"
ItemKind.Series -> "Сериал"
else -> null
},
item.year?.toString(),
).joinToString(" · ").ifEmpty { null },
)
fun wide(item: ItemSummary, row: String): WideModel = WideModel(
key = key(row, item),
title = item.seriesName ?: item.name,

95
app/src/main/kotlin/ru/stenfredd/movies/ui/person/PersonScreen.kt Normal file
View File

@@ -0,0 +1,95 @@
package ru.stenfredd.movies.ui.person
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.components.AnchoredScrolling
import ru.stenfredd.movies.ui.components.Avatar
import ru.stenfredd.movies.ui.components.PosterCard
import ru.stenfredd.movies.ui.components.RemoteImage
import ru.stenfredd.movies.ui.components.anchorViewport
import ru.stenfredd.movies.ui.components.anchoredRow
import ru.stenfredd.movies.ui.components.fullItem
import ru.stenfredd.movies.ui.focus.Restore
import ru.stenfredd.movies.ui.focus.rememberScreenFocus
import ru.stenfredd.movies.ui.focus.remembered
import ru.stenfredd.movies.ui.theme.AppColors
import ru.stenfredd.movies.ui.theme.AppDimens
import ru.stenfredd.movies.ui.theme.AppType
/**
* A person (not in the mockup, built in its style like the favourites screen): photo, name, "12 фильмов · 3 сериала",
* a grid of their movies and series. Full screen without the rail, like the movie page.
*/
@Composable
fun PersonScreen(
screen: Screen.Person,
onOpen: (Screen) -> Unit,
vm: PersonViewModel = hiltViewModel<PersonViewModel, PersonViewModel.Factory>(creationCallback = { it.create(screen.personId) }),
) {
val state by vm.state.collectAsStateWithLifecycle()
val focus = rememberScreenFocus()
val grid = rememberLazyGridState()
when {
state.loading -> Box(Modifier.fillMaxSize())
state.error != null -> Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
BasicText("Не удалось загрузить: ${state.error}", style = AppType.Body)
}
else -> AnchoredScrolling(grid, anchor = AppDimens.CONTENT_TOP.dp) { anchored ->
LazyVerticalGrid(
columns = GridCells.FixedSize(AppDimens.POSTER_W.dp),
state = grid,
modifier = Modifier.fillMaxSize().anchorViewport(anchored),
contentPadding = PaddingValues(start = Side, end = Side, top = AppDimens.CONTENT_TOP.dp, bottom = 200.dp),
horizontalArrangement = Arrangement.spacedBy(14.dp),
) {
fullItem("header", "header") {
Row(Modifier.padding(bottom = 22.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(16.dp)) {
val size = PersonLayout.PHOTO.dp
if (state.photo != null) {
RemoteImage(state.photo, size / 2, Modifier.size(size))
} else {
Avatar(state.name, state.name, size, AppType.Hero.copy(fontSize = 22.sp), letters = state.letters)
}
Column {
BasicText("ЧЕЛОВЕК", style = AppType.MonoLabel)
BasicText(state.name, Modifier.padding(top = 4.dp), style = AppType.Display.copy(fontSize = 28.sp), maxLines = 1, overflow = TextOverflow.Ellipsis)
BasicText(state.summary, Modifier.padding(top = 4.dp), style = AppType.MonoMeta.copy(fontSize = 11.sp, color = AppColors.TextMuted))
}
}
}
items(state.items, key = { it.key }, contentType = { "poster" }) { p ->
PosterCard(
p,
{ vm.target(p.key)?.let(onOpen) },
Modifier.padding(bottom = 18.dp).anchoredRow(anchored).remembered(focus, p.key, isDefault = p === state.items.first()),
)
}
}
}
}
focus.Restore(ready = !state.loading && state.error == null)
}
private val Side = AppDimens.CONTENT_START.dp

113
app/src/main/kotlin/ru/stenfredd/movies/ui/person/PersonViewModel.kt Normal file
View File

@@ -0,0 +1,113 @@
package ru.stenfredd.movies.ui.person
import androidx.compose.runtime.Immutable
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.stenfredd.movies.core.data.LibraryRepository
import ru.stenfredd.movies.core.data.SessionCache
import ru.stenfredd.movies.core.data.model.ItemKind
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.components.PosterModel
import ru.stenfredd.movies.ui.components.RemoteImageSpec
import ru.stenfredd.movies.ui.model.CardMapper
import ru.stenfredd.movies.ui.model.plural
import timber.log.Timber
import java.util.UUID
import java.util.concurrent.ConcurrentHashMap
@Immutable
data class PersonState(
val loading: Boolean = true,
val error: String? = null,
val name: String = "",
/** Initials when there is no photo. */
val letters: String = "",
val photo: RemoteImageSpec? = null,
/** "12 фильмов · 3 сериала". */
val summary: String = "",
val items: List<PosterModel> = emptyList(),
)
/** A person's page: who it is and the movies and series of the server they are in, newest first. */
@HiltViewModel(assistedFactory = PersonViewModel.Factory::class)
class PersonViewModel @AssistedInject constructor(
@Assisted private val personId: UUID,
private val library: LibraryRepository,
private val cards: CardMapper,
cache: SessionCache,
) : ViewModel() {
@AssistedFactory
interface Factory {
fun create(personId: UUID): PersonViewModel
}
private val _state = MutableStateFlow(PersonState())
val state: StateFlow<PersonState> = _state.asStateFlow()
private val targets = ConcurrentHashMap<String, Screen>()
init {
viewModelScope.launch { load() }
viewModelScope.launch { cache.invalidations.collect { load() } }
}
fun target(key: String): Screen? = targets[key]
private suspend fun load() {
try {
coroutineScope {
val person = async { library.person(personId) }
// A guest role in an episode stands for its series, once, unless the series itself is in the list.
val all = library.filmography(personId)
val seriesIds = all.filter { it.kind == ItemKind.Series }.mapTo(HashSet()) { it.id }
val items = all.filter { it.kind != ItemKind.Episode || (it.seriesId != null && it.seriesId !in seriesIds) }
.distinctBy { if (it.kind == ItemKind.Episode) it.seriesId else it.id }
val p = person.await()
val posters = withContext(Dispatchers.Default) {
items.map { item ->
targets[cards.key(ROW, item)] = cards.target(item)
if (item.kind == ItemKind.Episode) cards.poster(item, ROW) else cards.kindPoster(item, ROW)
}
}
val movies = items.count { it.kind == ItemKind.Movie }
val series = items.size - movies
_state.value = PersonState(
loading = false,
name = p.name,
letters = p.name.split(' ').filter { it.isNotBlank() }.take(2).joinToString("") { it.take(1).uppercase() },
photo = cards.image(p.image, PersonLayout.PHOTO, PersonLayout.PHOTO),
summary = listOfNotNull(
movies.takeIf { it > 0 }?.let { "$it ${plural(it, "фильм", "фильма", "фильмов")}" },
series.takeIf { it > 0 }?.let { "$it ${plural(it, "сериал", "сериала", "сериалов")}" },
).joinToString(" · ").ifEmpty { "На сервере нет фильмов с этим человеком" },
items = posters,
)
}
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
Timber.w(e, "Person failed")
if (_state.value.loading) _state.value = PersonState(loading = false, error = e.message ?: e.toString())
}
}
private companion object {
const val ROW = "person"
}
}
internal object PersonLayout {
const val PHOTO = 64f
}

8
app/src/main/kotlin/ru/stenfredd/movies/ui/player/PlayerScreen.kt
View File

@@ -28,6 +28,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.runtime.withFrameNanos
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusProperties
import androidx.compose.ui.focus.focusRequester
@@ -38,6 +39,7 @@ import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.nativeKeyCode
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.input.key.type
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@@ -170,6 +172,7 @@ private fun PlayerUi(
val season by vm.season.collectAsStateWithLifecycle()
val style by vm.subtitleStyle.collectAsStateWithLifecycle()
val ui = remember { PlayerUiState() }
val focusManager = LocalFocusManager.current
val media = remember(state.source) { state.source?.toMediaInfo() }
val tracks = remember(media) { PlayerTracks.of(media) }
val playing = state.engineState.playWhenReady
@@ -269,6 +272,11 @@ private fun PlayerUi(
AndroidKeyEvent.KEYCODE_MEDIA_REWIND -> scrub(-1, repeat).also { if (!ui.osd) showOsd(ui.timeline) }
AndroidKeyEvent.KEYCODE_MEDIA_NEXT -> season?.next?.let(vm::playEpisode)
AndroidKeyEvent.KEYCODE_MEDIA_PREVIOUS -> season?.previous?.let(vm::playEpisode)
// ↑ from the topmost control (the timeline) hides the controls; a held key stops there instead of showing them again.
AndroidKeyEvent.KEYCODE_DPAD_UP if ui.osd && !ui.drawer && ui.panel == null && !ui.debugMenu && state.error == null -> {
if (!focusManager.moveFocus(FocusDirection.Up) && repeat == 0) hideOsd()
}
AndroidKeyEvent.KEYCODE_DPAD_UP if !ui.osd && repeat > 0 && tour == null && next == null -> Unit
else -> return onNavigationKey(code, repeat, ui, session, tour, ::scrub, ::showOsd, ::openDrawer, promptShown = next != null)
}
return true

16
app/src/main/kotlin/ru/stenfredd/movies/ui/player/PlayerViewModel.kt
View File

@@ -126,8 +126,9 @@ class PlayerViewModel @javax.inject.Inject constructor(
private var startedFor: Screen.Player? = null
private var infoJob: Job? = null
/** Quality chosen in the player: kept for the next episode. */
/** Quality chosen in the player: kept for the next episode. Until then the default from the settings applies. */
private var maxBitrate: Int? = null
private var qualityChosen = false
/** Every episode of the series being played, in order. */
private var allEpisodes: List<ItemSummary> = emptyList()
@@ -148,7 +149,7 @@ class PlayerViewModel @javax.inject.Inject constructor(
private fun play(itemId: UUID, engine: EngineId?, startMs: Long, streams: StreamSelection?, startFraction: Double?) {
val old = _session.value
val session = factory.create(viewModelScope)
session.setMaxBitrate(maxBitrate)
if (qualityChosen) session.setMaxBitrate(maxBitrate)
_session.value = session
old?.release()
session.start(itemId, engine, startMs, streams, startFraction)
@@ -157,6 +158,7 @@ class PlayerViewModel @javax.inject.Inject constructor(
fun setQuality(bitrate: Int?) {
maxBitrate = bitrate
qualityChosen = true
_session.value?.setMaxBitrate(bitrate)
}
@@ -276,7 +278,7 @@ class PlayerViewModel @javax.inject.Inject constructor(
/** "Оригинал" and the transcode caps below the file's own bitrate, labelled with the resulting resolution. */
private fun qualities(fileBitrate: Int?, height: Int?): List<QualityOption> {
val original = QualityOption("q/original", null, "Оригинал", fileBitrate?.let { PlayerLabels.mbps(it) })
val caps = QUALITY_CAPS.filter { (bitrate, _) -> fileBitrate == null || bitrate < fileBitrate * 0.9 }
val caps = QualityCaps.ALL.filter { (bitrate, _) -> fileBitrate == null || bitrate < fileBitrate * 0.9 }
return listOf(original) + caps.map { (bitrate, lines) ->
val shown = if (height != null && height in 1 until lines) height else lines
QualityOption("q/$bitrate", bitrate, "${shown}p", PlayerLabels.mbps(bitrate))
@@ -287,11 +289,15 @@ class PlayerViewModel @javax.inject.Inject constructor(
const val CAST_LIMIT = 4
/** An episode watched further than this starts from the beginning when picked in the drawer. */
const val RESUME_LIMIT = 0.9f
/** Bitrate cap → resolution the server scales to at that bitrate (its own rule of thumb). */
val QUALITY_CAPS = listOf(20_000_000 to 1080, 10_000_000 to 1080, 4_000_000 to 720, 1_500_000 to 480)
}
}
/** Transcode caps offered by "Качество" (player and settings). */
internal object QualityCaps {
/** Bitrate cap → resolution the server scales to at that bitrate (its own rule of thumb). */
val ALL = listOf(20_000_000 to 1080, 10_000_000 to 1080, 4_000_000 to 720, 1_500_000 to 480)
}
/** Sizes (dp) shared by the layout and the image requests. */
internal object PlayerLayout {
const val EPISODE_W = 180f

318
app/src/main/kotlin/ru/stenfredd/movies/ui/search/SearchScreen.kt Normal file
View File

@@ -0,0 +1,318 @@
package ru.stenfredd.movies.ui.search
import android.view.KeyEvent as NativeKeyEvent
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.focusRestorer
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.coroutines.delay
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.components.AnchoredScrolling
import ru.stenfredd.movies.ui.components.AppIcon
import ru.stenfredd.movies.ui.components.Avatar
import ru.stenfredd.movies.ui.components.Chip
import ru.stenfredd.movies.ui.components.FocusStyle
import ru.stenfredd.movies.ui.components.Icon
import ru.stenfredd.movies.ui.components.PosterCard
import ru.stenfredd.movies.ui.components.RemoteImage
import ru.stenfredd.movies.ui.components.anchorViewport
import ru.stenfredd.movies.ui.components.anchoredRow
import ru.stenfredd.movies.ui.components.focusCard
import ru.stenfredd.movies.ui.components.fullItem
import ru.stenfredd.movies.ui.focus.Restore
import ru.stenfredd.movies.ui.focus.ScreenFocus
import ru.stenfredd.movies.ui.focus.rememberScreenFocus
import ru.stenfredd.movies.ui.focus.remembered
import ru.stenfredd.movies.ui.theme.AppColors
import ru.stenfredd.movies.ui.theme.AppDimens
import ru.stenfredd.movies.ui.theme.AppType
/**
* Search tab (mockup screen «Поиск»): on the left the query and an on-screen keyboard (Russian; one key switches
* to Latin letters and digits), on the right recent queries and newest items, or the results by library and people.
* Typing on a physical keyboard (or digits on the remote) works anywhere on the screen.
*/
@Composable
fun SearchScreen(onOpen: (Screen) -> Unit, vm: SearchViewModel = hiltViewModel()) {
val state by vm.state.collectAsStateWithLifecycle()
val focus = rememberScreenFocus()
val open = { key: String -> vm.open(key)?.let(onOpen) ?: Unit }
Box(
Modifier
.fillMaxSize()
.onPreviewKeyEvent { e ->
if (e.type != KeyEventType.KeyDown) return@onPreviewKeyEvent false
val native = e.nativeKeyEvent
if (native.keyCode == NativeKeyEvent.KEYCODE_DEL) {
vm.backspace()
return@onPreviewKeyEvent true
}
val c = native.unicodeChar
if (c != 0 && (Character.isLetterOrDigit(c) || c == ' '.code || c == '-'.code)) {
vm.type(String(Character.toChars(c)).lowercase())
true
} else {
false
}
},
) {
Column(Modifier.padding(start = AppDimens.CONTENT_START.dp, top = Top).width(SearchLayout.KEYBOARD_W.dp)) {
QueryField(state.query)
Keyboard(state.latin, vm, focus, Modifier.padding(top = 12.dp))
BasicText(
"Можно печатать и с клавиатуры, цифры — с пульта.",
Modifier.padding(top = 11.dp),
style = AppType.Body.copy(fontSize = 10.sp, lineHeight = 13.sp, color = Color(0xFF6F7592)),
)
}
Results(state, focus, vm, open, Modifier.padding(start = SearchLayout.RESULTS_START.dp))
}
focus.Restore(ready = true)
}
/** The query with a blinking caret (two redraws a second, a step, not an animation). */
@Composable
private fun QueryField(query: String) {
var caret by remember { mutableStateOf(true) }
LaunchedEffect(query) {
caret = true
while (true) {
delay(500)
caret = !caret
}
}
val shape = RoundedCornerShape(9.dp)
Row(
Modifier
.fillMaxWidth()
.height(48.dp)
.background(AppColors.Surface, shape)
.border(0.5.dp, Color(0xFF2C3044), shape)
.padding(horizontal = 13.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(AppIcon.Search, AppColors.Accent, Modifier.size(16.dp), strokeWidth = 2.2f)
Spacer(Modifier.width(7.dp))
if (query.isNotEmpty()) {
BasicText(
query.replaceFirstChar { it.uppercase() },
Modifier.weight(1f, fill = false),
style = AppType.Hero.copy(fontSize = 19.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.sp),
maxLines = 1,
overflow = TextOverflow.StartEllipsis,
)
}
Box(
Modifier
.padding(start = 2.dp)
.size(1.5.dp, 23.dp)
.graphicsLayer { alpha = if (caret) 1f else 0f }
.background(Color(0xFF7AA2FF)),
)
if (query.isEmpty()) {
BasicText("Название, жанр, актёр", Modifier.padding(start = 4.dp), style = AppType.Body.copy(fontSize = 15.sp, color = AppColors.TextFaint), maxLines = 1)
}
}
}
private const val RUSSIAN = "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ-.,"
private const val LATIN = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
/** 6 columns: 36 character keys, then ⌫, space, layout switch. */
@Composable
private fun Keyboard(latin: Boolean, vm: SearchViewModel, focus: ScreenFocus, modifier: Modifier = Modifier) {
val chars = if (latin) LATIN else RUSSIAN
Column(modifier.focusRestorer(), verticalArrangement = Arrangement.spacedBy(KeyGap)) {
chars.chunked(COLUMNS).forEachIndexed { row, line ->
Row(horizontalArrangement = Arrangement.spacedBy(KeyGap)) {
line.forEachIndexed { col, c ->
// Keys are remembered by position: after switching the layout focus stays where it was.
val key = "key/${row * COLUMNS + col}"
Key(c.toString(), { vm.type(c.lowercase()) }, Modifier.weight(1f).remembered(focus, key, isDefault = row == 0 && col == 0))
}
}
}
Row(horizontalArrangement = Arrangement.spacedBy(KeyGap)) {
Key("⌫", vm::backspace, Modifier.weight(1f).remembered(focus, "key/del"), onLongClick = vm::clear)
Key("Пробел", { vm.type(" ") }, Modifier.weight(3f).remembered(focus, "key/space"), small = true)
Key(if (latin) "АБВ" else "ABC·123", vm::toggleLayout, Modifier.weight(2f).remembered(focus, "key/layout"), small = true)
}
}
}
private val KeyFocus = FocusStyle(scale = 1.06f, corner = 6.dp, ring = 1.dp, glows = FocusStyle.ButtonGlows)
@Composable
private fun Key(label: String, onClick: () -> Unit, modifier: Modifier = Modifier, small: Boolean = false, onLongClick: (() -> Unit)? = null) {
var focused by remember { mutableStateOf(false) }
val shape = RoundedCornerShape(6.dp)
Box(
modifier
.focusCard(KeyFocus)
.height(38.dp)
.background(if (focused) AppColors.FocusFill else AppColors.SurfaceRaised, shape)
.border(0.5.dp, if (focused) AppColors.FocusFill else Color(0xFF232637), shape)
.onFocusChanged { focused = it.isFocused }
.combinedClickable(interactionSource = null, indication = null, onLongClick = onLongClick, onClick = onClick),
contentAlignment = Alignment.Center,
) {
BasicText(
label,
style = AppType.Button.copy(fontSize = if (small) 11.sp else 14.sp, color = if (focused) AppColors.OnFocusFill else Color(0xFFD9DCEC)),
maxLines = 1,
)
}
}
@Composable
private fun Results(state: SearchState, focus: ScreenFocus, vm: SearchViewModel, open: (String) -> Unit, modifier: Modifier = Modifier) {
val grid = rememberLazyGridState()
// A new query starts the results from the top.
LaunchedEffect(state.results) { if (grid.firstVisibleItemIndex > 0) grid.scrollToItem(0) }
AnchoredScrolling(grid, anchor = Top) { anchored ->
LazyVerticalGrid(
columns = GridCells.FixedSize(AppDimens.POSTER_W.dp),
state = grid,
modifier = modifier.fillMaxSize().anchorViewport(anchored),
contentPadding = PaddingValues(start = 12.dp, end = AppDimens.CONTENT_START.dp, top = Top, bottom = 200.dp),
horizontalArrangement = Arrangement.spacedBy(14.dp),
) {
val results = state.results
if (results == null) {
if (state.recentQueries.isNotEmpty()) {
fullItem("recent-q", "label") {
Column(Modifier.anchoredRow(anchored).padding(bottom = 22.dp)) {
Label("НЕДАВНИЕ ЗАПРОСЫ")
FlowRow(Modifier.padding(top = 9.dp), horizontalArrangement = Arrangement.spacedBy(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
state.recentQueries.forEachIndexed { i, q ->
Chip(q, false, { vm.pickRecent(q) }, Modifier.remembered(focus, "rq/$i"))
}
}
}
}
}
if (state.recentItems.isNotEmpty()) {
fullItem("recent-label", "label") { Label("НЕДАВНО ДОБАВЛЕНО", Modifier.padding(bottom = 13.dp)) }
posters(state.recentItems, focus, open, anchored)
}
return@LazyVerticalGrid
}
fullItem("found", "label") {
Label(if (state.searching) "ИЩЕМ…" else "НАЙДЕНО: ${results.sumOf { it.size }}", Modifier.anchoredRow(anchored))
}
if (results.isEmpty() && !state.searching) {
fullItem("none", "text") {
BasicText(
state.error?.let { "Не удалось найти: $it" } ?: "Ничего не нашлось по «${state.query.trim()}». Попробуйте часть названия или имя актёра.",
Modifier.padding(top = 12.dp).widthIn(max = 480.dp),
style = AppType.Body.copy(fontSize = 15.sp, lineHeight = 21.sp),
)
}
}
for (group in results) {
fullItem(group.key, "group") {
Row(Modifier.padding(top = 16.dp, bottom = 12.dp), verticalAlignment = Alignment.Bottom, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
BasicText(group.title, style = AppType.Section)
BasicText(group.size.toString(), Modifier.padding(bottom = 1.dp), style = AppType.MonoCount)
}
}
posters(group.posters, focus, open, anchored)
items(group.people, key = { it.key }, contentType = { "person" }) { p ->
PersonCard(p, { open(p.key) }, Modifier.padding(bottom = 18.dp).anchoredRow(anchored).remembered(focus, p.key))
}
}
}
}
}
private fun androidx.compose.foundation.lazy.grid.LazyGridScope.posters(
list: List<ru.stenfredd.movies.ui.components.PosterModel>,
focus: ScreenFocus,
open: (String) -> Unit,
anchored: ru.stenfredd.movies.ui.components.AnchoredScroll<*>,
) {
items(list, key = { it.key }, contentType = { "poster" }) { p ->
PosterCard(p, { open(p.key) }, Modifier.padding(bottom = 18.dp).anchoredRow(anchored).remembered(focus, p.key))
}
}
private val PersonFocus = FocusStyle(scale = 1.05f, corner = (SearchLayout.PERSON_PHOTO / 2).dp, ring = 1.dp)
/** Round photo (or initials) and the name under it. */
@Composable
private fun PersonCard(person: PersonCardModel, onClick: () -> Unit, modifier: Modifier = Modifier) {
val size = SearchLayout.PERSON_PHOTO.dp
Column(modifier.width(AppDimens.POSTER_W.dp), horizontalAlignment = Alignment.CenterHorizontally) {
Box(
Modifier
.focusCard(PersonFocus)
.size(size)
.clickable(interactionSource = null, indication = null, onClick = onClick),
) {
if (person.photo != null) {
RemoteImage(person.photo, size / 2, Modifier.fillMaxSize())
} else {
Avatar(person.name, person.key, size, AppType.Hero.copy(fontSize = 24.sp), letters = person.letters)
}
}
BasicText(
person.name,
Modifier.padding(top = 8.dp),
style = AppType.PosterTitle.copy(textAlign = TextAlign.Center),
maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
}
}
@Composable
private fun Label(text: String, modifier: Modifier = Modifier) {
BasicText(text, modifier, style = AppType.MonoLabel.copy(color = AppColors.TextDim))
}
private val Top = (AppDimens.CONTENT_TOP + 10).dp
private val KeyGap = 5.dp
private const val COLUMNS = 6

172
app/src/main/kotlin/ru/stenfredd/movies/ui/search/SearchViewModel.kt Normal file
View File

@@ -0,0 +1,172 @@
package ru.stenfredd.movies.ui.search
import androidx.compose.runtime.Immutable
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.stenfredd.movies.core.data.LibraryRepository
import ru.stenfredd.movies.core.data.SearchHistory
import ru.stenfredd.movies.core.data.model.Person
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.components.PosterModel
import ru.stenfredd.movies.ui.components.RemoteImageSpec
import ru.stenfredd.movies.ui.model.CardMapper
import timber.log.Timber
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
@Immutable
data class PersonCardModel(val key: String, val name: String, val letters: String, val photo: RemoteImageSpec?)
/** Results of one library ("Фильмы 3"), or people. */
@Immutable
data class SearchGroup(val key: String, val title: String, val posters: List<PosterModel>, val people: List<PersonCardModel>) {
val size: Int get() = posters.size + people.size
}
@Immutable
data class SearchState(
val query: String = "",
val latin: Boolean = false,
val recentQueries: List<String> = emptyList(),
val recentItems: List<PosterModel> = emptyList(),
/** Null while the query is empty: the screen shows recent queries and items instead. */
val results: List<SearchGroup>? = null,
val searching: Boolean = false,
val error: String? = null,
)
/**
* Search tab: the query typed on the on-screen keyboard (or a physical one), results grouped by library plus people,
* searched as the user types (after a short pause). Recent queries are kept on the device ([SearchHistory]):
* a query is remembered when one of its results is opened.
*/
@HiltViewModel
class SearchViewModel @Inject constructor(
private val library: LibraryRepository,
private val history: SearchHistory,
private val cards: CardMapper,
) : ViewModel() {
private val _state = MutableStateFlow(SearchState())
val state: StateFlow<SearchState> = _state.asStateFlow()
private val targets = ConcurrentHashMap<String, Screen>()
private var searchJob: Job? = null
init {
viewModelScope.launch { history.recent().collect { list -> _state.update { it.copy(recentQueries = list) } } }
viewModelScope.launch {
runCatching { library.latest().take(RECENT_ITEMS) }
.onSuccess { items ->
val posters = withContext(Dispatchers.Default) {
items.map { item ->
targets[cards.key(RECENT_ROW, item)] = cards.target(item)
cards.poster(item, RECENT_ROW)
}
}
_state.update { it.copy(recentItems = posters) }
}
.onFailure { Timber.w(it, "Recent items failed") }
}
}
/** Where a card leads; opening a search result remembers the query. */
fun open(key: String): Screen? {
val query = _state.value.query
if (_state.value.results != null && !key.startsWith(RECENT_ROW)) viewModelScope.launch { history.add(query) }
return targets[key]
}
fun type(text: String) = setQuery(_state.value.query + text)
fun backspace() = setQuery(_state.value.query.dropLast(1))
fun clear() = setQuery("")
fun pickRecent(query: String) = setQuery(query)
fun toggleLayout() = _state.update { it.copy(latin = !it.latin) }
private fun setQuery(query: String) {
val q = query.take(MAX_LENGTH)
if (q == _state.value.query) return
searchJob?.cancel()
if (q.isBlank()) {
_state.update { it.copy(query = q, results = null, searching = false, error = null) }
return
}
_state.update { it.copy(query = q, searching = true) }
searchJob = viewModelScope.launch {
delay(TYPING_PAUSE_MS)
search(q.trim())
}
}
private suspend fun search(term: String) {
try {
val groups = coroutineScope {
val people = async { library.searchPeople(term) }
val byLibrary = library.views().map { view -> async { view to library.search(term, view) } }.awaitAll()
withContext(Dispatchers.Default) {
byLibrary.filter { it.second.isNotEmpty() }.map { (view, items) ->
val row = "s/${view.id}"
SearchGroup(
row,
view.name,
items.map { item ->
targets[cards.key(row, item)] = cards.target(item)
cards.poster(item, row)
},
emptyList(),
)
} + listOfNotNull(people.await().takeIf { it.isNotEmpty() }?.let { list -> SearchGroup("s/people", "Люди", emptyList(), list.map(::personCard)) })
}
}
_state.update { it.copy(results = groups, searching = false, error = null) }
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
Timber.w(e, "Search failed")
_state.update { it.copy(results = emptyList(), searching = false, error = e.message ?: e.toString()) }
}
}
private fun personCard(p: Person): PersonCardModel {
val key = "s/people/${p.id}"
targets[key] = Screen.Person(p.id)
return PersonCardModel(
key = key,
name = p.name,
letters = p.name.split(' ').filter { it.isNotBlank() }.take(2).joinToString("") { it.take(1).uppercase() },
photo = cards.image(p.image, SearchLayout.PERSON_PHOTO, SearchLayout.PERSON_PHOTO),
)
}
private companion object {
const val RECENT_ROW = "recent"
const val RECENT_ITEMS = 8
const val TYPING_PAUSE_MS = 350L
const val MAX_LENGTH = 60
}
}
internal object SearchLayout {
const val PERSON_PHOTO = 80f
/** Left column: query field and keyboard. */
const val KEYBOARD_W = 280
/** The results column starts here, from the content's left edge. */
const val RESULTS_START = 372
}

99
app/src/main/kotlin/ru/stenfredd/movies/ui/settings/LicenseScreen.kt Normal file
View File

@@ -0,0 +1,99 @@
package ru.stenfredd.movies.ui.settings
import android.view.KeyEvent as AndroidKeyEvent
import androidx.compose.foundation.focusable
import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.nativeKeyCode
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.theme.AppColors
import ru.stenfredd.movies.ui.theme.AppDimens
import ru.stenfredd.movies.ui.theme.AppType
/** Text of a licence from `assets/licenses`; ↑/↓ scroll it (a page at a time with ←/→ or channel keys). */
@Composable
fun LicenseScreen(screen: Screen.License) {
val context = LocalContext.current
var paragraphs by remember { mutableStateOf(emptyList<String>()) }
LaunchedEffect(screen.asset) {
paragraphs = withContext(Dispatchers.IO) {
runCatching { context.assets.open("licenses/${screen.asset}").bufferedReader().use { it.readText() } }
.getOrDefault("Текст лицензии не найден.")
.split(Regex("""\n\s*\n"""))
// Hard-wrapped lines are joined: the screen wraps them itself.
.map { p -> p.trim().replace(Regex("""\s*\n\s*"""), " ") }
.filter { it.isNotEmpty() }
}
}
val list = rememberLazyListState()
val scope = rememberCoroutineScope()
val requester = remember { FocusRequester() }
val step = with(LocalDensity.current) { 120.dp.toPx() }
val page = with(LocalDensity.current) { 400.dp.toPx() }
LaunchedEffect(Unit) { runCatching { requester.requestFocus() } }
LazyColumn(
state = list,
modifier = Modifier
.fillMaxSize()
.focusRequester(requester)
.onKeyEvent { e ->
if (e.type != KeyEventType.KeyDown) return@onKeyEvent false
val by = when (e.key.nativeKeyCode) {
AndroidKeyEvent.KEYCODE_DPAD_DOWN -> step
AndroidKeyEvent.KEYCODE_DPAD_UP -> -step
AndroidKeyEvent.KEYCODE_DPAD_RIGHT, AndroidKeyEvent.KEYCODE_PAGE_DOWN, AndroidKeyEvent.KEYCODE_CHANNEL_DOWN -> page
AndroidKeyEvent.KEYCODE_DPAD_LEFT, AndroidKeyEvent.KEYCODE_PAGE_UP, AndroidKeyEvent.KEYCODE_CHANNEL_UP -> -page
else -> return@onKeyEvent false
}
scope.launch { list.animateScrollBy(by) }
true
}
.focusable(),
contentPadding = PaddingValues(start = AppDimens.CONTENT_START.dp, end = AppDimens.CONTENT_START.dp, top = AppDimens.CONTENT_TOP.dp, bottom = 80.dp),
) {
item(key = "title", contentType = "title") {
Column(Modifier.padding(bottom = 18.dp)) {
BasicText(screen.name, style = AppType.Display.copy(fontSize = 26.sp))
BasicText(screen.license, Modifier.padding(top = 6.dp), style = AppType.MonoLabel)
}
}
itemsIndexed(paragraphs, contentType = { _, _ -> "text" }) { _, p ->
BasicText(
p,
Modifier.widthIn(max = 720.dp).padding(bottom = 10.dp),
style = AppType.Body.copy(fontSize = 11.5.sp, lineHeight = 17.sp, color = AppColors.TextSecondary),
)
}
}
}

31
app/src/main/kotlin/ru/stenfredd/movies/ui/settings/Licenses.kt Normal file
View File

@@ -0,0 +1,31 @@
package ru.stenfredd.movies.ui.settings
import androidx.compose.runtime.Immutable
/** A component shipped in the app and its licence; [asset] is the licence text in `assets/licenses`. */
@Immutable
data class Component(val name: String, val note: String?, val license: String, val asset: String)
/** "О приложении": the app itself first, then what it is built from (playback first: it carries the copyleft licences). */
internal object Licenses {
val app = Component("Movies", "это приложение", "GPL-3.0", "GPL-3.0.txt")
val components = listOf(
Component("libVLC", "VideoLAN, второй движок воспроизведения", "LGPL-2.1", "LGPL-2.1.txt"),
Component("FFmpeg для Media3", "Jellyfin, декодеры звука", "GPL-3.0", "GPL-3.0.txt"),
Component("Jellyfin SDK", "Jellyfin, работа с сервером", "LGPL-3.0", "LGPL-3.0.txt"),
Component("AndroidX Media3 (ExoPlayer)", "Google, основной движок", "Apache 2.0", "Apache-2.0.txt"),
Component("PsExtractor", "из Media3, изменён для DVD", "Apache 2.0", "Apache-2.0.txt"),
Component("ass-media", "субтитры ASS в ExoPlayer", "MIT", "MIT.txt"),
Component("libass", "внутри ass-media", "ISC", "ISC.txt"),
Component("Jetpack Compose, AndroidX", "Google, интерфейс", "Apache 2.0", "Apache-2.0.txt"),
Component("Kotlin, kotlinx", "JetBrains", "Apache 2.0", "Apache-2.0.txt"),
Component("Dagger Hilt", "Google", "Apache 2.0", "Apache-2.0.txt"),
Component("Coil", "загрузка картинок", "Apache 2.0", "Apache-2.0.txt"),
Component("OkHttp", "Square, сеть", "Apache 2.0", "Apache-2.0.txt"),
Component("ZXing", "QR-код для Quick Connect", "Apache 2.0", "Apache-2.0.txt"),
Component("Timber", "журнал", "Apache 2.0", "Apache-2.0.txt"),
Component("Шрифт Onest", null, "OFL 1.1", "Onest-OFL.txt"),
Component("Шрифт JetBrains Mono", null, "OFL 1.1", "JetBrainsMono-OFL.txt"),
)
}

554
app/src/main/kotlin/ru/stenfredd/movies/ui/settings/SettingsScreen.kt Normal file
View File

@@ -0,0 +1,554 @@
package ru.stenfredd.movies.ui.settings
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusGroup
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicText
import androidx.compose.foundation.verticalScroll
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.withFrameNanos
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.focusRestorer
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import ru.stenfredd.movies.core.data.LanguageSettings
import ru.stenfredd.movies.core.data.SubtitleMode
import ru.stenfredd.movies.core.jellyfin.Account
import ru.stenfredd.movies.playback.api.SubtitleStyle
import ru.stenfredd.movies.playback.api.VideoPathSwitchable
import ru.stenfredd.movies.playback.core.PlaybackDefaults
import ru.stenfredd.movies.ui.Screen
import ru.stenfredd.movies.ui.components.Avatar
import ru.stenfredd.movies.ui.components.Chip
import ru.stenfredd.movies.ui.components.FocusStyle
import ru.stenfredd.movies.ui.components.MinimalScrolling
import ru.stenfredd.movies.ui.components.SecondaryButton
import ru.stenfredd.movies.ui.components.focusCard
import ru.stenfredd.movies.ui.focus.Restore
import ru.stenfredd.movies.ui.focus.ScreenFocus
import ru.stenfredd.movies.ui.focus.rememberScreenFocus
import ru.stenfredd.movies.ui.focus.remembered
import ru.stenfredd.movies.ui.player.PlayerLabels
import ru.stenfredd.movies.ui.player.QualityCaps
import ru.stenfredd.movies.ui.player.SubtitleChoices
import ru.stenfredd.movies.ui.player.SubtitlePreview
import ru.stenfredd.movies.ui.theme.AppColors
import ru.stenfredd.movies.ui.theme.AppDimens
import ru.stenfredd.movies.ui.theme.AppType
/** Sections on the left; the focused one is shown on the right. */
private enum class Section(val title: String, val dot: Color) {
Playback("Воспроизведение", AppColors.Blue),
Languages("Языки", AppColors.Pink),
Subtitles("Вид субтитров", AppColors.Yellow),
Account("Аккаунт и сервер", AppColors.Green),
About("О приложении", AppColors.TextDim),
Debug("Отладка", AppColors.Orange),
}
/** One chip of a setting. */
@Immutable
private data class Option<T>(val value: T, val label: String, val detail: String? = null, val swatch: Color? = null)
/**
* Settings tab (not in the mockup; built from its parts): sections on the left, the focused section's settings on
* the right as rows of chips, like the playback options on a movie page. Every choice applies at once.
*/
@Composable
fun SettingsScreen(
onOpen: (Screen) -> Unit,
/** Signed out: the app goes to the login screen. */
onSignedOut: () -> Unit,
/** Another saved account became current: the app restarts on its home screen. */
onSwitched: () -> Unit,
vm: SettingsViewModel = hiltViewModel(),
) {
val focus = rememberScreenFocus()
var section by rememberSaveable { mutableStateOf(Section.Playback) }
val sections = remember(vm.tourAvailable) { Section.entries.filter { it != Section.Debug || vm.tourAvailable } }
// The focused section is shown after a short pause: quick scrolling through the list doesn't build every section.
var focused by remember { mutableStateOf<Section?>(null) }
LaunchedEffect(focused) {
val target = focused ?: return@LaunchedEffect
if (target != section) {
delay(SECTION_DELAY_MS)
section = target
}
}
Column(Modifier.fillMaxSize().padding(start = AppDimens.CONTENT_START.dp, top = AppDimens.CONTENT_TOP.dp)) {
BasicText("Настройки", style = AppType.Display.copy(fontSize = 28.sp))
Row(Modifier.padding(top = 22.dp).fillMaxSize()) {
val focusManager = LocalFocusManager.current
val scope = rememberCoroutineScope()
Column(
Modifier
.width(190.dp)
// → before the pause is over: show the focused section now and go into it once it is composed.
.onPreviewKeyEvent { e ->
val pending = focused?.takeIf { it != section }
if (pending == null || e.type != KeyEventType.KeyDown || e.key != Key.DirectionRight) return@onPreviewKeyEvent false
section = pending
scope.launch {
withFrameNanos { }
withFrameNanos { }
focusManager.moveFocus(FocusDirection.Right)
}
true
}
.focusRestorer()
.focusGroup(),
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
for (s in sections) {
SectionItem(
s,
selected = s == section,
onFocused = { focused = s },
onClick = { section = s },
Modifier.remembered(focus, "section/${s.name}", isDefault = s == Section.Playback),
)
}
}
// Each section scrolls on its own and starts from the top.
Box(Modifier.weight(1f).fillMaxHeight()) { key(section) {
MinimalScrolling(margin = 30.dp) {
Column(
Modifier
.fillMaxSize()
.focusRestorer()
.focusGroup()
.verticalScroll(rememberScrollState())
.padding(start = 40.dp, end = AppDimens.CONTENT_START.dp, top = 6.dp, bottom = 60.dp),
verticalArrangement = Arrangement.spacedBy(26.dp),
) {
when (section) {
Section.Playback -> PlaybackSection(vm, focus)
Section.Languages -> LanguagesSection(vm, focus)
Section.Subtitles -> SubtitlesSection(vm, focus)
Section.Account -> AccountSection(vm, focus, onOpen, onSignedOut, onSwitched)
Section.About -> AboutSection(vm, focus, onOpen)
Section.Debug -> Setting("Режим обхода", "Проигрывает подготовленный список файлов со всеми форматами сервера: проверка движков.") {
SecondaryButton("Запустить", { onOpen(Screen.Tour()) }, Modifier.remembered(focus, "debug/tour"))
}
}
}
}
} }
}
}
focus.Restore(ready = true)
}
private const val SECTION_DELAY_MS = 300L
private val SectionFocus = FocusStyle(scale = 1f, corner = 8.dp, glows = FocusStyle.ButtonGlows)
/** Section in the left column: light fill when focused, a violet frame for the one shown. */
@Composable
private fun SectionItem(section: Section, selected: Boolean, onFocused: () -> Unit, onClick: () -> Unit, modifier: Modifier) {
var focused by remember { mutableStateOf(false) }
val shape = RoundedCornerShape(8.dp)
Row(
modifier
.focusCard(SectionFocus)
.fillMaxWidth()
.height(36.dp)
.background(
when {
focused -> AppColors.FocusFill
selected -> AppColors.Selected
else -> Color.Transparent
},
shape,
)
.border(0.5.dp, if (selected && !focused) AppColors.SelectedBorder else Color.Transparent, shape)
.onFocusChanged {
focused = it.isFocused
if (it.isFocused) onFocused()
}
.clickable(interactionSource = null, indication = null, onClick = onClick)
.padding(horizontal = 12.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(9.dp),
) {
Box(Modifier.size(6.dp).background(section.dot, CircleShape))
BasicText(
section.title,
style = AppType.Rail.copy(fontSize = 13.sp, color = if (focused) AppColors.OnFocusFill else if (selected) AppColors.Text else AppColors.TextMuted),
maxLines = 1,
)
}
}
/** A setting: title, an optional explanation, then its controls. */
@Composable
private fun Setting(title: String, note: String?, content: @Composable () -> Unit) {
Column {
BasicText(title, style = AppType.Section.copy(fontSize = 14.sp))
note?.let { BasicText(it, Modifier.padding(top = 5.dp).widthIn(max = 520.dp), style = AppType.Body) }
Box(Modifier.padding(top = 11.dp)) { content() }
}
}
/** A row of chips, one of them chosen. Coming into the row from above or below focuses the chosen chip. */
@Composable
private fun <T> Choices(id: String, options: List<Option<T>>, selected: T, focus: ScreenFocus, onPick: (T) -> Unit) {
val chosen = remember { FocusRequester() }
Row(Modifier.focusRestorer(chosen).focusGroup(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
for ((i, o) in options.withIndex()) {
val isSelected = o.value == selected
Chip(
o.label,
isSelected,
{ onPick(o.value) },
Modifier.then(if (isSelected) Modifier.focusRequester(chosen) else Modifier).remembered(focus, "$id/$i"),
detail = o.detail,
swatch = o.swatch,
)
}
}
}
@Composable
private fun Note(text: String, modifier: Modifier = Modifier, color: Color = AppColors.TextDim) {
BasicText(text, modifier.widthIn(max = 520.dp), style = AppType.Body.copy(fontSize = 10.5.sp, lineHeight = 15.sp, color = color))
}
// --- Воспроизведение ---
@Composable
private fun PlaybackSection(vm: SettingsViewModel, focus: ScreenFocus) {
val defaults by vm.defaults.collectAsStateWithLifecycle()
fun set(d: PlaybackDefaults) = vm.setDefaults(d)
Setting(
"Качество по умолчанию",
"Всё, что ниже оригинала, сервер перекодирует на лету — это нагружает его процессор. Помогает при медленной сети. " +
"В плеере качество можно сменить для одного просмотра.",
) {
val options = listOf(Option<Int?>(null, "Оригинал")) +
QualityCaps.ALL.map { (bitrate, lines) -> Option<Int?>(bitrate, "${lines}p", PlayerLabels.mbps(bitrate)) }
Choices("quality", options, defaults.maxBitrate, focus) { set(defaults.copy(maxBitrate = it)) }
}
Setting(
"Вывод видео",
"Видеослой ТВ — с HDR и обработкой изображения телевизора. Через GPU — без HDR и не выше 1080p, но без ошибок " +
"видеослоя некоторых ТВ. «Авто» выбирает по файлу. Относится к основному движку (ExoPlayer).",
) {
val options = listOf(
Option(VideoPathSwitchable.Mode.AUTO, "Авто"),
Option(VideoPathSwitchable.Mode.VIDEO_PLANE, "Видеослой ТВ"),
Option(VideoPathSwitchable.Mode.GPU, "Через GPU"),
)
Choices("path", options, defaults.videoPath, focus) { set(defaults.copy(videoPath = it)) }
}
if (vm.dolbyVisionCapable) {
Setting(
"Dolby Vision",
"Файлы Dolby Vision с базовым слоем HDR10 можно показывать как HDR10 или через DV-декодер: тогда ТВ " +
"включает свой режим Dolby Vision. Файлы только с Dolby Vision всегда идут через DV-декодер.",
) {
val options = listOf(Option(false, "Базовый слой", "HDR10"), Option(true, "DV-декодер", "режим ТВ"))
Choices("dv", options, defaults.dolbyVision, focus) { set(defaults.copy(dolbyVision = it)) }
}
}
}
// --- Языки ---
private val AudioLanguages = listOf("rus" to "Русский", "eng" to "Английский", "jpn" to "Японский")
private val SubtitleLanguages = listOf("rus" to "Русские", "eng" to "Английские")
@Composable
private fun LanguagesSection(vm: SettingsViewModel, focus: ScreenFocus) {
val state by vm.languages.collectAsStateWithLifecycle()
val settings = state.settings
if (settings == null) {
if (state.error == null) {
Note("Загрузка настроек с сервера…")
} else {
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
Note("Не удалось загрузить настройки с сервера: ${state.error}", color = AppColors.Red)
SecondaryButton("Повторить", vm::loadLanguages, Modifier.remembered(focus, "languages/retry"))
}
}
return
}
fun set(s: LanguageSettings) = vm.setLanguages(s)
Setting("Язык звука", "Какую дорожку включать, если в файле их несколько. «Как в файле» — дорожка, отмеченная в файле основной.") {
val options = listOf(Option<String?>(null, "Как в файле")) +
(AudioLanguages + listOfNotNull(settings.audio?.takeIf { a -> AudioLanguages.none { it.first == a } }?.let { it to languageName(it) }))
.map { (code, name) -> Option<String?>(code, name) }
Choices("audio", options, settings.audio, focus) { set(settings.copy(audio = it)) }
}
Setting("Субтитры", null) {
val options = listOf(
Option(SubtitleMode.Default, "Как в файле"),
Option(SubtitleMode.None, "Выкл"),
Option(SubtitleMode.OnlyForced, "Только надписи"),
Option(SubtitleMode.Smart, "Если звук не на моём языке"),
Option(SubtitleMode.Always, "Всегда"),
)
Choices("subtitles", options, settings.subtitleMode, focus) { set(settings.copy(subtitleMode = it)) }
}
if (settings.subtitleMode != SubtitleMode.None) {
Setting("Язык субтитров", null) {
val options = listOf(Option<String?>(null, "Любой")) +
(SubtitleLanguages + listOfNotNull(settings.subtitleLanguage?.takeIf { s -> SubtitleLanguages.none { it.first == s } }?.let { it to languageName(it) }))
.map { (code, name) -> Option<String?>(code, name) }
Choices("subtitle-language", options, settings.subtitleLanguage, focus) { set(settings.copy(subtitleLanguage = it)) }
}
}
val account = vm.accounts.collectAsStateWithLifecycle().value.current
Note(
"Языки хранятся на сервере в профиле ${account?.userName.orEmpty()} и действуют во всех приложениях Jellyfin. " +
"Дорожки, выбранные вручную для фильма или сериала, запоминаются на этом ТВ и важнее этих настроек.",
)
state.error?.let { Note(it, color = AppColors.Red) }
}
/** "fra" → "Французский". */
private fun languageName(code: String): String =
java.util.Locale.forLanguageTag(code).getDisplayLanguage(java.util.Locale.forLanguageTag("ru")).replaceFirstChar { it.titlecase() }.ifEmpty { code }
// --- Вид субтитров ---
@Composable
private fun SubtitlesSection(vm: SettingsViewModel, focus: ScreenFocus) {
val style by vm.subtitleStyle.collectAsStateWithLifecycle()
fun set(s: SubtitleStyle) = vm.setSubtitleStyle(s)
Box(Modifier.widthIn(max = 420.dp)) { SubtitlePreview(style, on = true) }
Setting("Размер", null) {
Choices("sub-size", SubtitleStyle.Size.entries.map { Option(it, it.name) }, style.size, focus) { set(style.copy(size = it)) }
}
Setting("Цвет", null) {
val options = SubtitleChoices.colors(style).map { Option(it.key.substringAfter('/').toInt(), it.label, swatch = it.swatch) }
Choices("sub-color", options, style.color, focus) { set(style.copy(color = it)) }
}
Setting("Фон", null) {
val options = SubtitleChoices.backgrounds(style).map { Option(SubtitleStyle.Background.valueOf(it.key.substringAfter('/')), it.label) }
Choices("sub-background", options, style.background, focus) { set(style.copy(background = it)) }
}
Note(
"Для текстовых субтитров (SRT, VTT) на этом ТВ, для всех профилей. У субтитров ASS своё оформление из файла, " +
"графические (PGS, DVD) показываются как есть. То же можно настроить в плеере.",
)
}
// --- Аккаунт и сервер ---
@Composable
private fun AccountSection(
vm: SettingsViewModel,
focus: ScreenFocus,
onOpen: (Screen) -> Unit,
onSignedOut: () -> Unit,
onSwitched: () -> Unit,
) {
val state by vm.accounts.collectAsStateWithLifecycle()
val scope = rememberCoroutineScope()
// The action waiting for the second OK ("Точно выйти?"); moving focus away cancels it.
var confirm by remember { mutableStateOf<String?>(null) }
var busy by remember { mutableStateOf(false) }
fun Modifier.confirmable(id: String) = onFocusChanged { if (!it.isFocused && confirm == id) confirm = null }
val current = state.current ?: return
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) {
Avatar(current.userName, current.userId.toString(), 48.dp, AppType.Hero.copy(fontSize = 20.sp))
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
BasicText(current.userName, style = AppType.Section.copy(fontSize = 18.sp, fontWeight = FontWeight.Bold))
val server = state.server
val name = server?.name?.ifEmpty { null } ?: current.serverName.ifEmpty { null }
BasicText(
listOfNotNull(name?.let { "Сервер «$it»" } ?: "Сервер", server?.version?.let { "Jellyfin $it" }).joinToString(" · "),
style = AppType.MonoMeta,
)
}
}
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
InfoLine("Адрес", current.serverUrl)
InfoLine("Дома", state.localUrl?.let { "напрямую, $it" } ?: "сервер в локальной сети не найден — через адрес выше")
}
Row(Modifier.focusRestorer().focusGroup(), horizontalArrangement = Arrangement.spacedBy(10.dp)) {
SecondaryButton("Сменить профиль", { onOpen(Screen.Login) }, Modifier.remembered(focus, "account/switch"))
SecondaryButton(
when {
busy -> "Выходим…"
confirm == "logout" -> "Точно выйти?"
else -> "Выйти"
},
{
when {
busy -> Unit
confirm != "logout" -> confirm = "logout"
else -> {
busy = true
scope.launch {
vm.logout()
onSignedOut()
}
}
}
},
Modifier.remembered(focus, "account/logout").confirmable("logout"),
)
}
Note("«Выйти» забывает этот профиль на ТВ; войти снова — паролем или Quick Connect.")
Setting("Другие профили на этом ТВ", if (state.others.isEmpty()) "Других нет. Добавить — «Сменить профиль» → «Другой пользователь»." else null) {
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
for (a in state.others) {
OtherAccount(
a,
confirmForget = confirm == "forget/${a.id}",
onSwitch = {
if (!busy) {
busy = true
scope.launch {
vm.switchTo(a.id)
onSwitched()
}
}
},
onForget = {
if (confirm != "forget/${a.id}") {
confirm = "forget/${a.id}"
} else {
confirm = null
vm.forget(a.id)
// The row goes away with the focused chip: focus the section instead of nothing.
scope.launch {
focus.lastKey = "section/${Section.Account.name}"
withFrameNanos { }
withFrameNanos { }
focus.requestFocus()
}
}
},
focus = focus,
modifier = Modifier.confirmable("forget/${a.id}"),
)
}
}
}
}
@Composable
private fun OtherAccount(
account: Account,
confirmForget: Boolean,
onSwitch: () -> Unit,
onForget: () -> Unit,
focus: ScreenFocus,
modifier: Modifier,
) {
Row(Modifier.focusRestorer().focusGroup(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) {
Avatar(account.userName, account.userId.toString(), 30.dp, AppType.CardTitle)
Column(Modifier.width(190.dp)) {
BasicText(account.userName, style = AppType.CardTitle, maxLines = 1, overflow = TextOverflow.Ellipsis)
BasicText(account.serverName.ifEmpty { account.serverUrl }, style = AppType.MonoCaption, maxLines = 1, overflow = TextOverflow.Ellipsis)
}
Chip("Переключиться", false, onSwitch, Modifier.remembered(focus, "other/${account.id}/switch"))
Chip(if (confirmForget) "Точно забыть?" else "Забыть", false, onForget, modifier.remembered(focus, "other/${account.id}/forget"))
}
}
@Composable
private fun InfoLine(key: String, value: String) {
Row {
BasicText(key, Modifier.width(60.dp), style = AppType.MonoMeta.copy(color = AppColors.TextFaint))
BasicText(value, style = AppType.MonoMeta, maxLines = 2, overflow = TextOverflow.Ellipsis)
}
}
// --- О приложении ---
@Composable
private fun AboutSection(vm: SettingsViewModel, focus: ScreenFocus, onOpen: (Screen) -> Unit) {
Column(verticalArrangement = Arrangement.spacedBy(5.dp)) {
BasicText("Movies", style = AppType.Section.copy(fontSize = 18.sp, fontWeight = FontWeight.Bold))
BasicText("Версия ${vm.about.version}", style = AppType.MonoMeta)
BasicText(vm.about.device, style = AppType.MonoMeta.copy(color = AppColors.TextDim))
}
Setting("Лицензии", "Приложение — свободное ПО под лицензией GPL-3.0. Ниже — из чего оно собрано; OK — текст лицензии.") {
Column(Modifier.focusRestorer().focusGroup(), verticalArrangement = Arrangement.spacedBy(4.dp)) {
for ((i, c) in (listOf(Licenses.app) + Licenses.components).withIndex()) {
LicenseRow(c, { onOpen(Screen.License(c.name, c.license, c.asset)) }, Modifier.remembered(focus, "license/$i"))
}
}
}
}
private val RowFocus = FocusStyle(scale = 1f, corner = 7.dp, ring = 0.5.dp, glows = listOf(FocusStyle.Glow(15.dp, 0.dp, Color(0x737C5CFF))))
@Composable
private fun LicenseRow(component: Component, onClick: () -> Unit, modifier: Modifier) {
var focused by remember { mutableStateOf(false) }
val shape = RoundedCornerShape(7.dp)
Row(
modifier
.focusCard(RowFocus)
.widthIn(max = 520.dp)
.fillMaxWidth()
.height(34.dp)
.background(if (focused) AppColors.SurfaceFocused else AppColors.Surface, shape)
.border(0.5.dp, if (focused) AppColors.Accent else AppColors.BorderSubtle, shape)
.onFocusChanged { focused = it.isFocused }
.clickable(interactionSource = null, indication = null, onClick = onClick)
.padding(horizontal = 11.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
BasicText(component.name, style = AppType.CardTitle.copy(fontSize = 12.sp, fontWeight = FontWeight.SemiBold), maxLines = 1)
component.note?.let {
BasicText(it, Modifier.weight(1f), style = AppType.Body.copy(fontSize = 10.5.sp, color = AppColors.TextDim), maxLines = 1, overflow = TextOverflow.Ellipsis)
} ?: Box(Modifier.weight(1f))
BasicText(component.license, style = AppType.MonoCaption.copy(color = AppColors.Accent), maxLines = 1)
}
}

153
app/src/main/kotlin/ru/stenfredd/movies/ui/settings/SettingsViewModel.kt Normal file
View File

@@ -0,0 +1,153 @@
package ru.stenfredd.movies.ui.settings
import android.content.Context
import android.os.Build
import android.view.Display
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.stenfredd.movies.BuildConfig
import ru.stenfredd.movies.core.data.LanguageSettings
import ru.stenfredd.movies.core.data.ServerInfo
import ru.stenfredd.movies.core.data.UserSettingsRepository
import ru.stenfredd.movies.core.jellyfin.Account
import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import ru.stenfredd.movies.playback.api.SubtitleStyle
import ru.stenfredd.movies.playback.core.DeviceCapabilitiesProbe
import ru.stenfredd.movies.playback.core.PlaybackDefaults
import ru.stenfredd.movies.playback.core.PlaybackPreferences
import ru.stenfredd.movies.ui.TourEntry
import timber.log.Timber
import javax.inject.Inject
/** Server-side language settings: loading, loaded or failed (with the reason). */
@Immutable
data class LanguagesState(val settings: LanguageSettings? = null, val error: String? = null, val saving: Boolean = false)
@Immutable
data class AccountsState(
val current: Account? = null,
val others: List<Account> = emptyList(),
/** LAN address the app talks to at home, null = through the public address. */
val localUrl: String? = null,
val server: ServerInfo? = null,
)
@HiltViewModel
class SettingsViewModel @Inject constructor(
@ApplicationContext context: Context,
private val session: JellyfinSession,
private val prefs: PlaybackPreferences,
private val userSettings: UserSettingsRepository,
private val probe: DeviceCapabilitiesProbe,
) : ViewModel() {
val defaults: StateFlow<PlaybackDefaults> = prefs.defaults.stateIn(viewModelScope, SharingStarted.Eagerly, PlaybackDefaults())
val subtitleStyle: StateFlow<SubtitleStyle> = prefs.subtitleStyle.stateIn(viewModelScope, SharingStarted.Eagerly, SubtitleStyle())
private val _languages = MutableStateFlow(LanguagesState())
val languages: StateFlow<LanguagesState> = _languages.asStateFlow()
private val server = MutableStateFlow<ServerInfo?>(null)
val accounts: StateFlow<AccountsState> = combine(session.session, session.accounts, server) { s, all, info ->
AccountsState(
current = all.firstOrNull { it.id == s?.accountId },
others = all.filter { it.id != s?.accountId },
localUrl = session.localUrl,
server = info,
)
}.stateIn(viewModelScope, SharingStarted.Eagerly, AccountsState())
/** The TV can show Dolby Vision through its own decoder: only then the choice is offered. */
var dolbyVisionCapable by mutableStateOf(false)
private set
val tourAvailable = BuildConfig.DEBUG && TourEntry.available(context)
val about = About(
version = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE}) · ${BuildConfig.BUILD_TYPE}",
device = "${Build.MANUFACTURER} ${Build.MODEL} · Android ${Build.VERSION.RELEASE}",
)
init {
loadLanguages()
viewModelScope.launch {
server.value = runCatching { userSettings.server() }.onFailure { Timber.w(it, "Settings: server info") }.getOrNull()
}
viewModelScope.launch {
dolbyVisionCapable = withContext(Dispatchers.Default) {
val device = probe.capabilities
device.hardwareVideoDecoders(DV_MIME).isNotEmpty() && device.displaySupportsHdr(Display.HdrCapabilities.HDR_TYPE_DOLBY_VISION)
}
}
}
fun loadLanguages() {
_languages.value = LanguagesState()
viewModelScope.launch {
_languages.value = try {
LanguagesState(userSettings.languages())
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
Timber.w(e, "Settings: languages")
LanguagesState(error = e.message ?: e.javaClass.simpleName)
}
}
}
/** Shown at once, saved on the server in the background; on failure the old settings come back with the error. */
fun setLanguages(settings: LanguageSettings) {
val old = _languages.value.settings ?: return
if (settings == old) return
_languages.value = LanguagesState(settings, saving = true)
viewModelScope.launch {
_languages.value = try {
userSettings.setLanguages(settings)
LanguagesState(settings)
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
Timber.w(e, "Settings: saving languages")
LanguagesState(old, error = "Не удалось сохранить: ${e.message ?: e.javaClass.simpleName}")
}
}
}
fun setDefaults(defaults: PlaybackDefaults) {
viewModelScope.launch { prefs.setDefaults(defaults) }
}
fun setSubtitleStyle(style: SubtitleStyle) {
viewModelScope.launch { prefs.setSubtitleStyle(style) }
}
suspend fun logout() = session.logout()
suspend fun switchTo(accountId: String) = session.switchTo(accountId)
fun forget(accountId: String) {
viewModelScope.launch { session.forget(accountId) }
}
private companion object {
const val DV_MIME = "video/dolby-vision"
}
}
@Immutable
data class About(val version: String, val device: String)

75
app/src/main/kotlin/ru/stenfredd/movies/ui/shell/Shell.kt
View File

@@ -17,6 +17,8 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
@@ -45,6 +47,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.util.lerp
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import kotlinx.coroutines.delay
@@ -56,14 +59,20 @@ import ru.stenfredd.movies.ui.theme.AppDimens
import ru.stenfredd.movies.ui.theme.AppType
import java.time.LocalTime
import java.time.format.DateTimeFormatter
import java.util.UUID
enum class Tab(val label: String, val icon: AppIcon) {
Search("Поиск", AppIcon.Search),
Home("Главная", AppIcon.Home),
Library("Медиатека", AppIcon.Library),
Favorites("Избранное", AppIcon.Heart),
/** Not in the mockup; at the bottom of the rail, above the profile. */
Settings("Настройки", AppIcon.Settings),
}
/** A library listed on the rail under the tabs; choosing it opens the library tab on it. */
data class RailLibrary(val id: UUID, val name: String, val icon: AppIcon)
/**
* Root screens (the tabs): side rail on the left, clock on the top right, content behind.
* The rail overlaps the content and widens over it when focused, so opening it never relays out the content.
@@ -76,7 +85,9 @@ fun Shell(
userName: String,
/** Avatar colour seed (user id), see [Avatar]. */
userSeed: String,
libraries: List<RailLibrary>,
onTab: (Tab) -> Unit,
onLibrary: (UUID) -> Unit,
onProfile: () -> Unit,
content: @Composable () -> Unit,
) {
@@ -90,9 +101,11 @@ fun Shell(
current = current,
userName = userName,
userSeed = userSeed,
libraries = libraries,
entry = railEntry,
onFocusChange = { railFocused = it },
onTab = onTab,
onLibrary = onLibrary,
onProfile = onProfile,
modifier = Modifier.zIndex(1f),
)
@@ -109,9 +122,11 @@ private fun Rail(
current: Tab,
userName: String,
userSeed: String,
libraries: List<RailLibrary>,
entry: FocusRequester,
onFocusChange: (Boolean) -> Unit,
onTab: (Tab) -> Unit,
onLibrary: (UUID) -> Unit,
onProfile: () -> Unit,
modifier: Modifier = Modifier,
) {
@@ -147,16 +162,38 @@ private fun Rail(
verticalArrangement = Arrangement.spacedBy(5.dp),
) {
Logo(progress, Modifier.padding(start = 13.dp, bottom = 20.dp))
for (tab in Tab.entries) {
RailItem(
tab = tab,
@Composable
fun item(tab: Tab) = RailItem(
label = tab.label,
icon = tab.icon,
selected = tab == current,
progress = progress,
onClick = { if (tab != current) onTab(tab) },
modifier = if (tab == current) Modifier.focusRequester(entry) else Modifier,
)
for (tab in Tab.entries) if (tab != Tab.Settings) item(tab)
if (libraries.isNotEmpty()) {
RailDivider(progress)
// Smaller than the tabs, so five fit between them and the settings; more scroll.
Column(
Modifier.weight(1f).verticalScroll(rememberScrollState()),
verticalArrangement = Arrangement.spacedBy(2.dp),
) {
for (library in libraries) {
RailItem(
label = library.name,
icon = library.icon,
selected = false,
progress = progress,
onClick = { onLibrary(library.id) },
height = 30.dp,
)
}
}
} else {
Spacer(Modifier.weight(1f))
}
item(Tab.Settings)
ProfileItem(userName, userSeed, progress, onProfile)
}
}
@@ -191,15 +228,38 @@ private fun Modifier.railHighlight(focused: Boolean, color: Color, progress: Sta
drawRoundRect(color, size = Size(w, size.height), cornerRadius = CornerRadius(8.dp.toPx()))
}
/** Line between the tabs and the libraries, as wide as an item's highlight. */
@Composable
private fun RailItem(tab: Tab, selected: Boolean, progress: State<Float>, onClick: () -> Unit, modifier: Modifier = Modifier) {
private fun RailDivider(progress: State<Float>) {
Box(
Modifier
.fillMaxWidth()
.height(11.dp)
.drawBehind {
val collapsed = (AppDimens.RAIL_COLLAPSED - 18).dp.toPx()
val w = lerp(collapsed, size.width, progress.value)
drawRect(AppColors.BorderSubtle, topLeft = Offset(0f, (size.height / 2).toInt().toFloat()), size = Size(w, 1.dp.toPx().coerceAtLeast(1f)))
},
)
}
@Composable
private fun RailItem(
label: String,
icon: AppIcon,
selected: Boolean,
progress: State<Float>,
onClick: () -> Unit,
modifier: Modifier = Modifier,
height: Dp = 36.dp,
) {
var focused by remember { mutableStateOf(false) }
val content = when {
focused -> AppColors.OnFocusFill
selected -> AppColors.Text
else -> AppColors.TextDim
}
Box(modifier.fillMaxWidth().height(36.dp)) {
Box(modifier.fillMaxWidth().height(height)) {
// Selected tab marker on the rail's left edge, visible while the rail is closed.
if (selected) {
Box(
@@ -224,12 +284,13 @@ private fun RailItem(tab: Tab, selected: Boolean, progress: State<Float>, onClic
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(11.dp),
) {
Icon(tab.icon, content, Modifier.size(16.dp))
Icon(icon, content, Modifier.size(16.dp))
BasicText(
tab.label,
label,
Modifier.graphicsLayer { alpha = progress.value },
style = AppType.Rail.copy(color = content),
maxLines = 1,
overflow = TextOverflow.Ellipsis,
softWrap = false,
)
}

1688
app/src/release/generated/baselineProfiles/baseline-prof.txt
View File

File diff suppressed because it is too large Load Diff

1688
app/src/release/generated/baselineProfiles/startup-prof.txt
View File

File diff suppressed because it is too large Load Diff

41
baselineprofile/src/main/kotlin/ru/stenfredd/movies/baselineprofile/BaselineProfileGenerator.kt
View File

@@ -15,7 +15,7 @@ import org.junit.runner.RunWith
*
* Path: cold start → home (snapshot, then fresh data) → along "Continue watching" → down through the rows, along
* each → open a card, down through its page → back → library tab: along the tiles, down through the rows and the grid
* → back up. With the instrumentation argument `seriesId` also a series page:
* → back up → search (type a few letters, through the results) → favourites → settings. With the instrumentation argument `seriesId` also a series page:
* along the buttons, the season chips, the episode row, the audio/subtitle tray. The device must be logged in.
*
* Run: `./gradlew :app:generateReleaseBaselineProfile [-Pandroid.testInstrumentationRunnerArguments.seriesId=<id>]`
@@ -79,6 +79,45 @@ class BaselineProfileGenerator {
}
repeat(LIBRARY_ROWS) { press { device.pressDPadUp() } }
// Search tab (two items up the rail): type on the on-screen keyboard, go through the results.
press { device.pressBack() }
repeat(2) { press { device.pressDPadUp() } }
press { device.pressDPadCenter() }
Thread.sleep(1_500)
press { device.pressDPadCenter() }
repeat(2) { press { device.pressDPadRight() } }
press { device.pressDPadCenter() }
Thread.sleep(1_500)
repeat(6) { press { device.pressDPadRight() } }
repeat(3) { press { device.pressDPadDown() } }
repeat(3) { press { device.pressDPadUp() } }
// Favourites tab (the last tab at the top of the rail).
press { device.pressBack() }
repeat(3) { press { device.pressDPadDown() } }
press { device.pressDPadCenter() }
Thread.sleep(1_500)
press { device.pressDPadDown() }
press { device.pressDPadUp() }
// Settings (below the tabs): through the sections (each is shown after a pause), along a row of choices.
// Nothing is picked: the choices are saved at once.
press { device.pressBack() }
press { device.pressDPadDown() }
press { device.pressDPadCenter() }
Thread.sleep(1_500)
repeat(4) {
press { device.pressDPadDown() }
Thread.sleep(400)
}
repeat(4) {
press { device.pressDPadUp() }
Thread.sleep(400)
}
press { device.pressDPadRight() }
repeat(2) { press { device.pressDPadRight() } }
press { device.pressDPadDown() }
val seriesId = InstrumentationRegistry.getArguments().getString("seriesId") ?: return@collect
startActivityAndWait { it.putExtra("series", seriesId) }
Thread.sleep(2_000)

1
core/data/build.gradle.kts
View File

@@ -18,6 +18,7 @@ android {
dependencies {
api(project(":core:jellyfin"))
implementation(libs.kotlinx.serialization.json)
implementation(libs.androidx.datastore.preferences)
implementation(libs.hilt.android)
ksp(libs.hilt.compiler)
implementation(libs.timber)

52
core/data/src/main/kotlin/ru/stenfredd/movies/core/data/LibraryRepository.kt
View File

@@ -6,6 +6,7 @@ import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.api.client.extensions.personApi
import org.jellyfin.sdk.api.client.extensions.showApi
import org.jellyfin.sdk.api.client.extensions.userViewApi
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.ItemFilter
import org.jellyfin.sdk.model.api.ItemSortBy
import org.jellyfin.sdk.model.api.SortOrder
@@ -18,7 +19,8 @@ import ru.stenfredd.movies.core.data.model.ItemSummary
import ru.stenfredd.movies.core.data.model.LibraryType
import ru.stenfredd.movies.core.data.model.LibraryView
import ru.stenfredd.movies.core.data.model.Page
import ru.stenfredd.movies.core.data.model.SearchResults
import ru.stenfredd.movies.core.data.model.Person
import ru.stenfredd.movies.core.data.model.itemKinds
import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import java.util.UUID
import javax.inject.Inject
@@ -67,6 +69,7 @@ class LibraryRepository @Inject constructor(
},
genres = query.genre?.let { listOf(it) },
personIds = query.personId?.let { listOf(it) },
searchTerm = query.searchTerm,
startIndex = start,
limit = limit,
fields = CARD_FIELDS,
@@ -114,25 +117,52 @@ class LibraryRepository @Inject constructor(
.map { it.toSummary() }
}
/** Movies, series and episodes matching [term], and people. Not cached: every keystroke is a new term. */
suspend fun search(term: String, limit: Int = 60): SearchResults = coroutineScope {
val items = async {
session.call {
/**
* Movies or series of library [view] matching [term], best matches first. Per library and of its own type:
* the screen groups results by library, and mixed types are much slower on the server. Not cached: every
* keystroke is a new term.
*/
suspend fun search(term: String, view: LibraryView, limit: Int = SEARCH_LIMIT): List<ItemSummary> = session.call {
libraryApi.getItems(
userId = userId,
parentId = view.id,
searchTerm = term,
recursive = true,
includeItemTypes = listOf(ItemKind.Movie, ItemKind.Series, ItemKind.Episode).mapNotNull { it.toBaseKind() },
includeItemTypes = view.itemKinds.mapNotNull { it.toBaseKind() },
limit = limit,
fields = CARD_FIELDS,
enableTotalRecordCount = false,
).content.items
}.map { it.toSummary() }
/**
* People matching [term]. Through `/Items`, not `/Persons`: the latter finds nothing by a Cyrillic name
* on Jellyfin 12 («питт» → 0, while `/Items` finds «Брэд Питт»).
*/
suspend fun searchPeople(term: String, limit: Int = PEOPLE_LIMIT): List<Person> = session.call {
libraryApi.getItems(
userId = userId,
searchTerm = term,
recursive = true,
includeItemTypes = listOf(BaseItemKind.PERSON),
limit = limit,
enableTotalRecordCount = false,
).content.items
}.map { it.toPerson() }
suspend fun person(id: UUID): Person = cache.get("person:$id", Kind.Stable) {
session.call { libraryApi.getItem(itemId = id, userId = userId).content }.toPerson()
}
val people = async {
session.call { personApi.getPersons(searchTerm = term, userId = userId, limit = PEOPLE_LIMIT).content.items }.map { it.toPerson() }
}
SearchResults(items.await(), people.await())
/**
* Movies, series and single episodes (guest roles) with person [id], newest first; one request per type
* (mixed types are slow).
*/
suspend fun filmography(id: UUID): List<ItemSummary> = coroutineScope {
listOf(ItemKind.Movie, ItemKind.Series, ItemKind.Episode)
.map { kind -> async { items(ItemQuery(kinds = setOf(kind), personId = id, sort = ItemSort.PremiereDate, descending = true), 0, FILMOGRAPHY_LIMIT, withTotal = false).items } }
.flatMap { it.await() }
.sortedWith(compareByDescending<ItemSummary> { it.year ?: 0 }.thenByDescending { it.premiereAt ?: 0L }.thenBy { it.name })
}
private fun ItemSort.toSortBy(): List<ItemSortBy> = when (this) {
@@ -147,5 +177,7 @@ class LibraryRepository @Inject constructor(
private companion object {
const val PEOPLE_LIMIT = 20
const val SEARCH_LIMIT = 40
const val FILMOGRAPHY_LIMIT = 200
}
}

49
core/data/src/main/kotlin/ru/stenfredd/movies/core/data/SearchHistory.kt Normal file
View File

@@ -0,0 +1,49 @@
package ru.stenfredd.movies.core.data
import android.content.Context
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
import org.json.JSONArray
import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import javax.inject.Inject
import javax.inject.Singleton
private val Context.searchStore by preferencesDataStore("search")
/** Recent search queries, kept on the device per account, newest first. */
@Singleton
class SearchHistory @Inject constructor(
@ApplicationContext private val context: Context,
private val session: JellyfinSession,
) {
private fun key() = stringPreferencesKey("recent:" + session.requireSession().accountId)
fun recent(): Flow<List<String>> {
val key = key()
return context.searchStore.data.map { prefs -> prefs[key]?.let(::parse).orEmpty() }
}
/** Puts [query] first; the same query typed in another case replaces the old one. */
suspend fun add(query: String) {
val q = query.trim()
if (q.isEmpty()) return
val key = key()
context.searchStore.edit { prefs ->
val list = listOf(q) + prefs[key]?.let(::parse).orEmpty().filterNot { it.equals(q, ignoreCase = true) }
prefs[key] = JSONArray(list.take(LIMIT)).toString()
}
}
private fun parse(raw: String): List<String> = runCatching {
val array = JSONArray(raw)
List(array.length()) { array.getString(it) }
}.getOrDefault(emptyList())
private companion object {
const val LIMIT = 8
}
}

6
core/data/src/main/kotlin/ru/stenfredd/movies/core/data/SessionCache.kt
View File

@@ -87,6 +87,12 @@ class SessionCache @Inject constructor(private val session: JellyfinSession) {
}
}
/** Drops what depends on the user's data or settings (default tracks in details) and tells screens to reload. */
fun dropUserData() {
drop(Kind.UserData)
_invalidations.tryEmit(Unit)
}
private fun drop(kind: Kind) {
val before = entries.size
entries.entries.removeAll { it.value.kind == kind }

87
core/data/src/main/kotlin/ru/stenfredd/movies/core/data/UserSettingsRepository.kt Normal file
View File

@@ -0,0 +1,87 @@
package ru.stenfredd.movies.core.data
import org.jellyfin.sdk.api.client.extensions.systemApi
import org.jellyfin.sdk.api.client.extensions.userApi
import org.jellyfin.sdk.model.api.SubtitlePlaybackMode
import org.jellyfin.sdk.model.api.UserConfiguration
import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import javax.inject.Inject
import javax.inject.Singleton
/**
* Default audio and subtitle languages. They are the user's settings on the server (every Jellyfin app of the user
* uses them): the server applies them when it picks a file's default tracks, which the movie page and the player start with.
*/
data class LanguageSettings(
/** ISO 639-2 ("rus", "eng"), null = the file's default track. */
val audio: String?,
val subtitleMode: SubtitleMode,
/** ISO 639-2, null = any language. */
val subtitleLanguage: String?,
)
enum class SubtitleMode { Default, Always, OnlyForced, Smart, None }
/** Server name, version and address for the settings screen. */
data class ServerInfo(val name: String, val version: String?)
@Singleton
class UserSettingsRepository @Inject constructor(
private val session: JellyfinSession,
private val cache: SessionCache,
) {
suspend fun languages(): LanguageSettings = configuration().toLanguages()
/**
* Saves [settings] on the server; cached details (with the default tracks picked by the old settings) are dropped.
* Only what changed is written: other apps may keep values this screen doesn't show (a language with "default track").
*/
suspend fun setLanguages(settings: LanguageSettings) {
val userId = session.requireSession().userId
val old = configuration()
val shown = old.toLanguages()
var config = old
if (settings.audio != shown.audio) {
config = config.copy(
audioLanguagePreference = settings.audio.orEmpty(),
// With this on the server takes the file's default track whatever the language.
playDefaultAudioTrack = settings.audio == null,
)
}
if (settings.subtitleMode != shown.subtitleMode) config = config.copy(subtitleMode = settings.subtitleMode.toApi())
if (settings.subtitleLanguage != shown.subtitleLanguage) config = config.copy(subtitleLanguagePreference = settings.subtitleLanguage.orEmpty())
if (config == old) return
session.call { userApi.updateUserConfiguration(userId, config) }
cache.dropUserData()
}
suspend fun server(): ServerInfo {
val info = cache.get("server", SessionCache.Kind.Stable) { session.call { systemApi.getPublicSystemInfo().content } }
return ServerInfo(info.serverName.orEmpty(), info.version)
}
private fun UserConfiguration.toLanguages() = LanguageSettings(
audio = audioLanguagePreference?.takeIf { it.isNotBlank() && !playDefaultAudioTrack },
subtitleMode = subtitleMode.toMode(),
subtitleLanguage = subtitleLanguagePreference?.takeIf { it.isNotBlank() },
)
private suspend fun configuration(): UserConfiguration =
checkNotNull(session.call { userApi.getCurrentUser().content }.configuration) { "Сервер не вернул настройки пользователя" }
private fun SubtitlePlaybackMode.toMode() = when (this) {
SubtitlePlaybackMode.ALWAYS -> SubtitleMode.Always
SubtitlePlaybackMode.ONLY_FORCED -> SubtitleMode.OnlyForced
SubtitlePlaybackMode.SMART -> SubtitleMode.Smart
SubtitlePlaybackMode.NONE -> SubtitleMode.None
SubtitlePlaybackMode.DEFAULT -> SubtitleMode.Default
}
private fun SubtitleMode.toApi() = when (this) {
SubtitleMode.Always -> SubtitlePlaybackMode.ALWAYS
SubtitleMode.OnlyForced -> SubtitlePlaybackMode.ONLY_FORCED
SubtitleMode.Smart -> SubtitlePlaybackMode.SMART
SubtitleMode.None -> SubtitlePlaybackMode.NONE
SubtitleMode.Default -> SubtitlePlaybackMode.DEFAULT
}
}

15
core/data/src/main/kotlin/ru/stenfredd/movies/core/data/WatchRepository.kt
View File

@@ -11,7 +11,9 @@ import ru.stenfredd.movies.core.data.model.ItemKind
import ru.stenfredd.movies.core.data.model.ItemQuery
import ru.stenfredd.movies.core.data.model.ItemSort
import ru.stenfredd.movies.core.data.model.ItemSummary
import ru.stenfredd.movies.core.data.model.LibraryView
import ru.stenfredd.movies.core.data.model.Page
import ru.stenfredd.movies.core.data.model.itemKinds
import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import java.util.UUID
import javax.inject.Inject
@@ -60,8 +62,13 @@ class WatchRepository @Inject constructor(
withTotal = false,
)
suspend fun favorites(start: Int, limit: Int, kinds: Set<ItemKind> = setOf(ItemKind.Movie, ItemKind.Series)): Page<ItemSummary> =
library.items(ItemQuery(kinds = kinds, favoritesOnly = true, sort = ItemSort.Name), start, limit)
/** Favourite movies or series of library [view], by name. All of them: favourites are a short list. */
suspend fun favorites(view: LibraryView): List<ItemSummary> = library.items(
ItemQuery(parentId = view.id, kinds = view.itemKinds, favoritesOnly = true, sort = ItemSort.Name),
0,
FAVORITES_LIMIT,
withTotal = false,
).items
suspend fun setPlayed(id: UUID, played: Boolean) {
session.call { if (played) userDataApi.markPlayedItem(itemId = id, userId = userId) else userDataApi.markUnplayedItem(itemId = id, userId = userId) }
@@ -72,4 +79,8 @@ class WatchRepository @Inject constructor(
session.call { if (favorite) userDataApi.markFavoriteItem(itemId = id, userId = userId) else userDataApi.unmarkFavoriteItem(itemId = id, userId = userId) }
session.notifyUserDataChanged(id)
}
private companion object {
const val FAVORITES_LIMIT = 500
}
}

4
core/data/src/main/kotlin/ru/stenfredd/movies/core/data/model/Models.kt
View File

@@ -112,6 +112,7 @@ data class ItemQuery(
val favoritesOnly: Boolean = false,
val genre: String? = null,
val personId: UUID? = null,
val searchTerm: String? = null,
)
/** Everything the movie/episode/series screens show about one item. */
@@ -179,6 +180,3 @@ data class SubtitleTrack(
val forced: Boolean,
val isDefault: Boolean,
)
/** Search results: items (grouped by kind on screen) and people. */
data class SearchResults(val items: List<ItemSummary>, val people: List<Person>)

21
core/jellyfin/src/main/kotlin/ru/stenfredd/movies/core/jellyfin/JellyfinSession.kt
View File

@@ -17,9 +17,11 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import kotlinx.coroutines.withTimeout
import okhttp3.OkHttpClient
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.HttpClientOptions
import org.jellyfin.sdk.api.client.extensions.sessionApi
import org.jellyfin.sdk.api.okhttp.OkHttpFactory
import org.jellyfin.sdk.createJellyfin
import org.jellyfin.sdk.discovery.DiscoveryService
@@ -159,15 +161,31 @@ class JellyfinSession @Inject constructor(
activate(account)
}
/** Signs out of the current account and forgets it on this device. */
/** Signs out of the current account (its token is revoked on the server, if it answers) and forgets it on this device. */
suspend fun logout() = mutex.withLock {
val current = _session.value ?: return@withLock
revoke { api }
_accounts.value = store.update(currentId = null) { list -> list.filterNot { it.id == current.accountId } }
api.update(accessToken = null)
routing.set(null, null)
_session.value = null
}
/** Forgets another saved account on this device; its token is revoked on the server, if it answers. */
suspend fun forget(accountId: String) = mutex.withLock {
val account = _accounts.value.firstOrNull { it.id == accountId } ?: return@withLock
if (account.id == _session.value?.accountId) return@withLock
revoke { jellyfin.createApi(baseUrl = account.serverUrl, accessToken = account.accessToken, deviceInfo = api.deviceInfo) }
_accounts.value = store.update(_session.value?.accountId) { list -> list.filterNot { it.id == accountId } }
.sortedByDescending { it.lastUsedAt }
}
/** Ends the token's session on the server (it disappears from the server's device list); a silent server is not waited for long. */
private suspend fun revoke(client: () -> ApiClient) {
runCatching { withTimeout(REVOKE_TIMEOUT_MS) { withContext(Dispatchers.IO) { client().sessionApi.reportSessionEnded() } } }
.onFailure { Timber.w(it, "Token not revoked on the server") }
}
/** The SDK reads response bodies on the calling thread, so every call must leave the main thread. */
suspend fun <T> call(block: suspend ApiClient.() -> T): T = withContext(Dispatchers.IO) { api.block() }
@@ -233,5 +251,6 @@ class JellyfinSession @Inject constructor(
const val CLIENT_NAME = "Movies"
const val CLIENT_VERSION = "0.1.0"
const val LOCAL_RECHECK_MS = 10 * 60_000L
const val REVOKE_TIMEOUT_MS = 3_000L
}
}

38
playback/core/src/main/kotlin/ru/stenfredd/movies/playback/core/PlaybackPreferences.kt
View File

@@ -2,7 +2,9 @@ package ru.stenfredd.movies.playback.core
import android.content.Context
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.intPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore
import dagger.hilt.android.qualifiers.ApplicationContext
@@ -12,6 +14,7 @@ import kotlinx.coroutines.flow.map
import org.json.JSONObject
import ru.stenfredd.movies.core.jellyfin.JellyfinSession
import ru.stenfredd.movies.playback.api.SubtitleStyle
import ru.stenfredd.movies.playback.api.VideoPathSwitchable
import timber.log.Timber
import java.util.UUID
import javax.inject.Inject
@@ -32,12 +35,22 @@ data class TrackPick(val language: String?, val name: String?, val codec: String
?.first
}
/**
* Playback defaults from the settings screen, for everyone on this TV (they depend on the TV and the network).
* [maxBitrate] null = the original file; [dolbyVision] = decode Dolby Vision files with the DV decoder.
*/
data class PlaybackDefaults(
val maxBitrate: Int? = null,
val videoPath: VideoPathSwitchable.Mode = VideoPathSwitchable.Mode.AUTO,
val dolbyVision: Boolean = false,
)
/** What the user picked last for a movie or a series. [subtitle] null with [subtitleOff] = subtitles off. */
data class RememberedTracks(val audio: TrackPick?, val subtitle: TrackPick?, val subtitleOff: Boolean)
/**
* Player settings kept on the device: the look of text subtitles (for everyone on this TV) and the tracks chosen
* per movie or series (per account: family members watch with different tracks).
* Player settings kept on the device: the look of text subtitles and the playback defaults (for everyone on this TV),
* and the tracks chosen per movie or series (per account: family members watch with different tracks).
*/
@Singleton
class PlaybackPreferences @Inject constructor(
@@ -52,6 +65,24 @@ class PlaybackPreferences @Inject constructor(
context.playbackStore.edit { it[KEY_SUBTITLE_STYLE] = "${style.size}|${style.color}|${style.background}" }
}
val defaults: Flow<PlaybackDefaults> = context.playbackStore.data.map { prefs ->
PlaybackDefaults(
maxBitrate = prefs[KEY_MAX_BITRATE]?.takeIf { it > 0 },
videoPath = prefs[KEY_VIDEO_PATH]?.let { runCatching { VideoPathSwitchable.Mode.valueOf(it) }.getOrNull() } ?: VideoPathSwitchable.Mode.AUTO,
dolbyVision = prefs[KEY_DOLBY_VISION] ?: false,
)
}
suspend fun defaults(): PlaybackDefaults = defaults.first()
suspend fun setDefaults(defaults: PlaybackDefaults) {
context.playbackStore.edit {
it[KEY_MAX_BITRATE] = defaults.maxBitrate ?: 0
it[KEY_VIDEO_PATH] = defaults.videoPath.name
it[KEY_DOLBY_VISION] = defaults.dolbyVision
}
}
/** [key]: the series of an episode, else the item itself. */
suspend fun tracks(key: UUID): RememberedTracks? {
val raw = context.playbackStore.data.first()[tracksKey(key) ?: return null] ?: return null
@@ -104,5 +135,8 @@ class PlaybackPreferences @Inject constructor(
private companion object {
val KEY_SUBTITLE_STYLE = stringPreferencesKey("subtitle_style")
val KEY_MAX_BITRATE = intPreferencesKey("max_bitrate")
val KEY_VIDEO_PATH = stringPreferencesKey("video_path")
val KEY_DOLBY_VISION = booleanPreferencesKey("dolby_vision")
}
}

18
playback/core/src/main/kotlin/ru/stenfredd/movies/playback/core/PlaybackSession.kt
View File

@@ -127,12 +127,16 @@ class PlaybackSession(
private var transcodeTried = false
private var nextVideoPath: VideoPathSwitchable.Mode? = null
private var nextDolbyVision: Boolean? = null
/** Set by [switchToAuto]: the next engine keeps its own default decoder choice instead of the old engine's. */
/** Set by [switchToAuto]: the next engine gets the default decoder choice instead of the old engine's. */
private var defaultDolbyVision = false
/** Settings screen defaults, read at [start]. */
private var defaults = PlaybackDefaults()
/** The user picked the engine: the stall watchdog only logs instead of switching away from their choice. */
private var manualEngine = false
private var lastSeekAt = 0L
private var maxBitrate: Int? = null
/** [setMaxBitrate] was called before [start] (quality kept from the previous episode): the default doesn't apply. */
private var maxBitrateSet = false
private var subtitleStyle = SubtitleStyle()
private var subtitleLift = 0f
@@ -160,6 +164,11 @@ class PlaybackSession(
item = session.call { libraryApi.getItem(itemId, user.userId).content }
source = item.mediaSources?.firstOrNull() ?: error("У элемента нет медиаисточников")
subtitleStyle = prefs.subtitleStyle()
defaults = prefs.defaults()
if (!maxBitrateSet) {
maxBitrate = defaults.maxBitrate
_state.update { it.copy(maxBitrate = maxBitrate) }
}
selection = streams ?: rememberedSelection() ?: StreamSelection(source.defaultAudioStreamIndex, source.defaultSubtitleStreamIndex)
val startMs = startFraction?.let { ((item.runTimeTicks ?: 0) / TICKS_PER_MS * it).toLong() } ?: startPositionMs
ranking = selector.rank(source, selection, device)
@@ -250,6 +259,7 @@ class PlaybackSession(
/** Quality: null = original (direct play where possible), else the server transcodes down to [bitrate]. */
fun setMaxBitrate(bitrate: Int?) {
maxBitrateSet = true
if (bitrate == maxBitrate) return
maxBitrate = bitrate
_state.update { it.copy(maxBitrate = bitrate) }
@@ -317,7 +327,7 @@ class PlaybackSession(
scope.launch {
tried.clear()
transcodeTried = false
nextVideoPath = VideoPathSwitchable.Mode.AUTO
nextVideoPath = defaults.videoPath
nextDolbyVision = null
defaultDolbyVision = true
manualEngine = false
@@ -423,9 +433,9 @@ class PlaybackSession(
.map { ExternalSubtitle(it.index, session.authorizedUrl(it.deliveryUrl!!), it.codec, it.language, it.displayTitle) }
val newEngine = provider.create(device)
nextVideoPath?.let { (newEngine as? VideoPathSwitchable)?.setVideoPathMode(it) }
(newEngine as? VideoPathSwitchable)?.setVideoPathMode(nextVideoPath ?: defaults.videoPath)
nextVideoPath = null
nextDolbyVision?.let { (newEngine as? DolbyVisionSwitchable)?.useDolbyVisionDecoder = it }
(newEngine as? DolbyVisionSwitchable)?.useDolbyVisionDecoder = nextDolbyVision ?: defaults.dolbyVision
(newEngine as? SubtitleStyleable)?.let {
it.setSubtitleStyle(subtitleStyle)
it.setSubtitleLift(subtitleLift)