Author: Adam Evyčędo <git@apiote.xyz>
Merge branch 'develop' into translations
%!v(PANIC=String method: strings: negative Repeat count)
diff --git a/LICENSES/AGPL-3.0-or-later.txt b/LICENSES/AGPL-3.0-or-later.txt new file mode 100644 index 0000000000000000000000000000000000000000..0c97efd25b5974b974ed9a8a18207bc4f55bb338 --- /dev/null +++ b/LICENSES/AGPL-3.0-or-later.txt @@ -0,0 +1,235 @@ +GNU AFFERO GENERAL PUBLIC LICENSE +Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + + Preamble + +The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are 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. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. + +A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public. + +The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version. + +An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license. + +The precise terms and conditions for copying, distribution and modification follow. + + TERMS AND CONDITIONS + +0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based on the Program. + +To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. + +1. Source Code. +The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. + +A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. + +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". + + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. +"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. + +8. Termination. + +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. + +11. Patents. + +A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. + +13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. + +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License. + +14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + +If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements. + +You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see <http://www.gnu.org/licenses/>. diff --git a/app/build.gradle b/app/build.gradle index faa8684e2576949773a42f3d141acb52524496c0..87a703a70ac8b7d7748fc9a3266cba2be6a994fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' id "org.jetbrains.kotlin.plugin.parcelize" + id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.22' } android { @@ -60,12 +61,14 @@ implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.core:core-splashscreen:1.0.1' implementation 'com.google.openlocationcode:openlocationcode:1.0.4' - implementation 'org.osmdroid:osmdroid-android:6.1.16' + implementation 'org.osmdroid:osmdroid-android:6.1.18' implementation 'org.yaml:snakeyaml:2.2' implementation 'androidx.activity:activity-ktx:1.8.2' implementation 'com.google.openlocationcode:openlocationcode:1.0.4' implementation 'com.otaliastudios:zoomlayout:1.9.0' implementation 'dev.bandb.graphview:graphview:0.8.1' + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3' + implementation 'com.github.jershell:kbson:0.5.0' implementation project(path: ':fruchtfleisch') diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/AboutActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/AboutActivity.kt index f6a08ac8f9b39c3cd16fe97e934301c3dc48a66c..6bdc0ca3bfbf0fd215f0d4df8e0beeea3f1cc3f0 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/AboutActivity.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/AboutActivity.kt @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: Adam Evyčędo +// +// SPDX-License-Identifier: GPL-3.0-or-later + package xyz.apiote.bimba.czwek import android.os.Bundle @@ -8,4 +12,4 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_about) } -} \ No newline at end of file +} diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt index 584ad9f9a4a1dbe03008e246eaa9b62800aaa690..64e559277e1b76d14ecfe65b0746196cbe9e9e57 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt @@ -10,6 +10,7 @@ import android.net.ConnectivityManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import xyz.apiote.bimba.czwek.R +import xyz.apiote.bimba.czwek.settings.feeds.FeedsSettings import java.io.IOException import java.io.InputStream import java.net.HttpURLConnection @@ -20,15 +21,17 @@ // todo [3.2] constants // todo [3.2] split api files to classes files -data class Server(val host: String, val token: String, val feeds: String, val apiPath: String) { +data class Server( + val host: String, + val token: String, + val feeds: FeedsSettings, + val apiPath: String +) { companion object { fun get(context: Context): Server { val preferences = context.getSharedPreferences("shp", MODE_PRIVATE) val apiPath = preferences.getString("apiPath", "")!! - val feeds = context.getSharedPreferences( - URLEncoder.encode(apiPath, "utf-8"), - MODE_PRIVATE - ).all.filter { it.value as Boolean }.keys.joinToString(",") + val feeds = FeedsSettings.load(context, apiPath) val host = preferences.getString("host", "bimba.apiote.xyz")!! return Server( host, preferences.getString("token", "")!!, @@ -69,11 +72,19 @@ val params = mutableMapOf("q" to query) if (limit != null) { params["limit"] = limit.toString() } - return request(server, "queryables", null, params, cm, arrayOf(1u, 2u, 0u), null) + return request(server, "queryables", null, params, cm, arrayOf(1u, 2u), null) } suspend fun locateQueryables(cm: ConnectivityManager, server: Server, near: PositionV1): Result { - return request(server, "queryables", null, mapOf("near" to near.toString()), cm, arrayOf(1u, 2u, 0u), null) + return request( + server, + "queryables", + null, + mapOf("near" to near.toString()), + cm, + arrayOf(1u, 2u), + null + ) } suspend fun getLocatablesIn( @@ -85,13 +96,13 @@ "locatables", null, mapOf("lb" to bl.toString(), "rt" to tr.toString()), cm, - arrayOf(1u, 2u, 0u), + arrayOf(1u, 2u), null ) } suspend fun getLine(cm: ConnectivityManager, server: Server, feedID: String, line: String): Result { - return request(server, "lines", line, mapOf(), cm, arrayOf(1u, 0u), feedID) + return request(server, "lines", line, mapOf(), cm, arrayOf(1u), feedID) } suspend fun getDepartures( @@ -101,7 +112,7 @@ val params = mutableMapOf("code" to stop) if (line != null) { params["line"] = line } - return request(server, "departures", null, params, cm, arrayOf(1u, 2u, 0u), feedID) + return request(server, "departures", null, params, cm, arrayOf(1u, 2u), feedID) } suspend fun rawRequest( @@ -151,7 +162,7 @@ feeds: String? ): Result { return withContext(Dispatchers.IO) { val url = URL( // todo [3.2] scheme, host, path, constructed query - "${server.apiPath}/${feeds?.ifEmpty { server.feeds } ?: server.feeds}/$resource${ + "${server.apiPath}/${feeds?.ifEmpty { server.feeds.getIDs() } ?: server.feeds.getIDs()}/$resource${ if (item == null) { "" } else { diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/FeedInfo.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/FeedInfo.kt index 2c0a32b987c56bb3f2d0f3519b5913fcf3f96b8f..1fa2441c7970d7b4f33372e1920198ecbc87ed22 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/FeedInfo.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/FeedInfo.kt @@ -9,8 +9,6 @@ import java.io.InputStream import java.time.LocalDate import java.time.ZonedDateTime import java.time.format.DateTimeFormatter -import java.time.format.FormatStyle -import java.util.Locale data class FeedInfoV2( val name: String, @@ -41,12 +39,6 @@ LocalDate.parse(reader.readString(), DateTimeFormatter.BASIC_ISO_DATE) ) } } - - fun formatDate(): String { - return lastUpdate.format( - DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).withLocale(Locale.getDefault()) - ) - } } data class FeedInfoV1( @@ -67,11 +59,5 @@ reader.readString(), ZonedDateTime.parse(reader.readString(), DateTimeFormatter.ISO_DATE_TIME) ) } - } - - fun formatDate(): String { - return lastUpdate.format( - DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).withLocale(Locale.getDefault()) - ) } } diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/QrLocation.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/QrLocation.kt index 5e5638080b867f40f39f52b05c081e3d8fd07097..5c156fed8ce24c538cb2d0d498ef765a9e2f1406 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/QrLocation.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/structs/QrLocation.kt @@ -10,13 +10,13 @@ enum class QrLocationV1 { UNKNOWN, NONE, PATH, QUERY; companion object { - fun of(type: UInt): QrLocationV1 { - return when (type) { + fun of(q: UInt): QrLocationV1 { + return when (q) { 0u -> UNKNOWN 1u -> NONE 2u -> PATH 3u -> QUERY - else -> throw UnknownResourceVersionException("QrLocation/$type", 1u) + else -> throw UnknownResourceVersionException("QrLocation/$q", 1u) } } } diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/onboarding/FirstRunActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/onboarding/FirstRunActivity.kt index f31697493a0ffc202fb0e871ff35df4ab97bb1aa..f8be699529927e36494d50aa63eeeb58f94595f1 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/onboarding/FirstRunActivity.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/onboarding/FirstRunActivity.kt @@ -5,10 +5,11 @@ package xyz.apiote.bimba.czwek.onboarding import android.content.Intent -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import xyz.apiote.bimba.czwek.dashboard.MainActivity +import xyz.apiote.bimba.czwek.settings.feeds.migrateFeedsSettings class FirstRunActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -16,6 +17,9 @@ installSplashScreen() super.onCreate(savedInstanceState) val preferences = getSharedPreferences("shp", MODE_PRIVATE) + + migrateFeedsSettings(this) + val intent = if (preferences.getBoolean("firstRun", true)) { Intent(this, OnboardingActivity::class.java) } else { @@ -24,4 +28,5 @@ } startActivity(intent) finish() } + } \ No newline at end of file diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/FeedInfo.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/FeedInfo.kt new file mode 100644 index 0000000000000000000000000000000000000000..abf0ba7c8cb21b07c003e68828ba78ab11ef6e3b --- /dev/null +++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/FeedInfo.kt @@ -0,0 +1,81 @@ +// SPDX-FileCopyrightText: Adam Evyčędo +// +// SPDX-License-Identifier: GPL-3.0-or-later + +package xyz.apiote.bimba.czwek.repo + +import xyz.apiote.bimba.czwek.api.structs.FeedInfoV1 +import xyz.apiote.bimba.czwek.api.structs.FeedInfoV2 +import java.time.LocalDate +import java.time.format.DateTimeFormatter +import java.time.format.FormatStyle +import java.util.Locale + +data class FeedInfo( + val id: String, + val name: String, + val attribution: String, + val description: String, + val lastUpdate: LocalDate, + val qrHost: String, + val qrIn: QrLocation, + val qrSelector: String, + val validSince: LocalDate?, + val validTill: LocalDate?, + val cached: Boolean +) { + constructor(f: FeedInfoV2, cached: Boolean = false) : this( + f.id, + f.name, + f.attribution, + f.description, + f.lastUpdate, + f.qrHost, + QrLocation.of(f.qrIn), + f.qrSelector, + f.validSince, + f.validTill, + cached + ) + + constructor(f: FeedInfoV1, cached: Boolean = false) : this( + f.id, + f.name, + f.attribution, + f.description, + f.lastUpdate.toLocalDate(), + "", + QrLocation.UNKNOWN, + "", + null, + null, + cached + ) + + fun formatDate(): String { + return lastUpdate.format( + DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).withLocale(Locale.getDefault()) + ) + } +} + +fun FeedInfo?.join(other: FeedInfo?): FeedInfo { + assert(this != null || other != null) + + if (this == null) return other!! + if (other == null) return this + + return FeedInfo( + id, + other.name, + other.attribution, + other.description, + if (lastUpdate.isAfter(other.lastUpdate)) lastUpdate else other.lastUpdate, + other.qrHost, + other.qrIn, + other.qrSelector, + if (validSince == null || validSince.isAfter(other.validSince)) validSince else other.validSince, + if (validTill == null || validTill.isAfter(other.validTill)) validTill else other.validTill, + this.cached && other.cached + ) +} diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt index 3b9773fa6bb1cb6352b3a42d4b16db6d3b10ec7a..129f23f0d2228b0b333c907d06de39bd76d994e6 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt @@ -7,6 +7,7 @@ import android.content.Context import android.graphics.drawable.Drawable import android.net.ConnectivityManager +import xyz.apiote.bimba.czwek.api.Server interface Queryable interface Locatable { @@ -16,6 +17,11 @@ fun id(): String } interface Repository { + suspend fun getFeeds( + server: Server, + context: Context + ): Map<String, FeedInfo>? + suspend fun getDepartures( cm: ConnectivityManager, feedID: String, diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OfflineRepository.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OfflineRepository.kt new file mode 100644 index 0000000000000000000000000000000000000000..750cf0d4bc662994915fad370e5db855265362c8 --- /dev/null +++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OfflineRepository.kt @@ -0,0 +1,102 @@ +// SPDX-FileCopyrightText: Adam Evyčędo +// +// SPDX-License-Identifier: GPL-3.0-or-later + +package xyz.apiote.bimba.czwek.repo + +import android.content.Context +import android.net.ConnectivityManager +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import xyz.apiote.bimba.czwek.api.Server +import xyz.apiote.bimba.czwek.api.responses.FeedsResponse +import xyz.apiote.bimba.czwek.api.responses.FeedsResponseDev +import xyz.apiote.bimba.czwek.api.responses.FeedsResponseV1 +import xyz.apiote.bimba.czwek.api.responses.FeedsResponseV2 +import java.io.File +import java.io.FileInputStream +import java.net.URLEncoder + +class OfflineRepository : Repository { + override suspend fun getFeeds( + server: Server, + context: Context + ): Map<String, FeedInfo>? { + val file = File( + context.cacheDir, URLEncoder.encode(server.apiPath, "utf-8") + ) + if (!file.exists()) { + return emptyMap() + } + return when (val response = + withContext(Dispatchers.IO) { FeedsResponse.unmarshal(FileInputStream(file)) }) { + is FeedsResponseDev -> response.feeds.associate { + Pair( + it.id, + FeedInfo(it).copy(cached = true) + ) + } + + is FeedsResponseV2 -> response.feeds.associate { + Pair( + it.id, + FeedInfo(it).copy(cached = true) + ) + } + + is FeedsResponseV1 -> response.feeds.associate { + Pair( + it.id, + FeedInfo(it).copy(cached = true) + ) + } + + else -> null + } + } + + override suspend fun getDepartures( + cm: ConnectivityManager, + feedID: String, + stop: String, + line: String?, + context: Context + ): StopDepartures? { + TODO("Not yet implemented") + } + + override suspend fun getLocatablesIn( + cm: ConnectivityManager, + bl: Position, + tr: Position, + context: Context + ): List<Locatable>? { + TODO("Not yet implemented") + } + + override suspend fun getLine( + cm: ConnectivityManager, + feedID: String, + line: String, + context: Context + ): Line? { + TODO("Not yet implemented") + } + + override suspend fun queryQueryables( + cm: ConnectivityManager, + query: String, + context: Context + ): List<Queryable>? { + TODO("Not yet implemented") + } + + override suspend fun locateQueryables( + cm: ConnectivityManager, + position: Position, + context: Context + ): List<Queryable>? { + TODO("Not yet implemented") + } + +} diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt index c255ef89be2df8238f0189d7befa70612336d1e9..a8ba9ac65b2c6ea37f18ac2cd45c386aeee935c3 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt @@ -24,6 +24,10 @@ import xyz.apiote.bimba.czwek.api.responses.DeparturesResponseV1 import xyz.apiote.bimba.czwek.api.responses.DeparturesResponseV2 import xyz.apiote.bimba.czwek.api.responses.DeparturesResponseV3 import xyz.apiote.bimba.czwek.api.responses.ErrorResponse +import xyz.apiote.bimba.czwek.api.responses.FeedsResponse +import xyz.apiote.bimba.czwek.api.responses.FeedsResponseDev +import xyz.apiote.bimba.czwek.api.responses.FeedsResponseV1 +import xyz.apiote.bimba.czwek.api.responses.FeedsResponseV2 import xyz.apiote.bimba.czwek.api.responses.LineResponse import xyz.apiote.bimba.czwek.api.responses.LineResponseDev import xyz.apiote.bimba.czwek.api.responses.LineResponseV1 @@ -38,10 +42,47 @@ import xyz.apiote.bimba.czwek.api.responses.QueryablesResponseDev import xyz.apiote.bimba.czwek.api.responses.QueryablesResponseV1 import xyz.apiote.bimba.czwek.api.responses.QueryablesResponseV2 import xyz.apiote.bimba.czwek.api.responses.QueryablesResponseV3 +import java.io.File +import java.net.URLEncoder // todo [3.2] in Repository check if responses are BARE or HTML class OnlineRepository : Repository { + private fun saveFeedCache(server: Server, context: Context, rawResponse: ByteArray) { + val file = File( + context.cacheDir, URLEncoder.encode(server.apiPath, "utf-8") + ) + file.writeBytes(rawResponse) + } + + override suspend fun getFeeds( + server: Server, + context: Context + ): Map<String, FeedInfo>? { + val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + val result = + xyz.apiote.bimba.czwek.api.getFeeds(cm, server) + if (result.error != null) { + if (result.stream != null) { + val response = withContext(Dispatchers.IO) { ErrorResponse.unmarshal(result.stream) } + throw TrafficResponseException(result.error.statusCode, response.message, result.error) + } else { + throw TrafficResponseException(result.error.statusCode, "", result.error) + } + } else { + val rawResponse = result.stream!!.readBytes() + saveFeedCache(server, context, rawResponse) + return when (val response = + withContext(Dispatchers.IO) { FeedsResponse.unmarshal(rawResponse.inputStream()) }) { + is FeedsResponseDev -> response.feeds.associate { Pair(it.id, FeedInfo(it)) } + is FeedsResponseV2 -> response.feeds.associate { Pair(it.id, FeedInfo(it)) } + is FeedsResponseV1 -> response.feeds.associate { Pair(it.id, FeedInfo(it)) } + + else -> null + } + } + } + override suspend fun getDepartures( cm: ConnectivityManager, feedID: String, diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/QrLocation.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/QrLocation.kt new file mode 100644 index 0000000000000000000000000000000000000000..93d5932ed09463d59ff583a66727df435461f03e --- /dev/null +++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/QrLocation.kt @@ -0,0 +1,23 @@ +// SPDX-FileCopyrightText: Adam Evyčędo +// +// SPDX-License-Identifier: GPL-3.0-or-later + +package xyz.apiote.bimba.czwek.repo + +import xyz.apiote.bimba.czwek.api.structs.QrLocationV1 + + +enum class QrLocation { + UNKNOWN, NONE, PATH, QUERY; + + companion object { + fun of(q: QrLocationV1): QrLocation { + return when (q) { + QrLocationV1.UNKNOWN -> UNKNOWN + QrLocationV1.NONE -> NONE + QrLocationV1.PATH -> PATH + QrLocationV1.QUERY -> QUERY + } + } + } +} diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt index 738ddb51901fac957d61745053b13935fa4a290e..2642ac78ca1681506a386eba7c3b4d7a86bea3ab 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt @@ -4,9 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later package xyz.apiote.bimba.czwek.settings.feeds -import android.content.Context import android.content.Intent -import android.net.ConnectivityManager import android.os.Bundle import android.util.Log import android.view.View @@ -14,19 +12,20 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.edit import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import xyz.apiote.bimba.czwek.api.ErrorResponse -import xyz.apiote.bimba.czwek.api.FeedInfoV1 -import xyz.apiote.bimba.czwek.api.FeedsResponse -import xyz.apiote.bimba.czwek.api.FeedsResponseDev -import xyz.apiote.bimba.czwek.api.FeedsResponseV1 +import xyz.apiote.bimba.czwek.R import xyz.apiote.bimba.czwek.api.Server -import xyz.apiote.bimba.czwek.api.getFeeds import xyz.apiote.bimba.czwek.dashboard.MainActivity import xyz.apiote.bimba.czwek.databinding.ActivityFeedChooserBinding +import xyz.apiote.bimba.czwek.repo.FeedInfo +import xyz.apiote.bimba.czwek.repo.OfflineRepository +import xyz.apiote.bimba.czwek.repo.OnlineRepository +import xyz.apiote.bimba.czwek.repo.TrafficResponseException +import xyz.apiote.bimba.czwek.repo.join + +// TODO on internet connection -> getServer +// TODO swipe to refresh? class FeedChooserActivity : AppCompatActivity() { private var _binding: ActivityFeedChooserBinding? = null @@ -34,11 +33,17 @@ private val binding get() = _binding!! private lateinit var adapter: BimbaFeedInfoAdapter + private val feeds: MutableMap<String, FeedInfo> = mutableMapOf() + private lateinit var feedsSettings: FeedsSettings + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) _binding = ActivityFeedChooserBinding.inflate(layoutInflater) setContentView(binding.root) + migrateFeedsSettings(this) + feedsSettings = FeedsSettings.load(this, Server.get(this).apiPath) + setUpRecycler() getServer() @@ -49,9 +54,29 @@ } private fun setUpRecycler() { binding.resultsRecycler.layoutManager = LinearLayoutManager(this) - adapter = BimbaFeedInfoAdapter(layoutInflater, listOf(), this) { - FeedBottomSheet(it).show(supportFragmentManager, FeedBottomSheet.TAG) - } + adapter = + BimbaFeedInfoAdapter( + layoutInflater, + feeds.map { it.value }.sortedBy { it.name }, + feedsSettings, + this, + { feedID -> + FeedBottomSheet(feeds[feedID]!!, feedsSettings.settings[feedID]) { + if (it != null) { + feedsSettings.settings[feedID] = it + updateItems(null, feedsSettings, false) + adapter.notifyItemChanged(adapter.getItemPosition(feedID)) + } + }.show(supportFragmentManager, FeedBottomSheet.TAG) + }, + { feedID, isEnabled -> + feedsSettings.settings[feedID] = + feedsSettings.settings[feedID]?.copy(enabled = isEnabled) ?: FeedSettings( + enabled = false, + useOnline = true + ) + updateItems(null, feedsSettings, false) + }) binding.resultsRecycler.adapter = adapter } @@ -60,32 +85,33 @@ binding.progress.visibility = View.VISIBLE binding.resultsRecycler.visibility = View.GONE MainScope().launch { - val cm = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - Log.i("FeedChooser", "${Server.get(this@FeedChooserActivity)}") - val result = getFeeds(cm, Server.get(this@FeedChooserActivity)) - if (result.error != null) { - showError(result.error.imageResource, result.error.stringResource) - if (result.stream != null) { - val response = withContext(Dispatchers.IO) {ErrorResponse.unmarshal(result.stream)} - Log.w("FeedChooser", "${result.error.statusCode}, ${response.message}") - } else { - Log.w( - "FeedChooser", - "${result.error.statusCode}, ${getString(result.error.stringResource)}" - ) + val offlineRepository = OfflineRepository() + val offlineFeeds = + offlineRepository.getFeeds(Server.get(this@FeedChooserActivity), this@FeedChooserActivity) + if (!offlineFeeds.isNullOrEmpty()) { + feeds.putAll(offlineFeeds) + updateItems(offlineFeeds.map { it.value }, null) + } + try { + val repository = OnlineRepository() + val onlineFeeds = + repository.getFeeds(Server.get(this@FeedChooserActivity), this@FeedChooserActivity) + feeds.clear() + joinFeeds(offlineFeeds, onlineFeeds).let { joinedFeeds -> + feeds.putAll(joinedFeeds) + updateItems(joinedFeeds.map { it.value }, null) } - return@launch + } catch (e: TrafficResponseException) { + if (offlineFeeds.isNullOrEmpty()) { + showError(e.error.imageResource, e.error.stringResource) + } + Log.e("Feeds", "$e") } - val feeds = when (val response = withContext(Dispatchers.IO) {FeedsResponse.unmarshal(result.stream!!)}) { - is FeedsResponseDev -> response.feeds - is FeedsResponseV1 -> response.feeds - else -> null - } - updateItems(feeds!!) } } private fun moveOn() { + feedsSettings.save(this, Server.get(this)) val preferences = getSharedPreferences("shp", MODE_PRIVATE) preferences.edit(true) { putBoolean("inFeedsTransaction", false) @@ -111,10 +137,35 @@ } } - private fun updateItems(feeds: List<FeedInfoV1>) { + private fun joinFeeds( + feeds1: Map<String, FeedInfo>?, + feeds2: Map<String, FeedInfo>? + ): Map<String, FeedInfo> { + if (feeds1.isNullOrEmpty() && feeds2.isNullOrEmpty()) { + return emptyMap() + } + + if (feeds1.isNullOrEmpty()) { + return feeds2!! + } + if (feeds2.isNullOrEmpty()) { + return feeds1 + } + + return feeds1.keys.union(feeds2.keys).associateWith { feeds1[it].join(feeds2[it]) } + } + + private fun updateItems( + feeds: List<FeedInfo>?, + feedsSettings: FeedsSettings?, + notify: Boolean = true + ) { binding.feedsOverlay.visibility = View.GONE binding.resultsRecycler.visibility = View.VISIBLE binding.button.visibility = View.VISIBLE - adapter.update(feeds) + adapter.update(feeds, feedsSettings, notify) + if (feeds?.isEmpty() == true) { + showError(R.drawable.error_search, R.string.error_404) + } } } \ No newline at end of file diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt index 411670ac2e459583856c16d96c7582fafc0ffd37..0ba9ada8523ff57245310e2197ac5d2476485d1f 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt @@ -6,44 +6,58 @@ package xyz.apiote.bimba.czwek.settings.feeds import android.annotation.SuppressLint import android.content.Context -import android.content.Context.MODE_PRIVATE +import android.content.DialogInterface import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import androidx.core.content.edit import androidx.recyclerview.widget.RecyclerView import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import com.google.android.material.divider.MaterialDivider import com.google.android.material.materialswitch.MaterialSwitch +import com.google.android.material.textview.MaterialTextView import xyz.apiote.bimba.czwek.R -import xyz.apiote.bimba.czwek.api.FeedInfoV1 -import xyz.apiote.bimba.czwek.api.Server -import java.net.URLEncoder +import xyz.apiote.bimba.czwek.repo.FeedInfo +import java.time.format.DateTimeFormatter class BimbaFeedInfoViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { val root: View = itemView.findViewById(R.id.feed) val switch: MaterialSwitch = itemView.findViewById(R.id.feed_switch) val name: TextView = itemView.findViewById(R.id.feed_name) + val divider: MaterialDivider = itemView.findViewById(R.id.divider) companion object { fun bind( - feed: FeedInfoV1, + feed: FeedInfo, + feedSettings: FeedSettings?, + holder: BimbaFeedInfoViewHolder?, context: Context, - holder: BimbaFeedInfoViewHolder?, - onClickListener: (FeedInfoV1) -> Unit + onClickListener: (String) -> Unit, + onCheckedChangeListener: (String, Boolean) -> Unit ) { - val shp = context.getSharedPreferences(URLEncoder.encode(Server.get(context).apiPath, "utf-8"), MODE_PRIVATE) + val colorAttr = if (feed.cached) { + com.google.android.material.R.attr.colorOnSurfaceVariant + } else { + com.google.android.material.R.attr.colorOnSurface + } + holder?.name?.setTextColor( + context.theme.obtainStyledAttributes( + R.style.Theme_Bimba, intArrayOf(colorAttr) + ).getColor(0, 0) + ) holder?.root?.setOnClickListener { - onClickListener(feed) + onClickListener(feed.id) } holder?.name?.text = feed.name - holder?.switch?.apply { - isChecked = shp.getBoolean(feed.id, false) - setOnCheckedChangeListener { _, isChecked -> - shp.edit(true) { - putBoolean(feed.id, isChecked) + if (feedSettings != null) { + holder?.divider?.visibility = View.VISIBLE + holder?.switch?.apply { + visibility = View.VISIBLE + isChecked = feedSettings.enabled + setOnCheckedChangeListener { _, isChecked -> + onCheckedChangeListener(feed.id, isChecked) } } } @@ -53,9 +67,11 @@ } class BimbaFeedInfoAdapter( private val inflater: LayoutInflater, - private var feeds: List<FeedInfoV1>, + private var feeds: List<FeedInfo>, + private var feedsSettings: FeedsSettings, private val context: Context, - private val onClickListener: ((FeedInfoV1) -> Unit) + private val onClickListener: ((String) -> Unit), + private val onEnabledChangedListener: ((String, Boolean) -> Unit) ) : RecyclerView.Adapter<BimbaFeedInfoViewHolder>() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BimbaFeedInfoViewHolder { @@ -64,19 +80,43 @@ return BimbaFeedInfoViewHolder(rowView) } override fun onBindViewHolder(holder: BimbaFeedInfoViewHolder, position: Int) { - BimbaFeedInfoViewHolder.bind(feeds[position], context, holder, onClickListener) + val feed = feeds[position] + BimbaFeedInfoViewHolder.bind( + feed, + feedsSettings.settings[feed.id], + holder, + context, + onClickListener, + onEnabledChangedListener + ) } override fun getItemCount(): Int = feeds.size + fun getItemPosition(feedID: String): Int { + return feeds.indexOfFirst { it.id == feedID } + } + @SuppressLint("NotifyDataSetChanged") // todo [3.2] DiffUtil - fun update(items: List<FeedInfoV1>) { - feeds = items.sortedBy { it.name } - notifyDataSetChanged() + fun update(items: List<FeedInfo>?, settings: FeedsSettings?, notify: Boolean) { + if (items != null) { + feeds = items.sortedBy { it.name } + } + if (settings != null) { + feedsSettings = settings + } + if (notify) { + notifyDataSetChanged() + } } } -class FeedBottomSheet(private var feed: FeedInfoV1) : BottomSheetDialogFragment() { +class FeedBottomSheet( + private var feed: FeedInfo, + private var settings: FeedSettings?, + private val onDismiss: (FeedSettings?) -> Unit +) : + BottomSheetDialogFragment() { companion object { const val TAG = "DepartureBottomSheet" } @@ -87,11 +127,41 @@ container: ViewGroup?, savedInstanceState: Bundle? ): View { val content = inflater.inflate(R.layout.feed_bottom_sheet, container, false) - content.findViewById<TextView>(R.id.title).text = feed.name - content.findViewById<TextView>(R.id.description).text = feed.description - content.findViewById<TextView>(R.id.attribution).text = feed.attribution - content.findViewById<TextView>(R.id.update_time).text = + content.findViewById<MaterialTextView>(R.id.title).text = feed.name + content.findViewById<MaterialTextView>(R.id.description).text = feed.description + content.findViewById<MaterialTextView>(R.id.outdated_info_warning).visibility = + if (feed.cached) { + View.VISIBLE + } else { + View.GONE + } + if (feed.validSince != null && feed.validTill != null) { + content.findViewById<MaterialTextView>(R.id.timetable_validity).apply { + visibility = View.VISIBLE + text = getString( + R.string.current_timetable_validity, + feed.validSince!!.format(DateTimeFormatter.ISO_LOCAL_DATE), + feed.validTill!!.format(DateTimeFormatter.ISO_LOCAL_DATE) + ) + } + } + content.findViewById<MaterialTextView>(R.id.attribution).text = feed.attribution + content.findViewById<MaterialTextView>(R.id.update_time).text = getString(R.string.last_update, feed.formatDate()) + content.findViewById<MaterialSwitch>(R.id.onlineSwitch).apply { + isChecked = settings?.useOnline ?: false + setOnCheckedChangeListener { _, isChecked -> + settings = settings?.copy(useOnline = isChecked) ?: FeedSettings( + enabled = true, + useOnline = isChecked + ) + } + } return content + } + + override fun onDismiss(dialog: DialogInterface) { + onDismiss(settings) + super.onDismiss(dialog) } } \ No newline at end of file diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedSettings.kt b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedSettings.kt new file mode 100644 index 0000000000000000000000000000000000000000..9412dd8b17cd21c2ad90fd6448ec7acbbe4dbec9 --- /dev/null +++ b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedSettings.kt @@ -0,0 +1,69 @@ +// SPDX-FileCopyrightText: Adam Evyčędo +// +// SPDX-License-Identifier: GPL-3.0-or-later + +package xyz.apiote.bimba.czwek.settings.feeds + +import android.content.Context +import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.edit +import com.github.jershell.kbson.KBson +import kotlinx.serialization.Serializable +import xyz.apiote.bimba.czwek.api.Server +import java.net.URLEncoder + +@Serializable +@OptIn(ExperimentalStdlibApi::class) +data class FeedsSettings(val settings: MutableMap<String, FeedSettings>) { + fun getIDs() = settings.filter { it.value.enabled }.keys.joinToString(",") + + fun save(context: Context, server: Server) { + val doc = KBson().dump(serializer(), this).toHexString() + val feedsPreferences = + context.getSharedPreferences("feeds_settings", AppCompatActivity.MODE_PRIVATE) + feedsPreferences.edit { + val key = URLEncoder.encode(server.apiPath, "utf-8") + putString(key, doc) + } + } + + companion object { + fun load(context: Context, apiPath: String): FeedsSettings { + val doc = context.getSharedPreferences( + "feeds_settings", + Context.MODE_PRIVATE + ).getString(URLEncoder.encode(apiPath, "utf-8"), null) + return doc?.let { KBson().load(serializer(), doc.hexToByteArray()) } ?: FeedsSettings( + mutableMapOf() + ) + } + } +} + +@Serializable +data class FeedSettings( + val enabled: Boolean, + val useOnline: Boolean +) + +fun migrateFeedsSettings(context: Context, server: Server = Server.get(context)) { + val shp = + context.getSharedPreferences( + URLEncoder.encode(server.apiPath, "utf-8"), + AppCompatActivity.MODE_PRIVATE + ) + if (shp.all.isEmpty()) { + return + } + + val feedsSettings = FeedsSettings(mutableMapOf()) + shp.all.forEach { (feedID, enabled) -> + if (enabled as Boolean) { + feedsSettings.settings[feedID] = FeedSettings(enabled = true, useOnline = true) + } + } + shp.edit { + clear() + } + feedsSettings.save(context, server) +} diff --git a/app/src/main/res/drawable/code.xml b/app/src/main/res/drawable/code.xml index 3f6bdc053e65936ee69282027d522c7f37810d3b..46d1c31d5e12eda8c4d33606fe8f8f8f5317109e 100644 --- a/app/src/main/res/drawable/code.xml +++ b/app/src/main/res/drawable/code.xml @@ -1,3 +1,9 @@ +<!-- +SPDX-FileCopyrightText: Google + +SPDX-License-Identifier: Apache-2.0 +--> + <vector xmlns:android="http://schemas.android.com/apk/res/android" android:tint="?attr/colorOnSurface" android:width="24dp" diff --git a/app/src/main/res/drawable/mastodon.xml b/app/src/main/res/drawable/mastodon.xml index 6dc0ac25eeb3fc0bac6f74620110326f0d40247f..6e43eddefafe250dca70bc437e020ee281f1050b 100644 --- a/app/src/main/res/drawable/mastodon.xml +++ b/app/src/main/res/drawable/mastodon.xml @@ -1,3 +1,9 @@ +<!-- +SPDX-FileCopyrightText: Eugen Rochko & other Mastodon contributors + +SPDX-License-Identifier: AGPL-3.0-or-later +--> + <vector xmlns:android="http://schemas.android.com/apk/res/android" android:tint="?attr/colorOnSurface" android:width="74dp" android:height="79dp" diff --git a/app/src/main/res/drawable/translate.xml b/app/src/main/res/drawable/translate.xml index 3cb0562ed74d831acc8e7169a3014a47ed1e531a..b3fdd82d396280469a48ff06d6f37d6d1e6cd54e 100644 --- a/app/src/main/res/drawable/translate.xml +++ b/app/src/main/res/drawable/translate.xml @@ -1,3 +1,9 @@ +<!-- +SPDX-FileCopyrightText: Google + +SPDX-License-Identifier: Apache-2.0 +--> + <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" diff --git a/app/src/main/res/drawable/website.xml b/app/src/main/res/drawable/website.xml index 9d8ddedf38427156d88e71973d55df551e44d2a3..ae6a4907de0d149dc9121d156e87ff273acadf9f 100644 --- a/app/src/main/res/drawable/website.xml +++ b/app/src/main/res/drawable/website.xml @@ -1,3 +1,9 @@ +<!-- +SPDX-FileCopyrightText: Google + +SPDX-License-Identifier: Apache-2.0 +--> + <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 474ef1e56d4b6241fbf035576c2e02d3f6156cfb..cd8babd727c8641214ec665d3005151cf3f12d2b 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,4 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- +SPDX-FileCopyrightText: Adam Evyčędo + +SPDX-License-Identifier: GPL-3.0-or-later +--> + <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" @@ -118,4 +125,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/links" /> -</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/feed_bottom_sheet.xml b/app/src/main/res/layout/feed_bottom_sheet.xml index c1822e07f849202c3f3bb1674337293a4c8e75d8..bcb47b534c804342efbcdece3b2dee15fa746216 100644 --- a/app/src/main/res/layout/feed_bottom_sheet.xml +++ b/app/src/main/res/layout/feed_bottom_sheet.xml @@ -33,32 +33,91 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tool:text="Poznań ZTM" /> + <com.google.android.material.materialswitch.MaterialSwitch + android:id="@+id/onlineSwitch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + app:layout_constraintBottom_toBottomOf="@+id/onlineSwitchLabel" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/onlineSwitchLabel" /> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/onlineSwitchLabel" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="8dp" + android:labelFor="@id/onlineSwitch" + android:text="@string/use_online_feed" + android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium" + app:layout_constraintEnd_toStartOf="@+id/onlineSwitch" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/title" /> + + <com.google.android.material.divider.MaterialDivider + android:id="@+id/onlineOfflineDivider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:dividerInsetEnd="16dp" + app:dividerInsetStart="16dp" + android:layout_marginTop="16dp" + app:layout_constraintTop_toBottomOf="@+id/onlineSwitch" /> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/outdated_info_warning" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/information_may_be_outdated" + android:textStyle="italic" + android:textAppearance="@style/TextAppearance.Material3.BodySmall" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/onlineOfflineDivider" /> + <com.google.android.material.textview.MaterialTextView android:id="@+id/description" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:layout_marginTop="16dp" android:layout_marginEnd="8dp" + android:layout_marginTop="16dp" android:textAlignment="center" android:textAppearance="@style/TextAppearance.Material3.BodyLarge" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/title" + app:layout_constraintTop_toBottomOf="@+id/outdated_info_warning" tool:text="Feed for Poznań" /> <com.google.android.material.textview.MaterialTextView + android:id="@+id/timetable_validity" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:textAlignment="center" + android:layout_marginEnd="8dp" + android:visibility="gone" + android:layout_marginTop="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" + app:layout_constraintTop_toBottomOf="@+id/description" + tool:text="Current timetable valid: 2024-01-01 to 2024-02-01" /> + + <com.google.android.material.textview.MaterialTextView android:id="@+id/attribution" + android:layout_marginTop="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:layout_marginTop="16dp" android:layout_marginEnd="8dp" android:textAlignment="center" android:textAppearance="@style/TextAppearance.Material3.BodyMedium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/description" + app:layout_constraintTop_toBottomOf="@+id/timetable_validity" tool:text="(c) Poznań" /> <com.google.android.material.textview.MaterialTextView diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index 8544143893824b72108b74e1136f8d9a18833f07..57d1b22fb8aa55e6da9dd91c87f6d22761b9517a 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -8,33 +8,48 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tool="http://schemas.android.com/tools" android:id="@+id/feed" android:layout_width="match_parent" android:layout_height="wrap_content"> <com.google.android.material.textview.MaterialTextView android:id="@+id/feed_name" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:text="" android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/divider" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tool:text="Gravity Falls CBT" /> <com.google.android.material.materialswitch.MaterialSwitch android:id="@+id/feed_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" + android:visibility="invisible" android:layout_marginEnd="16dp" android:layout_marginBottom="16dp" android:text="" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider" + android:layout_width="1dp" + android:visibility="invisible" + android:layout_height="0dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="16dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/feed_switch" app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4ef13134bf545a274dab57a52410b86a6729f898..bb318f8b3b8560f527858737a74b1f5de2929e9d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -107,4 +107,7 @@FLOSS public transport passenger companion; a timetable in your pocket. <string name="website_button_description">link to website</string> <string name="code_button_description">link to source code</string> <string name="mastodon_button_description">link to Mastodon</string> + <string name="use_online_feed">Use online feed</string> + <string name="information_may_be_outdated">Information may be outdated</string> + <string name="current_timetable_validity">Current timetable valid: %1$s to %2$s</string> </resources> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 366feadc1c73771ba15d23a6577d8ad8802b6f65..7e73ef8a2a97839534097f9abac06a6caa6a6ce1 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ id 'com.android.library' version '8.2.2' apply false id 'org.jetbrains.kotlin.android' version '1.7.10' apply false id 'org.jetbrains.kotlin.jvm' version '1.7.20' apply false id "org.jetbrains.kotlin.plugin.parcelize" version "1.8.20" apply false + id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.22' apply false } task clean(type: Delete) {