diff --git a/README.md b/README.md index 2937481e45..f4a7f94fa3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- +

RiMusic is a multilingual Android application for streaming music from YouTube Music.

It began as an extension of ViMusic, then acquired its own identity.

It allowing the user to customize it at will.

@@ -131,6 +131,7 @@ WARNING, the custom version is not an official release, download only if invited - [fast4x](https://github.com/fast4x) - [ikanakova](https://github.com/ikanakova) - [iscle](https://github.com/iscle) +- [jaimtres](https://github.com/jaimtres) - [JZITNIK](https://github.com/jzitnik-dev) - [knighthat](https://github.com/knighthat) - [locxter](https://github.com/locxter) @@ -145,13 +146,12 @@ WARNING, the custom version is not an official release, download only if invited ## 🫂 Acknowledgments - [**ViMusic**](https://github.com/vfsfitvnm/ViMusic) -- **RiMusic Logo and icons** [@ikanakova](https://github.com/ikanakova) +- **RiMusic actual Logo Design** [jaimtres](https://github.com/jaimtres) +- **RiMusic previous Logo and many actual icons** [@ikanakova](https://github.com/ikanakova) - **RiMusic Website and other features** [JZITNIK-github](https://github.com/JZITNIK-github) and [martkol](https://github.com/martkol) - **RiMusic New player and lyrics layouts** [aneesh1122](https://github.com/aneesh1122) - [**YouTube-Internal-Clients**](https://github.com/zerodytrash/YouTube-Internal-Clients): A python script that discovers hidden YouTube API clients. Just a research project. - [**Ionicons**](https://github.com/ionic-team/ionicons): Premium hand-crafted icons built by Ionic, for Ionic apps and web apps everywhere. -- [**Rubik** Font](https://fonts.google.com/specimen/Rubik): Rubik is RiMusic's default font. -- [**Poppins** Font](https://fonts.google.com/specimen/Poppins): Poppins is ViMusic's default font. - [**Translator**](https://github.com/therealbush/translator): A simple and free Google Translate library for Kotlin/JVM and Java. - [**KuGou**](https://www.kugou.com): Lyrics provider - [**LrcLib**](https://lrclib.net): Lyrics provider diff --git a/assets/design/latest/app_icon-inv.svg b/assets/design/latest/app_icon-inv.svg new file mode 100644 index 0000000000..0762d2d74a --- /dev/null +++ b/assets/design/latest/app_icon-inv.svg @@ -0,0 +1,14 @@ + + + \ No newline at end of file diff --git a/assets/design/latest/app_icon-mod.svg b/assets/design/latest/app_icon-mod.svg new file mode 100644 index 0000000000..62ab4c55a6 --- /dev/null +++ b/assets/design/latest/app_icon-mod.svg @@ -0,0 +1,33 @@ + + + + + + + diff --git a/assets/design/latest/app_icon.svg b/assets/design/latest/app_icon.svg new file mode 100644 index 0000000000..af5fa12657 --- /dev/null +++ b/assets/design/latest/app_icon.svg @@ -0,0 +1,14 @@ + + + \ No newline at end of file diff --git a/assets/design/latest/app_logo.svg b/assets/design/latest/app_logo.svg new file mode 100644 index 0000000000..de7ad9f4a1 --- /dev/null +++ b/assets/design/latest/app_logo.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/design/latest/app_logo_text.svg b/assets/design/latest/app_logo_text.svg new file mode 100644 index 0000000000..0f0fd229a7 --- /dev/null +++ b/assets/design/latest/app_logo_text.svg @@ -0,0 +1,16 @@ + + + + + diff --git a/assets/design/latest/banner_tv_foreground.svg b/assets/design/latest/banner_tv_foreground.svg new file mode 100644 index 0000000000..80766772f5 --- /dev/null +++ b/assets/design/latest/banner_tv_foreground.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/design/latest/featureGraphic.png b/assets/design/latest/featureGraphic.png new file mode 100644 index 0000000000..5a4f3155a8 Binary files /dev/null and b/assets/design/latest/featureGraphic.png differ diff --git a/assets/design/latest/featureGraphic.svg b/assets/design/latest/featureGraphic.svg new file mode 100644 index 0000000000..92769583b6 --- /dev/null +++ b/assets/design/latest/featureGraphic.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/design/latest/gpl-3.0.txt b/assets/design/latest/gpl-3.0.txt new file mode 100644 index 0000000000..f288702d2f --- /dev/null +++ b/assets/design/latest/gpl-3.0.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/assets/design/latest/ic_launcher_foreground.svg b/assets/design/latest/ic_launcher_foreground.svg new file mode 100644 index 0000000000..5a6a0d031d --- /dev/null +++ b/assets/design/latest/ic_launcher_foreground.svg @@ -0,0 +1,16 @@ + + + + + diff --git a/assets/design/latest/ic_logo_foreground.svg b/assets/design/latest/ic_logo_foreground.svg new file mode 100644 index 0000000000..3cb966c984 --- /dev/null +++ b/assets/design/latest/ic_logo_foreground.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/assets/design/latest/icon-2.svg b/assets/design/latest/icon-2.svg new file mode 100644 index 0000000000..919df1ffa9 --- /dev/null +++ b/assets/design/latest/icon-2.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/design/latest/icon.png b/assets/design/latest/icon.png new file mode 100644 index 0000000000..6a776446f2 Binary files /dev/null and b/assets/design/latest/icon.png differ diff --git a/assets/design/latest/icon.svg b/assets/design/latest/icon.svg new file mode 100644 index 0000000000..dbd15b3f8e --- /dev/null +++ b/assets/design/latest/icon.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/design/latest/license.txt b/assets/design/latest/license.txt new file mode 100644 index 0000000000..25494da098 --- /dev/null +++ b/assets/design/latest/license.txt @@ -0,0 +1,12 @@ +Copyright (C) 2024 Jaime López +https://jaim3.com + +This work is licensed under the GNU General Public License v3.0 or later. + +You should have received a copy of the GNU General Public License +along with this work. If not, see . + +This logo/icon 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. \ No newline at end of file diff --git a/assets/design/app_icon.svg b/assets/design/previous/app_icon.svg similarity index 100% rename from assets/design/app_icon.svg rename to assets/design/previous/app_icon.svg diff --git a/assets/design/app_logo.svg b/assets/design/previous/app_logo.svg similarity index 100% rename from assets/design/app_logo.svg rename to assets/design/previous/app_logo.svg diff --git a/assets/design/app_logo_text.svg b/assets/design/previous/app_logo_text.svg similarity index 100% rename from assets/design/app_logo_text.svg rename to assets/design/previous/app_logo_text.svg diff --git a/assets/design/banner_tv_foreground.svg b/assets/design/previous/banner_tv_foreground.svg similarity index 100% rename from assets/design/banner_tv_foreground.svg rename to assets/design/previous/banner_tv_foreground.svg diff --git a/assets/design/featureGraphic.svg b/assets/design/previous/featureGraphic.svg similarity index 100% rename from assets/design/featureGraphic.svg rename to assets/design/previous/featureGraphic.svg diff --git a/assets/design/ic_launcher_foreground.svg b/assets/design/previous/ic_launcher_foreground.svg similarity index 100% rename from assets/design/ic_launcher_foreground.svg rename to assets/design/previous/ic_launcher_foreground.svg diff --git a/assets/design/ic_logo_foreground.svg b/assets/design/previous/ic_logo_foreground.svg similarity index 100% rename from assets/design/ic_logo_foreground.svg rename to assets/design/previous/ic_logo_foreground.svg diff --git a/assets/design/icon.svg b/assets/design/previous/icon.svg similarity index 100% rename from assets/design/icon.svg rename to assets/design/previous/icon.svg diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/Database.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/Database.kt index a812172bfb..a28fcffd23 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/Database.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/Database.kt @@ -357,62 +357,62 @@ interface Database { @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY totalPlayTimeMs") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY totalPlayTimeMs") fun songsOfflineByPlayTimeAsc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY totalPlayTimeMs DESC") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY totalPlayTimeMs DESC") fun songsOfflineByPlayTimeDesc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.title") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.title") fun songsOfflineByTitleAsc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.title DESC") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.title DESC") fun songsOfflineByTitleDesc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.ROWID") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.ROWID") fun songsOfflineByRowIdAsc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.ROWID DESC") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.ROWID DESC") fun songsOfflineByRowIdDesc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.likedAt") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.likedAt") fun songsOfflineByLikedAtAsc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.likedAt DESC") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.likedAt DESC") fun songsOfflineByLikedAtDesc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.artistsText") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.artistsText") fun songsOfflineByArtistAsc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.artistsText DESC") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.artistsText DESC") fun songsOfflineByArtistDesc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.durationText") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.durationText") fun songsOfflineByDurationAsc(): Flow> @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) @Transaction - @Query("SELECT Song.*, contentLength FROM Song LEFT JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.durationText DESC") + @Query("SELECT Song.*, contentLength FROM Song INNER JOIN Format ON id = songId WHERE contentLength IS NOT NULL AND totalPlayTimeMs > 0 ORDER BY Song.durationText DESC") fun songsOfflineByDurationDesc(): Flow> fun songsOffline(sortBy: SongSortBy, sortOrder: SortOrder): Flow> { diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/models/Song.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/models/Song.kt index 6d71d81497..74776bf306 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/models/Song.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/models/Song.kt @@ -3,6 +3,7 @@ package it.fast4x.rimusic.models import androidx.compose.runtime.Immutable import androidx.room.Entity import androidx.room.PrimaryKey +import it.fast4x.rimusic.utils.setLikeState @Immutable @Entity @@ -30,7 +31,8 @@ data class Song( fun toggleLike(): Song { return copy( - likedAt = if (likedAt == null) System.currentTimeMillis() else null + //likedAt = if (likedAt == null) System.currentTimeMillis() else null + likedAt = setLikeState(likedAt) ) } } diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/DownloadUtil.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/DownloadUtil.kt index 06a4855549..9e5192f8c2 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/DownloadUtil.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/DownloadUtil.kt @@ -3,14 +3,16 @@ package it.fast4x.rimusic.service import android.annotation.SuppressLint import android.content.Context +import android.net.ConnectivityManager import android.net.Uri +import androidx.core.content.ContextCompat.getSystemService import androidx.core.net.toUri import androidx.media3.common.PlaybackException import androidx.media3.common.util.UnstableApi import androidx.media3.database.DatabaseProvider import androidx.media3.database.StandaloneDatabaseProvider import androidx.media3.datasource.DataSource -import androidx.media3.datasource.HttpDataSource +//import androidx.media3.datasource.HttpDataSource import androidx.media3.datasource.ResolvingDataSource import androidx.media3.datasource.cache.Cache import androidx.media3.datasource.cache.CacheDataSource @@ -48,18 +50,19 @@ import java.util.concurrent.Executors @UnstableApi object DownloadUtil { const val DOWNLOAD_NOTIFICATION_CHANNEL_ID = "download_channel" - private const val TAG = "DownloadUtil" + //private const val TAG = "DownloadUtil" private const val DOWNLOAD_CONTENT_DIRECTORY = "downloads" private lateinit var databaseProvider: DatabaseProvider private lateinit var downloadCache: Cache - private lateinit var dataSourceFactory: DataSource.Factory - private lateinit var httpDataSourceFactory: HttpDataSource.Factory - private lateinit var ResolvingDataSourceFactory: ResolvingDataSource.Factory + //private lateinit var dataSourceFactory: DataSource.Factory + //private lateinit var httpDataSourceFactory: HttpDataSource.Factory + //private lateinit var ResolvingDataSourceFactory: ResolvingDataSource.Factory private lateinit var downloadNotificationHelper: DownloadNotificationHelper private lateinit var downloadDirectory: File private lateinit var downloadManager: DownloadManager private lateinit var audioQualityFormat: AudioQualityFormat + private lateinit var connectivityManager: ConnectivityManager var downloads = MutableStateFlow>(emptyMap()) @@ -85,11 +88,11 @@ object DownloadUtil { @SuppressLint("SuspiciousIndentation") @Synchronized fun getResolvingDataSourceFactory(context: Context): ResolvingDataSource.Factory { - val cache = getDownloadCache(context) - //audioQualityFormat = - // context.preferences.getEnum(audioQualityFormatKey, AudioQualityFormat.High) + //val cache = getDownloadCache(context) + audioQualityFormat = + context.preferences.getEnum(audioQualityFormatKey, AudioQualityFormat.Auto) - //connectivityManager = getSystemService(context, ConnectivityManager::class.java) as ConnectivityManager + connectivityManager = getSystemService(context, ConnectivityManager::class.java) as ConnectivityManager val dataSourceFactory = ResolvingDataSource.Factory(createCacheDataSource(context)) { dataSpec -> @@ -130,7 +133,7 @@ object DownloadUtil { Database.getBestFormat(videoId).firstOrNull() } - when (val status = body.playabilityStatus?.status) { + when (body.playabilityStatus?.status) { "OK" -> if (bestPlayedFormat != null) { body.streamingData?.adaptiveFormats?.find { it.itag == bestPlayedFormat.itag @@ -138,17 +141,28 @@ object DownloadUtil { } else { body.streamingData?.adaptiveFormats ?.filter { it.isAudio } + ?.maxByOrNull { + (it.bitrate?.times( + when (audioQualityFormat) { + AudioQualityFormat.Auto -> if (connectivityManager.isActiveNetworkMetered) -1 else 1 + AudioQualityFormat.High -> 1 + AudioQualityFormat.Low, AudioQualityFormat.Medium -> -1 + } + ) ?: -1) + (if (it.mimeType.startsWith("audio/webm")) 10240 else 0) + } + /* ?.maxByOrNull { it.bitrate?.times( (if (it.mimeType.startsWith("audio/webm")) 100 else 1) ) ?: -1 } + */ } ?.let { format -> query { if (Database.songExist(videoId) == 1) { - Database.insert( + Database.upsert( Format( songId = videoId, itag = format.itag, @@ -191,11 +205,7 @@ object DownloadUtil { ringBuffer.append(videoId to url.toUri()) dataSpec.withUri(url.toUri()) .subrange(dataSpec.uriPositionOffset, chunkLength) - } ?: throw PlaybackException( - null, - urlResult?.exceptionOrNull(), - PlaybackException.ERROR_CODE_REMOTE_ERROR - ) + } ?: throw UnknownException() } } } @@ -267,6 +277,7 @@ object DownloadUtil { */ + /* fun getDownloadString(context: Context, @Download.State downloadState: Int): String { return when (downloadState) { /* @@ -290,6 +301,7 @@ object DownloadUtil { } } + */ @Synchronized private fun getDownloadCache(context: Context): Cache { diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlaybackExceptions.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlaybackExceptions.kt index 2c5b9724d7..fa758c51ae 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlaybackExceptions.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlaybackExceptions.kt @@ -19,4 +19,6 @@ class NoInternetException : PlaybackException(null, null, ERROR_CODE_IO_NETWORK_ class TimeoutException : PlaybackException(null, null, ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT) @UnstableApi class UnknownException : PlaybackException(null, null, ERROR_CODE_REMOTE_ERROR) +@UnstableApi +class FakeException : PlaybackException(null, null, ERROR_CODE_IO_NETWORK_CONNECTION_FAILED) diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlayerService.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlayerService.kt index c5bb8975a0..aa1f5cd28e 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlayerService.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlayerService.kt @@ -21,6 +21,7 @@ import android.media.AudioManager import android.media.audiofx.AudioEffect import android.media.audiofx.LoudnessEnhancer import android.media.session.PlaybackState +import android.net.ConnectivityManager import android.net.Uri import android.os.Build import android.os.Bundle @@ -124,6 +125,8 @@ import it.fast4x.rimusic.utils.activityPendingIntent import it.fast4x.rimusic.utils.asSong import it.fast4x.rimusic.utils.broadCastPendingIntent import it.fast4x.rimusic.cleanPrefix +import it.fast4x.rimusic.enums.AudioQualityFormat +import it.fast4x.rimusic.utils.audioQualityFormatKey import it.fast4x.rimusic.utils.closebackgroundPlayerKey import it.fast4x.rimusic.utils.discordPersonalAccessTokenKey import it.fast4x.rimusic.utils.discoverKey @@ -235,7 +238,7 @@ class PlayerService : InvincibleService(), private lateinit var player: ExoPlayer private lateinit var downloadCache: SimpleCache private lateinit var audioVolumeObserver: AudioVolumeObserver - //private lateinit var connectivityManager: ConnectivityManager + private lateinit var connectivityManager: ConnectivityManager private val actions = PlaybackStateCompat.ACTION_PLAY or PlaybackStateCompat.ACTION_PAUSE or @@ -351,7 +354,7 @@ class PlayerService : InvincibleService(), get() = NotificationId private lateinit var notificationActionReceiver: NotificationActionReceiver - //private lateinit var audioQualityFormat: AudioQualityFormat + private lateinit var audioQualityFormat: AudioQualityFormat private val playerVerticalWidget = PlayerVerticalWidget() private val playerHorizontalWidget = PlayerHorizontalWidget() @@ -454,7 +457,7 @@ class PlayerService : InvincibleService(), isShowingThumbnailInLockscreen = preferences.getBoolean(isShowingThumbnailInLockscreenKey, false) - //audioQualityFormat = preferences.getEnum(audioQualityFormatKey, AudioQualityFormat.High) + audioQualityFormat = preferences.getEnum(audioQualityFormatKey, AudioQualityFormat.Auto) showLikeButton = preferences.getBoolean(showLikeButtonBackgroundPlayerKey, true) showDownloadButton = preferences.getBoolean(showDownloadButtonBackgroundPlayerKey, true) @@ -584,7 +587,7 @@ class PlayerService : InvincibleService(), audioVolumeObserver = AudioVolumeObserver(this) audioVolumeObserver.register(AudioManager.STREAM_MUSIC, this) - //connectivityManager = getSystemService()!! + connectivityManager = getSystemService()!! if (showLikeButton && showDownloadButton) mediaSession.setPlaybackState(stateBuilder.build()) @@ -1969,11 +1972,23 @@ class PlayerService : InvincibleService(), } else { body?.streamingData?.adaptiveFormats ?.filter { it.isAudio } + ?.maxByOrNull { + (it.bitrate?.times( + when (audioQualityFormat) { + AudioQualityFormat.Auto -> if (connectivityManager.isActiveNetworkMetered) -1 else 1 + AudioQualityFormat.High -> 1 + AudioQualityFormat.Low, AudioQualityFormat.Medium -> -1 + } + ) ?: -1) + (if (it.mimeType.startsWith("audio/webm")) 10240 else 0) + } + + /* ?.maxByOrNull { it.bitrate?.times( (if (it.mimeType.startsWith("audio/webm")) 100 else 1) ) ?: -1 } + */ } /* val format = body.streamingData?.adaptiveFormats @@ -2054,7 +2069,12 @@ class PlayerService : InvincibleService(), else -> { Timber.i("PlayerService createDataSourceResolverFactory Not playable status $status reason ${body?.playabilityStatus?.reason}") println("mediaItem PlayerService createDataSourceResolverFactory Not playable status $status reason ${body?.playabilityStatus?.reason}") - throw UnknownException() + binder.cache.removeResource(videoId) + binder.downloadCache.removeResource(videoId) + transaction { + Database.resetTotalPlayTimeMs(videoId) + } + format?.url ?: throw UnknownException() } } ringBuffer.append(videoId to url.toUri()) diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemGridMenu.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemGridMenu.kt index 047bae4708..7f2643776b 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemGridMenu.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemGridMenu.kt @@ -151,9 +151,10 @@ fun BaseMediaItemGridMenu( onDeleteFromDatabase: (() -> Unit)? = null, onRemoveFromQuickPicks: (() -> Unit)? = null, onClosePlayer: (() -> Unit)? = null, - onGoToPlaylist: ((Long) -> Unit)? = null + onGoToPlaylist: ((Long) -> Unit)? = null, + onAddToPreferites: (() -> Unit)? = null, ) { - val context = LocalContext.current + //val context = LocalContext.current MediaItemGridMenu( navController = navController, @@ -165,6 +166,7 @@ fun BaseMediaItemGridMenu( onPlayNext = onPlayNext, onEnqueue = onEnqueue, onDownload = onDownload, + onAddToPreferites = onAddToPreferites, onAddToPlaylist = { playlist, position -> transaction { Database.insert(mediaItem) @@ -221,6 +223,8 @@ fun MiniMediaItemGridMenu( onDismiss: () -> Unit, mediaItem: MediaItem, onGoToPlaylist: ((Long) -> Unit)? = null, + onAddToPreferites: (() -> Unit)? = null, + modifier: Modifier = Modifier, ) { @@ -247,6 +251,7 @@ fun MiniMediaItemGridMenu( onGoToPlaylist(it) } }, + onAddToPreferites = onAddToPreferites, modifier = modifier ) } @@ -269,6 +274,7 @@ fun MediaItemGridMenu ( onDeleteFromDatabase: (() -> Unit)? = null, onRemoveFromQueue: (() -> Unit)? = null, onRemoveFromPlaylist: (() -> Unit)? = null, + onAddToPreferites: (() -> Unit)?, onAddToPlaylist: ((Playlist, Int) -> Unit)? = null, onGoToAlbum: ((String) -> Unit)? = null, onGoToArtist: ((String) -> Unit)? = null, @@ -325,10 +331,10 @@ fun MediaItemGridMenu ( LaunchedEffect(Unit, mediaItem.mediaId) { withContext(Dispatchers.IO) { - //if (albumInfo == null) - albumInfo = Database.songAlbumInfo(mediaItem.mediaId) - //if (artistsInfo == null) - artistsInfo = Database.songArtistInfo(mediaItem.mediaId) + if (albumInfo == null) + albumInfo = Database.songAlbumInfo(mediaItem.mediaId) + if (artistsInfo == null) + artistsInfo = Database.songArtistInfo(mediaItem.mediaId) artistsInfo?.forEach { info -> if (info.id.isNotEmpty()) artistIds.add(info.id) @@ -935,6 +941,14 @@ fun MediaItemGridMenu ( } ) + if (onAddToPreferites != null) + GridMenuItem( + icon = R.drawable.heart, + title = R.string.add_to_favorites, + colorIcon = colorPalette.text, + colorText = colorPalette.text, + onClick = onAddToPreferites + ) onAddToPlaylist?.let { onAddToPlaylist -> GridMenuItem( diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemMenu.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemMenu.kt index d63c6f99e1..0ff0512d5b 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemMenu.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemMenu.kt @@ -95,6 +95,7 @@ import it.fast4x.rimusic.utils.enqueue import it.fast4x.rimusic.utils.forcePlay import it.fast4x.rimusic.utils.formatAsDuration import it.fast4x.rimusic.utils.getDownloadState +import it.fast4x.rimusic.utils.getLikeState import it.fast4x.rimusic.utils.getPipedSession import it.fast4x.rimusic.utils.isPipedEnabledKey import it.fast4x.rimusic.utils.manageDownload @@ -106,6 +107,7 @@ import it.fast4x.rimusic.utils.positionAndDurationState import it.fast4x.rimusic.utils.rememberPreference import it.fast4x.rimusic.utils.removeFromPipedPlaylist import it.fast4x.rimusic.utils.semiBold +import it.fast4x.rimusic.utils.setLikeState import it.fast4x.rimusic.utils.thumbnail import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.flowOf @@ -158,6 +160,11 @@ fun InHistoryMediaItemMenu( onDismiss = onDismiss, onHideFromDatabase = onHideFromDatabase, onDeleteFromDatabase = onDeleteFromDatabase, + onAddToPreferites = { + transaction { + Database.like(song.id, System.currentTimeMillis()) + } + }, modifier = modifier ) } @@ -201,6 +208,11 @@ fun InPlaylistMediaItemMenu( ) } }, + onAddToPreferites = { + transaction { + Database.like(song.id, System.currentTimeMillis()) + } + }, modifier = modifier ) } @@ -269,6 +281,14 @@ fun NonQueuedMediaItemMenuLibrary( onRemoveFromPlaylist = onRemoveFromPlaylist, onHideFromDatabase = { isHiding = true }, onRemoveFromQuickPicks = onRemoveFromQuickPicks, + onAddToPreferites = { + transaction { + Database.like( + mediaItem.mediaId, + System.currentTimeMillis() + ) + } + }, modifier = modifier ) } else { @@ -293,6 +313,14 @@ fun NonQueuedMediaItemMenuLibrary( onRemoveFromPlaylist = onRemoveFromPlaylist, onHideFromDatabase = { isHiding = true }, onRemoveFromQuickPicks = onRemoveFromQuickPicks, + onAddToPreferites = { + transaction { + Database.like( + mediaItem.mediaId, + System.currentTimeMillis() + ) + } + }, modifier = modifier ) } @@ -312,6 +340,7 @@ fun NonQueuedMediaItemMenu( onDeleteFromDatabase: (() -> Unit)? = null, onRemoveFromQuickPicks: (() -> Unit)? = null, onDownload: (() -> Unit)? = null, + onAddToPreferites: (() -> Unit)? = null ) { val binder = LocalPlayerServiceBinder.current val context = LocalContext.current @@ -345,6 +374,7 @@ fun NonQueuedMediaItemMenu( onHideFromDatabase = onHideFromDatabase, onDeleteFromDatabase = onDeleteFromDatabase, onRemoveFromQuickPicks = onRemoveFromQuickPicks, + onAddToPreferites = onAddToPreferites, modifier = modifier ) } else { @@ -370,6 +400,7 @@ fun NonQueuedMediaItemMenu( onHideFromDatabase = onHideFromDatabase, onDeleteFromDatabase = onDeleteFromDatabase, onRemoveFromQuickPicks = onRemoveFromQuickPicks, + onAddToPreferites = onAddToPreferites, modifier = modifier ) } @@ -418,7 +449,15 @@ fun QueuedMediaItemMenu( modifier = modifier, onGoToPlaylist = { navController.navigate(route = "${NavRoutes.localPlaylist.name}/$it") - } + }, + onAddToPreferites = { + transaction { + Database.like( + mediaItem.mediaId, + System.currentTimeMillis() + ) + } + }, ) } else { BaseMediaItemMenu( @@ -443,7 +482,15 @@ fun QueuedMediaItemMenu( modifier = modifier, onGoToPlaylist = { navController.navigate(route = "${NavRoutes.playlist.name}/$it") - } + }, + onAddToPreferites = { + transaction { + Database.like( + mediaItem.mediaId, + System.currentTimeMillis() + ) + } + }, ) } } @@ -469,7 +516,8 @@ fun BaseMediaItemMenu( onDeleteFromDatabase: (() -> Unit)? = null, onRemoveFromQuickPicks: (() -> Unit)? = null, onClosePlayer: (() -> Unit)? = null, - onGoToPlaylist: ((Long) -> Unit)? = null + onGoToPlaylist: ((Long) -> Unit)? = null, + onAddToPreferites: (() -> Unit)? ) { val context = LocalContext.current @@ -489,6 +537,7 @@ fun BaseMediaItemMenu( onPlayNext = onPlayNext, onEnqueue = onEnqueue, onDownload = onDownload, + onAddToPreferites = onAddToPreferites, onAddToPlaylist = { playlist, position -> transaction { Database.insert(mediaItem) @@ -560,6 +609,7 @@ fun MiniMediaItemMenu( onDismiss: () -> Unit, mediaItem: MediaItem, onGoToPlaylist: ((Long) -> Unit)? = null, + onAddToPreferites: (() -> Unit)?, modifier: Modifier = Modifier, ) { val context = LocalContext.current @@ -599,6 +649,7 @@ fun MiniMediaItemMenu( context.startActivity(Intent.createChooser(sendIntent, null)) }, + onAddToPreferites = onAddToPreferites, modifier = modifier ) } @@ -680,6 +731,7 @@ fun MediaItemMenu( onDeleteFromDatabase: (() -> Unit)? = null, onRemoveFromQueue: (() -> Unit)? = null, onRemoveFromPlaylist: (() -> Unit)? = null, + onAddToPreferites: (() -> Unit)?, onAddToPlaylist: ((Playlist, Int) -> Unit)? = null, onGoToAlbum: ((String) -> Unit)? = null, onGoToArtist: ((String) -> Unit)? = null, @@ -1064,7 +1116,8 @@ fun MediaItemMenu( Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { IconButton( - icon = if (likedAt == null) R.drawable.heart_outline else R.drawable.heart, + //icon = if (likedAt == null) R.drawable.heart_outline else R.drawable.heart, + icon = getLikeState(mediaItem.mediaId), //icon = R.drawable.heart, color = colorPalette().favoritesIcon, //color = if (likedAt == null) colorPalette().textDisabled else colorPalette().text, @@ -1072,7 +1125,8 @@ fun MediaItemMenu( query { if (Database.like( mediaItem.mediaId, - if (likedAt == null) System.currentTimeMillis() else null + //if (likedAt == null) System.currentTimeMillis() else null + setLikeState(likedAt) ) == 0 ) { Database.insert(mediaItem, Song::toggleLike) @@ -1414,6 +1468,13 @@ fun MediaItemMenu( ) } + if (onAddToPreferites != null) + MenuEntry( + icon = R.drawable.heart, + text = stringResource(R.string.add_to_favorites), + onClick = onAddToPreferites + ) + if (onAddToPlaylist != null) { MenuEntry( icon = R.drawable.add_in_playlist, diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlayerMenu.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlayerMenu.kt index de49b68e33..d2a3fde2b5 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlayerMenu.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlayerMenu.kt @@ -20,6 +20,7 @@ import it.fast4x.rimusic.R import it.fast4x.rimusic.enums.MenuStyle import it.fast4x.rimusic.query import it.fast4x.rimusic.service.PlayerService +import it.fast4x.rimusic.transaction import it.fast4x.rimusic.utils.menuStyleKey import it.fast4x.rimusic.utils.rememberEqualizerLauncher import it.fast4x.rimusic.utils.rememberPreference @@ -42,9 +43,9 @@ fun PlayerMenu( MenuStyle.List ) - val context = LocalContext.current + //val context = LocalContext.current - val launchEqualizer by rememberEqualizerLauncher(audioSessionId = { binder?.player?.audioSessionId }) + val launchEqualizer by rememberEqualizerLauncher(audioSessionId = { binder.player.audioSessionId }) val activityResultLauncher = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { } @@ -121,6 +122,14 @@ fun PlayerMenu( onShowSleepTimer = {}, onHideFromDatabase = { isHiding = true }, onDismiss = onDismiss, + onAddToPreferites = { + transaction { + Database.like( + mediaItem.mediaId, + System.currentTimeMillis() + ) + } + }, onClosePlayer = onClosePlayer ) } @@ -152,6 +161,14 @@ fun MiniPlayerMenu( onGoToPlaylist = { onClosePlayer() }, + onAddToPreferites = { + transaction { + Database.like( + mediaItem.mediaId, + System.currentTimeMillis() + ) + } + }, onDismiss = onDismiss ) } else { @@ -161,6 +178,14 @@ fun MiniPlayerMenu( onGoToPlaylist = { onClosePlayer() }, + onAddToPreferites = { + transaction { + Database.like( + mediaItem.mediaId, + System.currentTimeMillis() + ) + } + }, onDismiss = onDismiss ) } diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemGridMenu.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemGridMenu.kt index 00e03b4ee9..651bbec7ff 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemGridMenu.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemGridMenu.kt @@ -78,6 +78,7 @@ fun PlaylistsItemGridMenu( onPlayNext: (() -> Unit)? = null, onEnqueue: (() -> Unit)? = null, onImportOnlinePlaylist: (() -> Unit)? = null, + onAddToPreferites: (() -> Unit)? = null, onAddToPlaylist: ((PlaylistPreview) -> Unit)? = null, showOnSyncronize: Boolean = false, onSyncronize: (() -> Unit)? = null, @@ -387,6 +388,15 @@ fun PlaylistsItemGridMenu( ) } + if (onAddToPreferites != null) + GridMenuItem( + icon = R.drawable.heart, + title = R.string.add_to_favorites, + colorIcon = colorPalette.text, + colorText = colorPalette.text, + onClick = onAddToPreferites + ) + onAddToPlaylist?.let { onAddToPlaylist -> GridMenuItem( icon = R.drawable.add_in_playlist, diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemMenu.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemMenu.kt index 48d7686862..70fdc57c7b 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemMenu.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/PlaylistsItemMenu.kt @@ -76,6 +76,7 @@ fun PlaylistsItemMenu( onEnqueue: (() -> Unit)? = null, onImportOnlinePlaylist: (() -> Unit)? = null, onAddToPlaylist: ((PlaylistPreview) -> Unit)? = null, + onAddToPreferites: (() -> Unit)? = null, showOnSyncronize: Boolean = false, onSyncronize: (() -> Unit)? = null, onRenumberPositions: (() -> Unit)? = null, @@ -111,6 +112,7 @@ fun PlaylistsItemMenu( onEnqueue = onEnqueue, onImportOnlinePlaylist = onImportOnlinePlaylist, onAddToPlaylist = onAddToPlaylist, + onAddToPreferites = onAddToPreferites, showOnSyncronize = showOnSyncronize, onSyncronize = onSyncronize, onRenumberPositions = onRenumberPositions, @@ -458,6 +460,13 @@ fun PlaylistsItemMenu( ) } + if (onAddToPreferites != null) + MenuEntry( + icon = R.drawable.heart, + text = stringResource(R.string.add_to_favorites), + onClick = onAddToPreferites + ) + if (onAddToPlaylist != null) { MenuEntry( icon = R.drawable.add_in_playlist, diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/items/SongItem.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/items/SongItem.kt index c4898bab13..aa746d2873 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/items/SongItem.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/items/SongItem.kt @@ -47,6 +47,7 @@ import it.fast4x.rimusic.ui.styling.favoritesIcon import it.fast4x.rimusic.ui.styling.shimmer import it.fast4x.rimusic.cleanPrefix import it.fast4x.rimusic.utils.asSong +import it.fast4x.rimusic.utils.getLikeState import it.fast4x.rimusic.utils.medium import it.fast4x.rimusic.utils.playlistindicatorKey import it.fast4x.rimusic.utils.rememberPreference @@ -355,7 +356,7 @@ fun SongItem( if (likedAt != null) HeaderIconButton( onClick = {}, - icon = R.drawable.heart, + icon = getLikeState(mediaId), color = colorPalette().favoritesIcon, iconSize = 12.dp, modifier = Modifier diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeAlbumsModern.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeAlbumsModern.kt index 7f4deabc7c..3719d06f0d 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeAlbumsModern.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeAlbumsModern.kt @@ -245,10 +245,10 @@ fun HomeAlbumsModern( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .padding(horizontal = 12.dp) - .padding(top = 10.dp, bottom = 16.dp) + .padding(top = 10.dp, bottom = 4.dp) .fillMaxWidth() ) { - if ( UiType.RiMusic.isCurrent() ) + if (UiType.RiMusic.isCurrent()) TitleSection(title = stringResource(R.string.albums)) HeaderInfo( @@ -262,6 +262,25 @@ fun HomeAlbumsModern( .weight(1f) ) + } + + } + + item( + key = "headerButtons", + contentType = 0, + span = { GridItemSpan(maxLineSpan) } + ) { + + Row( + horizontalArrangement = Arrangement.SpaceAround, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .padding(horizontal = 12.dp) + .padding(vertical = 4.dp) + .fillMaxWidth() + ) { + HeaderIconButton( icon = R.drawable.arrow_up, color = colorPalette().text, diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeArtistsModern.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeArtistsModern.kt index d143bf6d64..ec753d743c 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeArtistsModern.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeArtistsModern.kt @@ -211,7 +211,7 @@ fun HomeArtistsModern( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .padding(horizontal = 12.dp) - .padding(top = 10.dp, bottom = 16.dp) + .padding(top = 10.dp, bottom = 4.dp) .fillMaxWidth() ){ if ( UiType.RiMusic.isCurrent() ) @@ -228,6 +228,24 @@ fun HomeArtistsModern( .weight(1f) ) + } + } + + item( + key = "headerButtons", + contentType = 0, + span = { GridItemSpan(maxLineSpan) } + ) { + + Row ( + horizontalArrangement = Arrangement.SpaceAround, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .padding(horizontal = 12.dp) + .padding(vertical = 4.dp) + .fillMaxWidth() + ){ + HeaderIconButton( icon = R.drawable.arrow_up, color = colorPalette().text, diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeLibraryModern.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeLibraryModern.kt index ddcce93c49..bcd8283784 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeLibraryModern.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeLibraryModern.kt @@ -369,7 +369,7 @@ fun HomeLibraryModern( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .padding(horizontal = 12.dp) - .padding(top = 10.dp, bottom = 16.dp) + .padding(top = 10.dp, bottom = 4.dp) .fillMaxWidth() ) { @@ -385,6 +385,25 @@ fun HomeLibraryModern( .weight(0.3f) ) + } + + } + + item( + key = "headerButtons", + contentType = 0, + span = { GridItemSpan(maxLineSpan) } + ) { + + Row( + horizontalArrangement = Arrangement.SpaceAround, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .padding(horizontal = 12.dp) + .padding(vertical = 4.dp) + .fillMaxWidth() + ) { + HeaderIconButton( icon = R.drawable.arrow_up, color = colorPalette().text, diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeSongsModern.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeSongsModern.kt index 7830c160ec..610eeabc1a 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeSongsModern.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeSongsModern.kt @@ -77,6 +77,7 @@ import androidx.media3.common.MediaItem import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.offline.Download import androidx.navigation.NavController +import com.github.doyaaaaaken.kotlincsv.dsl.csvReader import com.github.doyaaaaaken.kotlincsv.dsl.csvWriter import it.fast4x.compose.persist.persistList import it.fast4x.rimusic.Database @@ -99,6 +100,7 @@ import it.fast4x.rimusic.enums.TopPlaylistPeriod import it.fast4x.rimusic.enums.UiType import it.fast4x.rimusic.models.Folder import it.fast4x.rimusic.models.OnDeviceSong +import it.fast4x.rimusic.models.Playlist import it.fast4x.rimusic.models.Song import it.fast4x.rimusic.models.SongEntity import it.fast4x.rimusic.models.SongPlaylistMap @@ -106,6 +108,7 @@ import it.fast4x.rimusic.query import it.fast4x.rimusic.service.DownloadUtil import it.fast4x.rimusic.service.LOCAL_KEY_PREFIX import it.fast4x.rimusic.service.isLocal +import it.fast4x.rimusic.transaction import it.fast4x.rimusic.ui.components.ButtonsRow import it.fast4x.rimusic.ui.components.LocalMenuState import it.fast4x.rimusic.ui.components.SwipeablePlaylistItem @@ -176,6 +179,8 @@ import it.fast4x.rimusic.utils.topPlaylistPeriodKey import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import me.knighthat.colorPalette import me.knighthat.thumbnailShape @@ -297,6 +302,54 @@ fun HomeSongsModern( mutableStateOf(defaultFolder) } + val importLauncher = + rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> + if (uri == null) return@rememberLauncherForActivityResult + + //requestPermission(activity, "Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED") + + context.applicationContext.contentResolver.openInputStream(uri) + ?.use { inputStream -> + csvReader().open(inputStream) { + readAllWithHeaderAsSequence().forEachIndexed { index, row: Map -> + println("mediaItem index song ${index}") + transaction { + /**/ + if (row["MediaId"] != null && row["Title"] != null) { + val song = + row["MediaId"]?.let { + row["Title"]?.let { it1 -> + Song( + id = it, + title = it1, + artistsText = row["Artists"], + durationText = row["Duration"], + thumbnailUrl = row["ThumbnailUrl"], + totalPlayTimeMs = 1L + ) + } + } + transaction { + if (song != null) { + Database.upsert(song) + Database.like( + song.id, + System.currentTimeMillis() + ) + } + } + + + } + /**/ + + } + + } + } + } + } + /************ */ val showFavoritesPlaylist by rememberPreference(showFavoritesPlaylistKey, true) @@ -308,8 +361,8 @@ fun HomeSongsModern( var buttonsList = listOf(BuiltInPlaylist.All to stringResource(R.string.all)) if (showFavoritesPlaylist) buttonsList += BuiltInPlaylist.Favorites to stringResource(R.string.favorites) - //if (showCachedPlaylist) buttonsList += - // BuiltInPlaylist.Offline to stringResource(R.string.cached) + if (showCachedPlaylist) buttonsList += + BuiltInPlaylist.Offline to stringResource(R.string.cached) if (showDownloadedPlaylist) buttonsList += BuiltInPlaylist.Downloaded to stringResource(R.string.downloaded) if (showMyTopPlaylist) buttonsList += @@ -333,6 +386,7 @@ fun HomeSongsModern( LaunchedEffect(Unit, builtInPlaylist, sortBy, sortOrder, filter, topPlaylistPeriod) { if (builtInPlaylist == BuiltInPlaylist.Downloaded) { + /* val downloads = DownloadUtil.downloads.value Database.listAllSongsAsFlow() .combine( @@ -349,18 +403,20 @@ fun HomeSongsModern( items = it.toList() } - /* + */ + + val downloads = DownloadUtil.downloads.value Database.listAllSongsAsFlow() + .flowOn(Dispatchers.IO) .map { it.filter { song -> - downloads[song.id]?.state == Download.STATE_COMPLETED + downloads[song.song.id]?.state == Download.STATE_COMPLETED } } .collect { items = it } - */ } if (builtInPlaylist == BuiltInPlaylist.Favorites) { @@ -373,17 +429,34 @@ fun HomeSongsModern( } } - /* + if (builtInPlaylist == BuiltInPlaylist.Offline) { + Database + .songsOffline(sortBy, sortOrder) + .flowOn(Dispatchers.IO) + .map { songs -> + songs.filter { song -> + song.contentLength?.let { + binder?.cache?.isCached(song.song.id, 0, song.contentLength) + } ?: false + } + } + .collect { + items = it + } + + /* Database .songsOffline(sortBy, sortOrder) .map { songs -> - songs.filter { binder?.isCached(it) ?: false }.map { it.song } + songs.filter { binder?.isCached(it) ?: false } } .collect { items = it } + */ + //println("mediaItem offline items: ${items.size} filter ${filter}") /* @@ -410,7 +483,7 @@ fun HomeSongsModern( */ } - */ + if (builtInPlaylist == BuiltInPlaylist.Top) { if (topPlaylistPeriod.duration == Duration.INFINITE) { @@ -708,8 +781,9 @@ fun HomeSongsModern( horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, modifier = Modifier - .padding(all = 12.dp) - .fillMaxSize() + .padding(horizontal = 12.dp) + .padding(vertical = 4.dp) + .fillMaxWidth() ) { if ( UiType.RiMusic.isCurrent() ) TitleSection(title = stringResource(R.string.songs)) @@ -722,6 +796,33 @@ fun HomeSongsModern( modifier = Modifier .weight(1f) ) + } + + Row( + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .padding(horizontal = 12.dp) + .padding(vertical = 4.dp) + .fillMaxWidth() + ) { + ButtonsRow( + chips = buttonsList, + currentValue = builtInPlaylist, + onValueUpdate = { builtInPlaylist = it }, + modifier = Modifier.padding(end = 12.dp) + ) + } + + Row( + horizontalArrangement = Arrangement.SpaceAround, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .padding(horizontal = 12.dp) + .padding(vertical = 4.dp) + .fillMaxWidth() + ) { + if (builtInPlaylist != BuiltInPlaylist.Top) { HeaderIconButton( icon = R.drawable.arrow_up, @@ -995,7 +1096,7 @@ fun HomeSongsModern( } } - if (builtInPlaylist == BuiltInPlaylist.All) + //if (builtInPlaylist == BuiltInPlaylist.All) HeaderIconButton( onClick = {}, icon = if (showHiddenSongs == 0) R.drawable.eye_off else R.drawable.eye, @@ -1065,6 +1166,38 @@ fun HomeSongsModern( ) ) + if (builtInPlaylist != BuiltInPlaylist.Favorites) + HeaderIconButton( + icon = R.drawable.resource_import, + color = colorPalette().text, + //iconSize = 22.dp, + onClick = {}, + modifier = Modifier + .padding(horizontal = 2.dp) + .combinedClickable( + onClick = { + try { + importLauncher.launch( + arrayOf( + "text/*" + ) + ) + } catch (e: ActivityNotFoundException) { + SmartMessage( + context.resources.getString(R.string.info_not_find_app_open_doc), + type = PopupType.Warning, context = context + ) + } + }, + onLongClick = { + SmartMessage( + context.resources.getString(R.string.import_favorites), + context = context + ) + } + ) + ) + HeaderIconButton( icon = R.drawable.ellipsis_horizontal, color = colorPalette().text, @@ -1108,6 +1241,27 @@ fun HomeSongsModern( selectItems = false } }, + onAddToPreferites = { + if (listMediaItems.isNotEmpty()) { + listMediaItems.map { + transaction { + Database.like( + it.mediaId, + System.currentTimeMillis() + ) + } + } + } else { + items.map { + transaction { + Database.like( + it.asMediaItem.mediaId, + System.currentTimeMillis() + ) + } + } + } + }, onAddToPlaylist = { playlistPreview -> if (builtInPlaylist == BuiltInPlaylist.OnDevice) items = filteredSongs @@ -1245,12 +1399,7 @@ fun HomeSongsModern( //} - ButtonsRow( - chips = buttonsList, - currentValue = builtInPlaylist, - onValueUpdate = { builtInPlaylist = it }, - modifier = Modifier.padding(end = 12.dp) - ) + } } diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/QuickPicksModern.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/QuickPicksModern.kt index fd1226c7c3..cc1d28e311 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/QuickPicksModern.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/QuickPicksModern.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.gestures.ScrollableDefaults import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -631,6 +632,22 @@ fun QuickPicksModern( } if (related == null) { + Box( + modifier = Modifier + .fillMaxWidth() + //.background(colorPalette().background0) + ) { + Image( + painter = painterResource(R.drawable.loader), + contentDescription = null, + colorFilter = ColorFilter.tint(colorPalette().text), + modifier = Modifier + .padding(all = 5.dp) + .align(Alignment.Center) + .size(32.dp) + ) + } + /* BasicText( text = stringResource(R.string.sorry_tips_are_not_available), style = typography().xs.semiBold.center, @@ -638,6 +655,8 @@ fun QuickPicksModern( .align(Alignment.CenterHorizontally) .padding(all = 16.dp) ) + + */ } } diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt index f4dd29ecc1..eb5f4e10d6 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt @@ -1201,6 +1201,27 @@ fun LocalPlaylistSongs( context = context ) }, + onAddToPreferites = { + if (listMediaItems.isNotEmpty()) { + listMediaItems.map { + transaction { + Database.like( + it.mediaId, + System.currentTimeMillis() + ) + } + } + } else { + playlistSongs.map { + transaction { + Database.like( + it.asMediaItem.mediaId, + System.currentTimeMillis() + ) + } + } + } + }, onAddToPlaylist = { playlistPreview -> position = playlistPreview.songCount.minus(1) ?: 0 diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/PlaybackError.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/PlaybackError.kt index 4defed896a..30d4376db9 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/PlaybackError.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/PlaybackError.kt @@ -28,6 +28,7 @@ import androidx.media3.common.util.UnstableApi import it.fast4x.rimusic.LocalPlayerServiceBinder import it.fast4x.rimusic.R import it.fast4x.rimusic.enums.PopupType +import it.fast4x.rimusic.service.FakeException import it.fast4x.rimusic.service.LoginRequiredException import it.fast4x.rimusic.service.NoInternetException import it.fast4x.rimusic.service.PlayableFormatNonSupported @@ -68,7 +69,8 @@ fun PlayerError(error: PlaybackException) { val unknownplaybackerror = stringResource(R.string.error_an_unknown_playback_error_has_occurred) - val unknownerror = stringResource(R.string.error_unknown) + //val unknownerror = stringResource(R.string.error_unknown) + val unknownerror = stringResource(R.string.error_media_cannot_be_played) val nointerneterror = stringResource(R.string.error_no_internet) val timeouterror = stringResource(R.string.error_timeout) @@ -80,7 +82,7 @@ fun PlayerError(error: PlaybackException) { errorCounter = errorCounter.plus(1) if (errorCounter < 3) { - Timber.e("Playback error: ${error?.cause?.cause}") + Timber.e("Playback error: ${error.cause?.cause}") SmartMessage( if (binder.player.currentWindow?.mediaItem?.isLocal == true) localMusicFileNotFoundError else when (error.cause?.cause) { @@ -93,6 +95,7 @@ fun PlayerError(error: PlaybackException) { is NoInternetException -> nointerneterror is TimeoutException -> timeouterror is UnknownException -> unknownerror + is FakeException -> unknownerror else -> unknownplaybackerror }, PopupType.Error, context = context ) diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Essential.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Essential.kt index 88176e09c4..177592d0d3 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Essential.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Essential.kt @@ -74,6 +74,7 @@ import it.fast4x.rimusic.cleanPrefix import it.fast4x.rimusic.utils.colorPaletteModeKey import it.fast4x.rimusic.utils.colorPaletteNameKey import it.fast4x.rimusic.utils.effectRotationKey +import it.fast4x.rimusic.utils.getLikeState import it.fast4x.rimusic.utils.getLikedIcon import it.fast4x.rimusic.utils.getUnlikedIcon import it.fast4x.rimusic.utils.playerBackgroundColorsKey @@ -81,6 +82,7 @@ import it.fast4x.rimusic.utils.playerControlsTypeKey import it.fast4x.rimusic.utils.queueLoopEnabledKey import it.fast4x.rimusic.utils.rememberPreference import it.fast4x.rimusic.utils.semiBold +import it.fast4x.rimusic.utils.setLikeState import it.fast4x.rimusic.utils.trackLoopEnabledKey import it.fast4x.rimusic.utils.showthumbnailKey import it.fast4x.rimusic.utils.textoutlineKey @@ -195,13 +197,15 @@ fun InfoAlbumAndArtistEssential( ) { IconButton( color = colorPalette().favoritesIcon, - icon = if (likedAt == null) getUnlikedIcon() else getLikedIcon(), + icon = getLikeState(mediaId), + //icon = if (likedAt == null) getUnlikedIcon() else getLikedIcon(), onClick = { val currentMediaItem = binder.player.currentMediaItem query { if (Database.like( mediaId, - if (likedAt == null) System.currentTimeMillis() else null + //if (likedAt == null) System.currentTimeMillis() else null + setLikeState(likedAt) ) == 0 ) { currentMediaItem diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Modern.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Modern.kt index 0958db2817..acf6bcd173 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Modern.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/player/components/controls/Modern.kt @@ -71,6 +71,8 @@ import it.fast4x.rimusic.utils.colorPaletteModeKey import it.fast4x.rimusic.utils.doubleShadowDrop import it.fast4x.rimusic.utils.dropShadow import it.fast4x.rimusic.utils.effectRotationKey +import it.fast4x.rimusic.utils.getDislikedIcon +import it.fast4x.rimusic.utils.getLikeState import it.fast4x.rimusic.utils.getLikedIcon import it.fast4x.rimusic.utils.getUnlikedIcon import it.fast4x.rimusic.utils.playerBackgroundColorsKey @@ -78,6 +80,7 @@ import it.fast4x.rimusic.utils.playerControlsTypeKey import it.fast4x.rimusic.utils.playerInfoShowIconsKey import it.fast4x.rimusic.utils.rememberPreference import it.fast4x.rimusic.utils.semiBold +import it.fast4x.rimusic.utils.setLikeState import it.fast4x.rimusic.utils.showthumbnailKey import it.fast4x.rimusic.utils.textoutlineKey import me.knighthat.colorPalette @@ -209,19 +212,22 @@ fun InfoAlbumAndArtistModern( Box{ IconButton( color = colorPalette().favoritesIcon, - icon = if (likedAt == null) getUnlikedIcon() else getLikedIcon(), + icon = getLikeState(mediaId), + //if (likedAt == null) getUnlikedIcon() else getLikedIcon(), onClick = { val currentMediaItem = binder.player.currentMediaItem query { if (Database.like( mediaId, - if (likedAt == null) System.currentTimeMillis() else null + //if (likedAt == null) System.currentTimeMillis() else null + setLikeState(likedAt) ) == 0 ) { currentMediaItem ?.takeIf { it.mediaId == mediaId } ?.let { Database.insert(currentMediaItem, Song::toggleLike) + } } } diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/UiSettings.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/UiSettings.kt index 5a6be651e4..77731d706d 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/UiSettings.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/settings/UiSettings.kt @@ -50,6 +50,7 @@ import androidx.media3.common.util.UnstableApi import androidx.navigation.NavController import it.fast4x.rimusic.LocalPlayerServiceBinder import it.fast4x.rimusic.R +import it.fast4x.rimusic.enums.AudioQualityFormat import it.fast4x.rimusic.enums.BackgroundProgress import it.fast4x.rimusic.enums.CarouselSize import it.fast4x.rimusic.enums.ClickLyricsText @@ -100,6 +101,7 @@ import it.fast4x.rimusic.utils.MaxTopPlaylistItemsKey import it.fast4x.rimusic.utils.UiTypeKey import it.fast4x.rimusic.utils.actionspacedevenlyKey import it.fast4x.rimusic.utils.applyFontPaddingKey +import it.fast4x.rimusic.utils.audioQualityFormatKey import it.fast4x.rimusic.utils.backgroundProgressKey import it.fast4x.rimusic.utils.blackgradientKey import it.fast4x.rimusic.utils.buttonzoomoutKey @@ -198,6 +200,7 @@ import it.fast4x.rimusic.utils.showButtonPlayerMenuKey import it.fast4x.rimusic.utils.showButtonPlayerShuffleKey import it.fast4x.rimusic.utils.showButtonPlayerSleepTimerKey import it.fast4x.rimusic.utils.showButtonPlayerSystemEqualizerKey +import it.fast4x.rimusic.utils.showCachedPlaylistKey import it.fast4x.rimusic.utils.showDownloadedPlaylistKey import it.fast4x.rimusic.utils.showFavoritesPlaylistKey import it.fast4x.rimusic.utils.showFloatingIconKey @@ -555,7 +558,7 @@ fun UiSettings( var skipSilence by rememberPreference(skipSilenceKey, false) var volumeNormalization by rememberPreference(volumeNormalizationKey, false) - //var audioQualityFormat by rememberPreference(audioQualityFormatKey, AudioQualityFormat.Auto) + var audioQualityFormat by rememberPreference(audioQualityFormatKey, AudioQualityFormat.Auto) var recommendationsNumber by rememberPreference(recommendationsNumberKey, RecommendationsNumber.`5`) @@ -610,7 +613,7 @@ fun UiSettings( ) var showFavoritesPlaylist by rememberPreference(showFavoritesPlaylistKey, true) - //var showCachedPlaylist by rememberPreference(showCachedPlaylistKey, true) + var showCachedPlaylist by rememberPreference(showCachedPlaylistKey, true) var showMyTopPlaylist by rememberPreference(showMyTopPlaylistKey, true) var showDownloadedPlaylist by rememberPreference(showDownloadedPlaylistKey, true) var showOnDevicePlaylist by rememberPreference(showOnDevicePlaylistKey, true) @@ -938,7 +941,7 @@ fun UiSettings( SettingsGroupSpacer() SettingsEntryGroupText(stringResource(R.string.player)) - /* + if (filter.isNullOrBlank() || stringResource(R.string.audio_quality_format).contains(filterCharSequence,true)) { EnumValueSelectorSettingsEntry( title = stringResource(R.string.audio_quality_format), @@ -975,7 +978,7 @@ fun UiSettings( } } } - */ + if (filter.isNullOrBlank() || stringResource(R.string.player_pause_listen_history).contains(filterCharSequence,true)) { SwitchSettingEntry( title = stringResource(R.string.player_pause_listen_history), @@ -1861,7 +1864,7 @@ fun UiSettings( isChecked = showFavoritesPlaylist, onCheckedChange = { showFavoritesPlaylist = it } ) - /* + if (filter.isNullOrBlank() || "${stringResource(R.string.show)} ${stringResource(R.string.cached)}".contains(filterCharSequence,true)) SwitchSettingEntry( title = "${stringResource(R.string.show)} ${stringResource(R.string.cached)}", @@ -1869,7 +1872,7 @@ fun UiSettings( isChecked = showCachedPlaylist, onCheckedChange = { showCachedPlaylist = it } ) - */ + if (filter.isNullOrBlank() || "${stringResource(R.string.show)} ${stringResource(R.string.downloaded)}".contains(filterCharSequence,true)) SwitchSettingEntry( title = "${stringResource(R.string.show)} ${stringResource(R.string.downloaded)}", diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/GetLikeIconType.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/GetLikeIconType.kt index 62fd132b18..7cef12057b 100644 --- a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/GetLikeIconType.kt +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/GetLikeIconType.kt @@ -33,4 +33,9 @@ fun getUnlikedIcon(): Int { IconLikeType.Breaked -> R.drawable.heart_breaked_yes IconLikeType.Striped -> R.drawable.heart_striped_outline } +} + +@Composable +fun getDislikedIcon(): Int { + return R.drawable.heart_dislike } \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/LikeState.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/LikeState.kt new file mode 100644 index 0000000000..f7d3967e09 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/utils/LikeState.kt @@ -0,0 +1,43 @@ +package it.fast4x.rimusic.utils + +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.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import it.fast4x.rimusic.Database +import it.fast4x.rimusic.models.Song +import it.fast4x.rimusic.query +import kotlinx.coroutines.flow.distinctUntilChanged + +@Composable +fun getLikeState(mediaId: String): Int { + var likedAt by remember { + mutableStateOf(null) + } + + LaunchedEffect(mediaId) { + Database.likedAt(mediaId).distinctUntilChanged().collect { likedAt = it } + } + + return when (likedAt) { + -1L -> getDislikedIcon() + null -> getUnlikedIcon() + else -> getLikedIcon() + } + +} + +fun setLikeState(likedAt: Long?): Long? { + val current = + when (likedAt) { + -1L -> null + null -> System.currentTimeMillis() + else -> -1L + } + //println("mediaItem setLikeState: $current") + return current + +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/me/knighthat/ui/screens/settings/about/Developer.kt b/composeApp/src/androidMain/kotlin/me/knighthat/ui/screens/settings/about/Developer.kt index fdb881a3db..80bc18e91c 100644 --- a/composeApp/src/androidMain/kotlin/me/knighthat/ui/screens/settings/about/Developer.kt +++ b/composeApp/src/androidMain/kotlin/me/knighthat/ui/screens/settings/about/Developer.kt @@ -73,7 +73,7 @@ data class Developer( Row( modifier = Modifier .fillMaxWidth() - .padding(16.dp), + .padding(vertical = 10.dp, horizontal = 15.dp), verticalAlignment = Alignment.CenterVertically ) { // Avatar @@ -81,7 +81,7 @@ data class Developer( painter = avatarPainter, contentDescription = null, modifier = Modifier - .size(50.dp) + .size(40.dp) .clip( RoundedCornerShape( 25.dp ) ) .border( 1.dp, Color.White, RoundedCornerShape( 25.dp ) ), contentScale = ContentScale.Fit @@ -95,7 +95,7 @@ data class Developer( text = displayName ?: username, style = TextStyle( color = colorPalette().text, - fontSize = typography().xl.fontSize, + fontSize = typography().m.fontSize, fontWeight = FontWeight.Bold ), textAlign = TextAlign.Start @@ -107,7 +107,7 @@ data class Developer( text = "@$handle", style = TextStyle( color = colorPalette().textSecondary, - fontSize = typography().s.fontSize, + fontSize = typography().xs.fontSize, fontStyle = FontStyle.Italic, ), modifier = Modifier @@ -124,7 +124,7 @@ data class Developer( text = contributions.toString(), style = TextStyle( color = color, - fontSize = typography().s.fontSize, + fontSize = typography().xs.fontSize, ), textAlign = TextAlign.End, modifier = Modifier.weight( 1f ) @@ -137,7 +137,7 @@ data class Developer( painter = painterResource( R.drawable.git_pull_request_outline ), contentDescription = null, tint = color, - modifier = Modifier.size( typography().s.fontSize.value.dp ) + modifier = Modifier.size( typography().xs.fontSize.value.dp ) ) } } diff --git a/composeApp/src/androidMain/res/drawable-anydpi/ic_banner_background.xml b/composeApp/src/androidMain/res/drawable-anydpi/ic_banner_background.xml new file mode 100644 index 0000000000..784dc098f3 --- /dev/null +++ b/composeApp/src/androidMain/res/drawable-anydpi/ic_banner_background.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/composeApp/src/androidMain/res/drawable-nodpi/app_icon.xml b/composeApp/src/androidMain/res/drawable-nodpi/app_icon.xml deleted file mode 100644 index f1e2f0b6aa..0000000000 --- a/composeApp/src/androidMain/res/drawable-nodpi/app_icon.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/composeApp/src/androidMain/res/drawable/app_icon.xml b/composeApp/src/androidMain/res/drawable/app_icon.xml index 87ab18ad6a..b1817025af 100644 --- a/composeApp/src/androidMain/res/drawable/app_icon.xml +++ b/composeApp/src/androidMain/res/drawable/app_icon.xml @@ -2,23 +2,8 @@ android:width="512dp" android:height="512dp" android:viewportWidth="512" - android:viewportHeight="512" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://schemas.android.com/apk/res/android "> + android:viewportHeight="512"> - - + android:pathData="M255,-0.5C113.6,-0.5 -1,114.1 -1,255.5s114.6,256 256,256a256.51,256.51 0,0 0,81.9 -13.4l-38.1,-66a30.26,30.26 0,0 1,-3.8 -11.3,29.92 29.92,0 0,1 0.9,-11.9 29.59,29.59 0,0 1,5.4 -10.6,30.62 30.62,0 0,1 9.1,-7.7c14.4,-8 32.6,-2.5 40.9,11.7L391.5,472A255.46,255.46 0,0 0,511 255.5C511,114.1 396.4,-0.5 255,-0.5ZM310.4,357.8a34.23,34.23 0,0 1,-53.8 7.1,34.48 34.48,0 0,1 -9.7,-19.7 33.9,33.9 0,0 1,4.3 -21.6,34.75 34.75,0 0,1 16.5,-14.5 34.31,34.31 0,0 1,40.2 10.8,34.19 34.19,0 0,1 7.1,20.8A35.31,35.31 0,0 1,310.4 357.8ZM426.8,282.3a57.29,57.29 0,0 1,-21.4 21.2l-33.2,19.1a30.29,30.29 0,0 1,-23 3.4,30.44 30.44,0 0,1 -10.7,-5.2 29,29 0,0 1,-7.8 -8.9,30.39 30.39,0 0,1 -3.8,-11.2 29.29,29.29 0,0 1,0.9 -11.8,31.32 31.32,0 0,1 5.4,-10.6 33.18,33.18 0,0 1,9 -7.7l11.6,-6.7a12.48,12.48 0,0 0,4.7 -4.7,14.72 14.72,0 0,0 1.8,-6.5 13.41,13.41 0,0 0,-1.7 -6.5,12.73 12.73,0 0,0 -4.7,-4.8L208.3,154.3a13.62,13.62 0,0 0,-6.5 -1.9,13.79 13.79,0 0,0 -6.6,1.7 12.31,12.31 0,0 0,-4.8 4.8,12.85 12.85,0 0,0 -1.8,6.6L188.6,390.6a30.1,30.1 0,1 1,-60.2 0v-251a58.16,58.16 0,0 1,29.3 -50.8l0.4,-0.2a56.94,56.94 0,0 1,29.6 -7.7,57.61 57.61,0 0,1 29.4,8.4L406.2,202.5a58.76,58.76 0,0 1,20.6 79.8Z" + android:fillColor="#58cc86"/> diff --git a/composeApp/src/androidMain/res/drawable/app_logo.xml b/composeApp/src/androidMain/res/drawable/app_logo.xml index 7dda777167..784dc098f3 100644 --- a/composeApp/src/androidMain/res/drawable/app_logo.xml +++ b/composeApp/src/androidMain/res/drawable/app_logo.xml @@ -1,31 +1,54 @@ + xmlns:aapt="http://schemas.android.com/aapt" + android:width="500dp" + android:height="250dp" + android:viewportWidth="500" + android:viewportHeight="250"> + android:pathData="M305.81,87.7C307.79,84.49 308.76,80.62 308.76,76.02C308.76,71.52 307.79,67.62 305.87,64.3C303.93,60.99 301.06,58.34 297.63,56.69C294.09,54.92 289.87,54 284.97,54H258V120H273.77V97.43H281.85L293.8,120H311L297.47,94.89C301.07,93.28 303.86,90.89 305.81,87.7ZM273.77,66.93H281.56C283.93,66.93 285.91,67.26 287.54,67.95C289.05,68.53 290.33,69.59 291.2,70.97C292.05,72.31 292.43,73.99 292.43,76.02C292.43,78.05 292.01,79.72 291.2,81.03C290.32,82.36 289.03,83.37 287.54,83.92C285.94,84.54 283.96,84.83 281.56,84.83H273.77V66.93Z" + android:fillColor="#4AD17F"/> + android:pathData="M333,78H317V120H333V78Z" + android:fillColor="#4AD17F"/> + android:pathData="M325,70C323.42,70 321.87,69.53 320.56,68.65C319.24,67.77 318.22,66.53 317.61,65.06C317,63.6 316.85,61.99 317.15,60.44C317.46,58.89 318.22,57.46 319.34,56.34C320.46,55.22 321.89,54.46 323.44,54.15C324.99,53.85 326.6,54 328.06,54.61C329.52,55.21 330.77,56.24 331.65,57.56C332.53,58.87 333,60.42 333,62C333,64.12 332.15,66.15 330.65,67.65C329.16,69.15 327.12,70 325,70Z" + android:fillColor="#4AD17F"/> - + android:pathData="M263,131.84C263.99,131.84 264.96,132.14 265.78,132.7C266.61,133.25 267.25,134.04 267.63,134.96L285.92,179.87C285.95,179.97 286.02,180.05 286.1,180.11C286.18,180.17 286.28,180.2 286.38,180.2C286.48,180.2 286.58,180.17 286.66,180.11C286.74,180.05 286.8,179.97 286.83,179.87L305.12,134.96C305.56,133.88 306.36,132.99 307.38,132.44C308.4,131.89 309.58,131.71 310.72,131.94C311.85,132.16 312.88,132.77 313.61,133.67C314.35,134.57 314.75,135.7 314.76,136.86V186.77C314.76,187.64 314.41,188.47 313.8,189.09C313.19,189.71 312.36,190.05 311.49,190.05C310.63,190.05 309.79,189.71 309.18,189.09C308.57,188.47 308.23,187.64 308.23,186.77V146.16C308.23,146.07 308.19,145.99 308.13,145.93C308.07,145.87 307.98,145.83 307.9,145.83C307.83,145.84 307.77,145.86 307.71,145.9C307.66,145.93 307.61,145.98 307.57,146.03L290.75,187.13C290.4,188 289.79,188.75 289.01,189.27C288.23,189.8 287.32,190.08 286.38,190.08C285.44,190.09 284.52,189.81 283.74,189.28C282.96,188.75 282.35,188 282,187.13L265.18,146.02C265.16,145.96 265.11,145.9 265.05,145.87C264.99,145.83 264.93,145.82 264.86,145.82C264.77,145.82 264.69,145.86 264.63,145.92C264.57,145.98 264.53,146.06 264.53,146.15V186.76C264.53,187.63 264.19,188.47 263.57,189.09C262.96,189.7 262.13,190.05 261.27,190.05C260.4,190.05 259.57,189.7 258.96,189.09C258.34,188.47 258,187.63 258,186.76V136.86C258,135.53 258.53,134.25 259.46,133.31C260.4,132.37 261.67,131.84 263,131.84ZM349.69,172.21V149.74C349.72,148.87 350.08,148.04 350.7,147.43C351.32,146.82 352.16,146.48 353.03,146.48C353.89,146.48 354.73,146.82 355.35,147.43C355.97,148.04 356.33,148.87 356.36,149.74V186.73C356.33,187.6 355.97,188.43 355.35,189.04C354.73,189.65 353.89,189.99 353.03,189.99C352.16,189.99 351.32,189.65 350.7,189.04C350.08,188.43 349.72,187.6 349.69,186.73V182.69H349.24C348.18,184.96 346.55,186.91 344.5,188.34C342.35,189.88 339.64,190.64 336.37,190.64C333.66,190.64 331.24,190.05 329.12,188.83C326.95,187.57 325.22,185.67 324.16,183.38C322.95,180.95 322.36,177.87 322.36,174.15V149.74C322.36,148.85 322.71,148 323.34,147.37C323.96,146.75 324.81,146.39 325.69,146.39C326.58,146.39 327.42,146.75 328.05,147.37C328.67,148 329.02,148.85 329.02,149.74V173.69C329.02,176.88 329.91,179.41 331.67,181.31C333.43,183.21 335.75,184.17 338.53,184.17C340.29,184.14 342.02,183.7 343.59,182.88C345.36,182 346.86,180.65 347.93,178.98C349.11,177.21 349.69,174.97 349.69,172.21V172.21ZM390.25,157.2C389.61,157.37 388.93,157.34 388.31,157.11C387.69,156.87 387.16,156.44 386.79,155.88C386.6,155.59 386.37,155.26 386.14,154.96C385.36,153.95 384.35,153.13 383.2,152.57C381.96,151.94 380.36,151.61 378.43,151.61C375.79,151.61 373.57,152.24 371.8,153.45C370.04,154.66 369.19,156.21 369.19,158.08C369.19,159.76 369.78,161.07 370.99,162.02C372.2,162.97 374.09,163.79 376.64,164.45L383.07,166.03C386.95,166.98 389.83,168.43 391.76,170.36C393.68,172.3 394.6,174.8 394.6,177.85C394.62,180.26 393.87,182.61 392.44,184.55C391.03,186.52 389.04,188.07 386.5,189.22C383.95,190.37 380.98,190.92 377.61,190.92C373.17,190.92 369.52,189.97 366.61,188.04C364.83,186.87 363.37,185.25 362.4,183.35C362.18,182.91 362.06,182.43 362.06,181.94C362.05,181.45 362.15,180.96 362.35,180.52C362.56,180.07 362.86,179.68 363.23,179.37C363.61,179.06 364.05,178.83 364.52,178.72L364.65,178.68C365.37,178.51 366.12,178.59 366.79,178.9C367.46,179.21 368,179.74 368.34,180.39C368.93,181.54 369.8,182.54 370.86,183.28C372.55,184.46 374.77,185.05 377.52,185.05C380.62,185.05 383.1,184.4 384.93,183.05C386.76,181.7 387.71,180.09 387.71,178.22C387.73,177.51 387.59,176.8 387.32,176.14C387.04,175.49 386.63,174.9 386.11,174.41C385.06,173.36 383.43,172.6 381.24,172.08L373.99,170.37C370.01,169.42 367.1,167.94 365.24,165.97C363.38,164 362.46,161.43 362.46,158.45C362.43,156.1 363.15,153.81 364.52,151.91C365.92,150 367.82,148.53 370.2,147.44C372.59,146.36 375.36,145.83 378.4,145.83C382.71,145.83 386.07,146.79 388.52,148.69C389.91,149.74 391.09,151.03 392.01,152.5C392.28,152.91 392.45,153.38 392.51,153.87C392.56,154.35 392.5,154.85 392.33,155.3C392.15,155.76 391.88,156.17 391.52,156.5C391.15,156.83 390.72,157.07 390.25,157.2V157.2ZM399.07,186.73V149.74C399.06,149.29 399.13,148.85 399.3,148.43C399.46,148.01 399.7,147.63 400.01,147.31C400.32,146.99 400.69,146.74 401.1,146.56C401.51,146.39 401.95,146.3 402.4,146.3C402.85,146.3 403.29,146.39 403.7,146.56C404.11,146.74 404.48,146.99 404.79,147.31C405.1,147.63 405.34,148.01 405.5,148.43C405.67,148.85 405.74,149.29 405.73,149.74V186.73C405.74,187.18 405.67,187.63 405.5,188.04C405.34,188.46 405.1,188.84 404.79,189.16C404.48,189.48 404.11,189.74 403.7,189.91C403.29,190.09 402.85,190.17 402.4,190.17C401.95,190.17 401.51,190.09 401.1,189.91C400.69,189.74 400.32,189.48 400.01,189.16C399.7,188.84 399.46,188.46 399.3,188.04C399.13,187.63 399.06,187.18 399.07,186.73ZM402.47,139.13C401.21,139.15 400,138.66 399.1,137.79C398.67,137.37 398.32,136.87 398.09,136.32C397.85,135.76 397.73,135.17 397.73,134.57C397.73,133.96 397.85,133.37 398.09,132.82C398.32,132.26 398.67,131.76 399.1,131.35C400,130.47 401.21,129.99 402.47,130C403.08,129.99 403.7,130.11 404.27,130.34C404.84,130.57 405.36,130.91 405.8,131.35C406.24,131.76 406.59,132.26 406.83,132.81C407.08,133.36 407.2,133.96 407.2,134.57C407.2,135.17 407.08,135.77 406.83,136.32C406.59,136.88 406.24,137.38 405.8,137.79C404.9,138.66 403.71,139.14 402.47,139.13ZM430.02,191C425.94,191 422.45,190.05 419.51,188.11C416.58,186.17 414.32,183.51 412.72,180.13C411.12,176.75 410.34,172.87 410.34,168.5C410.34,164.07 411.15,160.16 412.75,156.74C414.35,153.32 416.67,150.66 419.61,148.76C422.55,146.85 425.98,145.87 429.9,145.87C432.96,145.87 435.71,146.42 438.16,147.57C441.38,149.02 444.02,151.52 445.64,154.67C445.83,155.05 445.95,155.48 445.99,155.91C446.02,156.35 445.97,156.79 445.84,157.2C445.71,157.62 445.49,158 445.21,158.33C444.93,158.66 444.59,158.94 444.2,159.13C443.82,159.33 443.39,159.45 442.96,159.49C442.53,159.52 442.09,159.47 441.68,159.34C441.27,159.2 440.89,158.99 440.56,158.71C440.23,158.42 439.95,158.08 439.76,157.69C439.09,156.35 438.16,155.17 437.02,154.21C435.29,152.66 432.93,151.88 429.99,151.88C427.56,151.83 425.16,152.54 423.14,153.91C421.12,155.35 419.55,157.33 418.6,159.63C417.52,162.06 417,164.95 417,168.24C417,171.62 417.52,174.54 418.57,177.04C419.61,179.54 421.15,181.47 423.11,182.85C425.07,184.23 427.35,184.92 429.99,184.92C431.62,184.95 433.23,184.63 434.73,184C436.12,183.42 437.35,182.52 438.32,181.38C438.9,180.71 439.39,179.95 439.76,179.14C440.03,178.58 440.45,178.11 440.98,177.78C441.5,177.45 442.11,177.27 442.73,177.28C445.11,177.28 446.71,179.77 445.67,181.91C445.27,182.72 444.82,183.5 444.3,184.24C442.77,186.32 440.77,188 438.45,189.13C436.04,190.41 433.23,191 430.02,191Z" + android:fillColor="#4AD17F"/> + + + + + + + + + + + + + + + + + + + + + + diff --git a/composeApp/src/androidMain/res/drawable/app_logo_text.xml b/composeApp/src/androidMain/res/drawable/app_logo_text.xml index 9e12a4d549..284af6353d 100644 --- a/composeApp/src/androidMain/res/drawable/app_logo_text.xml +++ b/composeApp/src/androidMain/res/drawable/app_logo_text.xml @@ -1,13 +1,9 @@ + android:viewportWidth="1429" + android:viewportHeight="512"> + android:pathData="M113,95.3C118.5,95.3 123.9,97 128.6,100.1C133.2,103.2 136.8,107.6 138.9,112.8L241.2,364.6C241.4,365.2 241.8,365.6 242.2,366C242.7,366.3 243.2,366.5 243.8,366.5C244.4,366.5 244.9,366.3 245.4,366C245.8,365.6 246.2,365.2 246.4,364.6L348.7,112.8C351.1,106.8 355.6,101.8 361.3,98.7C367,95.6 373.6,94.6 380,95.9C386.3,97.1 392.1,100.6 396.2,105.6C400.3,110.6 402.6,117 402.6,123.5V403.3C402.6,408.2 400.7,412.8 397.2,416.3C393.8,419.7 389.2,421.7 384.3,421.7C379.5,421.7 374.8,419.7 371.4,416.3C368,412.8 366,408.2 366,403.3V175.6C366,175.1 365.8,174.7 365.5,174.3C365.2,174 364.7,173.8 364.2,173.8C363.8,173.8 363.5,173.9 363.2,174.1C362.9,174.3 362.6,174.6 362.4,174.9L268.3,405.3C266.3,410.2 262.9,414.4 258.5,417.3C254.2,420.3 249,421.8 243.8,421.8C238.5,421.9 233.4,420.3 229,417.4C224.7,414.4 221.3,410.2 219.3,405.3L125.2,174.8C125,174.5 124.8,174.2 124.5,174C124.1,173.8 123.8,173.7 123.4,173.7C122.9,173.7 122.4,173.9 122.1,174.3C121.7,174.6 121.5,175.1 121.5,175.6V403.2C121.5,408.1 119.6,412.8 116.2,416.3C112.8,419.7 108.1,421.7 103.3,421.7C98.4,421.7 93.8,419.7 90.4,416.3C86.9,412.8 85,408.1 85,403.2V123.5C85,116 88,108.8 93.2,103.5C98.4,98.3 105.6,95.3 113,95.3ZM598.1,321.6V195.7C598.2,190.8 600.3,186.1 603.7,182.7C607.2,179.3 611.9,177.4 616.7,177.4C621.6,177.4 626.3,179.3 629.7,182.7C633.2,186.1 635.3,190.8 635.4,195.7V403.1C635.3,408 633.2,412.6 629.7,416C626.3,419.4 621.6,421.3 616.7,421.3C611.9,421.3 607.2,419.4 603.7,416C600.3,412.6 598.2,408 598.1,403.1V380.4H595.5C589.6,393.1 580.5,404.1 569,412.1C557,420.7 541.8,425 523.5,425C508.4,425 494.9,421.7 483,414.9C470.8,407.8 461.1,397.1 455.2,384.3C448.5,370.7 445.2,353.4 445.2,332.5V195.7C445.2,190.7 447.1,185.9 450.6,182.4C454.1,178.9 458.9,176.9 463.8,176.9C468.7,176.9 473.5,178.9 477,182.4C480.5,185.9 482.4,190.7 482.4,195.7V330C482.4,347.8 487.4,362 497.2,372.7C507.1,383.3 520.1,388.7 535.6,388.7C545.5,388.5 555.2,386.1 563.9,381.5C573.8,376.5 582.2,369 588.2,359.6C594.8,349.7 598.1,337.1 598.1,321.7V321.6ZM825,237.5C821.5,238.5 817.7,238.3 814.2,237C810.7,235.7 807.7,233.2 805.7,230.1C804.6,228.5 803.3,226.6 802,225C797.6,219.3 792,214.7 785.6,211.5C778.6,208 769.7,206.2 758.9,206.2C744.1,206.2 731.7,209.7 721.8,216.5C711.9,223.3 707.2,231.9 707.2,242.4C707.2,251.8 710.5,259.2 717.2,264.5C724,269.9 734.6,274.5 748.9,278.1L784.8,287C806.6,292.3 822.7,300.4 833.5,311.3C844.2,322.1 849.4,336.2 849.4,353.3C849.5,366.8 845.3,380 837.3,390.8C829.4,401.9 818.3,410.6 804,417C789.8,423.5 773.2,426.6 754.3,426.6C729.5,426.6 709,421.2 692.8,410.4C682.8,403.8 674.6,394.8 669.2,384.1C668,381.6 667.3,378.9 667.3,376.2C667.2,373.4 667.8,370.7 668.9,368.2C670.1,365.7 671.8,363.5 673.9,361.8C676,360 678.4,358.8 681.1,358.1L681.8,357.9C685.8,357 690,357.4 693.8,359.2C697.5,360.9 700.5,363.8 702.4,367.5C705.8,374 710.6,379.5 716.5,383.7C726,390.3 738.4,393.7 753.8,393.7C771.1,393.7 785,390 795.3,382.4C805.5,374.9 810.8,365.8 810.8,355.4C810.9,351.4 810.2,347.4 808.6,343.7C807.1,340 804.8,336.7 801.8,334C796,328.1 786.9,323.9 774.6,320.9L734.1,311.3C711.8,306 695.5,297.7 685.1,286.7C674.7,275.6 669.5,261.2 669.5,244.5C669.3,231.3 673.4,218.5 681.1,207.8C688.9,197.2 699.5,188.9 712.9,182.8C726.2,176.7 741.7,173.8 758.7,173.8C782.8,173.8 801.7,179.1 815.4,189.8C823.1,195.7 829.7,202.9 834.9,211.2C836.4,213.5 837.4,216.1 837.7,218.8C838,221.5 837.6,224.3 836.7,226.9C835.7,229.4 834.1,231.7 832.1,233.6C830.1,235.4 827.7,236.8 825,237.5V237.5ZM874.4,403.1V195.7C874.3,193.2 874.8,190.7 875.7,188.3C876.6,186 877.9,183.9 879.7,182.1C881.4,180.3 883.5,178.8 885.8,177.9C888.1,176.9 890.5,176.4 893,176.4C895.5,176.4 898,176.9 900.3,177.9C902.6,178.8 904.6,180.3 906.4,182.1C908.1,183.9 909.5,186 910.4,188.3C911.3,190.7 911.7,193.2 911.7,195.7V403.1C911.7,405.6 911.3,408.1 910.4,410.4C909.5,412.8 908.1,414.9 906.4,416.7C904.6,418.5 902.6,419.9 900.3,420.9C898,421.9 895.5,422.4 893,422.4C890.5,422.4 888.1,421.9 885.8,420.9C883.5,419.9 881.4,418.5 879.7,416.7C877.9,414.9 876.6,412.8 875.7,410.4C874.8,408.1 874.3,405.6 874.4,403.1ZM893.4,136.2C886.4,136.3 879.6,133.6 874.6,128.7C872.1,126.3 870.2,123.5 868.9,120.4C867.6,117.3 866.9,114 866.9,110.6C866.9,107.2 867.6,103.9 868.9,100.8C870.2,97.7 872.1,94.9 874.6,92.6C879.6,87.6 886.4,84.9 893.4,85C896.8,85 900.3,85.6 903.5,86.9C906.7,88.2 909.6,90.1 912,92.6C914.5,94.9 916.5,97.6 917.8,100.8C919.2,103.9 919.9,107.2 919.9,110.6C919.9,114 919.2,117.3 917.8,120.5C916.5,123.6 914.5,126.4 912,128.7C907,133.5 900.3,136.2 893.4,136.2ZM1047.6,427C1024.8,427 1005.2,421.7 988.8,410.8C972.3,399.9 959.7,385 950.8,366C941.8,347.1 937.4,325.3 937.4,300.9C937.4,276 942,254.1 951,234.9C959.9,215.8 972.9,200.9 989.3,190.2C1005.8,179.5 1025,174 1046.9,174C1064.1,174 1079.4,177.1 1093.1,183.5C1111.2,191.6 1125.9,205.6 1135,223.3C1136.1,225.5 1136.8,227.8 1136.9,230.3C1137.1,232.7 1136.8,235.2 1136.1,237.5C1135.4,239.8 1134.2,242 1132.6,243.8C1131,245.7 1129.1,247.2 1126.9,248.3C1124.8,249.5 1122.4,250.1 1120,250.3C1117.6,250.5 1115.2,250.2 1112.8,249.5C1110.5,248.7 1108.4,247.5 1106.5,245.9C1104.7,244.4 1103.2,242.4 1102.1,240.2C1098.3,232.8 1093.1,226.1 1086.7,220.7C1077,212.1 1063.9,207.6 1047.4,207.6C1033.8,207.4 1020.4,211.4 1009.1,219.1C997.8,227.1 989,238.3 983.7,251.1C977.6,264.7 974.7,280.9 974.7,299.4C974.7,318.3 977.6,334.7 983.5,348.7C989.3,362.7 997.9,373.6 1008.9,381.3C1019.9,389.1 1032.7,392.9 1047.4,392.9C1056.5,393.1 1065.6,391.3 1073.9,387.8C1081.7,384.5 1088.6,379.5 1094,373C1097.3,369.3 1100,365.1 1102.1,360.5C1103.6,357.4 1105.9,354.7 1108.9,352.9C1111.8,351 1115.2,350 1118.7,350.1C1132,350.1 1141,364 1135.1,376C1132.9,380.6 1130.4,385 1127.5,389.1C1118.9,400.8 1107.7,410.2 1094.8,416.5C1081.2,423.7 1065.5,427 1047.6,427Z" + android:fillColor="#ffffff"/> diff --git a/composeApp/src/androidMain/res/drawable/ic_banner_background.xml b/composeApp/src/androidMain/res/drawable/ic_banner_background.xml deleted file mode 100644 index a8dae3596f..0000000000 --- a/composeApp/src/androidMain/res/drawable/ic_banner_background.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml b/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml index 813cdc5e76..a3ae759640 100644 --- a/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml +++ b/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml @@ -1,7 +1,9 @@ - - + + diff --git a/composeApp/src/androidMain/res/drawable/ic_logo_foreground.xml b/composeApp/src/androidMain/res/drawable/ic_logo_foreground.xml index c6d1a7f6b6..b162e6e127 100644 --- a/composeApp/src/androidMain/res/drawable/ic_logo_foreground.xml +++ b/composeApp/src/androidMain/res/drawable/ic_logo_foreground.xml @@ -3,20 +3,14 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - - - + + + + + diff --git a/composeApp/src/androidMain/res/raw/contributors.json b/composeApp/src/androidMain/res/raw/contributors.json index 0ddaf82a7b..a22e564769 100644 --- a/composeApp/src/androidMain/res/raw/contributors.json +++ b/composeApp/src/androidMain/res/raw/contributors.json @@ -4,7 +4,7 @@ "id": 1484476, "avatar_url": "https://avatars.githubusercontent.com/u/1484476?v=4", "html_url": "https://github.com/fast4x", - "contributions": 7221 + "contributions": 7250 }, { "login": "aneesh1122", @@ -102,6 +102,12 @@ "avatar_url": "https://avatars.githubusercontent.com/u/5006444?v=4", "html_url": "https://github.com/Craeckie" }, + { + "login": "jaimtres", + "id": 143116714, + "avatar_url": "https://avatars.githubusercontent.com/u/143116714?v=4", + "html_url": "https://github.com/jaimtres" + }, { "login": "locxter", "id": 54595101, diff --git a/composeApp/src/androidMain/res/values-af/strings.xml b/composeApp/src/androidMain/res/values-af/strings.xml index 4023c1bf34..ed493c4b3d 100644 --- a/composeApp/src/androidMain/res/values-af/strings.xml +++ b/composeApp/src/androidMain/res/values-af/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ar/strings.xml b/composeApp/src/androidMain/res/values-ar/strings.xml index f164c939e6..b73dd376e3 100644 --- a/composeApp/src/androidMain/res/values-ar/strings.xml +++ b/composeApp/src/androidMain/res/values-ar/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ba/strings.xml b/composeApp/src/androidMain/res/values-ba/strings.xml index 1f69227fea..2fd70de54d 100644 --- a/composeApp/src/androidMain/res/values-ba/strings.xml +++ b/composeApp/src/androidMain/res/values-ba/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-bn/strings.xml b/composeApp/src/androidMain/res/values-bn/strings.xml index 9a2e1389ee..4d0f460d96 100644 --- a/composeApp/src/androidMain/res/values-bn/strings.xml +++ b/composeApp/src/androidMain/res/values-bn/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ca/strings.xml b/composeApp/src/androidMain/res/values-ca/strings.xml index 7721546287..06bd693e55 100644 --- a/composeApp/src/androidMain/res/values-ca/strings.xml +++ b/composeApp/src/androidMain/res/values-ca/strings.xml @@ -746,8 +746,11 @@ Crea una llista de reproducció nova Guany de sonoritat de base Guany objectiu per a la normalització de la sonoritat - Components de Lletres a pantalla completa - Títol i Artistes - Mini cua + Media cannot be played + Full Screen Lyrics Components + Title and Artists + Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-cs/strings.xml b/composeApp/src/androidMain/res/values-cs/strings.xml index 8fd4e3ecea..942e5d763b 100644 --- a/composeApp/src/androidMain/res/values-cs/strings.xml +++ b/composeApp/src/androidMain/res/values-cs/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-da/strings.xml b/composeApp/src/androidMain/res/values-da/strings.xml index a2e59d5d0d..545f2418a2 100644 --- a/composeApp/src/androidMain/res/values-da/strings.xml +++ b/composeApp/src/androidMain/res/values-da/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-de/strings.xml b/composeApp/src/androidMain/res/values-de/strings.xml index a9df91d41c..368b24de4c 100644 --- a/composeApp/src/androidMain/res/values-de/strings.xml +++ b/composeApp/src/androidMain/res/values-de/strings.xml @@ -746,8 +746,11 @@ Neue Wiedergabeliste erstellen Lautstärke Grundverstärkung Zielverstärkung für die Lautstärkenormalisierung + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-el/strings.xml b/composeApp/src/androidMain/res/values-el/strings.xml index 4fc8a2be74..f4c6798eaf 100644 --- a/composeApp/src/androidMain/res/values-el/strings.xml +++ b/composeApp/src/androidMain/res/values-el/strings.xml @@ -746,4 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played + Full Screen Lyrics Components + Title and Artists + Mini Queue + Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-en/strings.xml b/composeApp/src/androidMain/res/values-en/strings.xml index 9fd3c45002..3be1b34a34 100644 --- a/composeApp/src/androidMain/res/values-en/strings.xml +++ b/composeApp/src/androidMain/res/values-en/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-eo/strings.xml b/composeApp/src/androidMain/res/values-eo/strings.xml index 22842c655c..b67643adfb 100644 --- a/composeApp/src/androidMain/res/values-eo/strings.xml +++ b/composeApp/src/androidMain/res/values-eo/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-es/strings.xml b/composeApp/src/androidMain/res/values-es/strings.xml index e57b0d51c0..02cc73d76f 100644 --- a/composeApp/src/androidMain/res/values-es/strings.xml +++ b/composeApp/src/androidMain/res/values-es/strings.xml @@ -746,8 +746,11 @@ Crear nueva playlist Ganancia base de volumen Ganancia objetivo para la normalización de volumen + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-et/strings.xml b/composeApp/src/androidMain/res/values-et/strings.xml index 4a3e50a163..5b1c3e2902 100644 --- a/composeApp/src/androidMain/res/values-et/strings.xml +++ b/composeApp/src/androidMain/res/values-et/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-fa/strings.xml b/composeApp/src/androidMain/res/values-fa/strings.xml index 22f6b215fc..31abc24aec 100644 --- a/composeApp/src/androidMain/res/values-fa/strings.xml +++ b/composeApp/src/androidMain/res/values-fa/strings.xml @@ -746,4 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played + Full Screen Lyrics Components + Title and Artists + Mini Queue + Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-fi/strings.xml b/composeApp/src/androidMain/res/values-fi/strings.xml index fb85fa2555..040c281d4e 100644 --- a/composeApp/src/androidMain/res/values-fi/strings.xml +++ b/composeApp/src/androidMain/res/values-fi/strings.xml @@ -746,8 +746,11 @@ Luo uusi soittolista Äänenvoimakkuuden vahvistus Tavoitevahvistus äänenvoimakkuuden normalisoimiseksi + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-fil/strings.xml b/composeApp/src/androidMain/res/values-fil/strings.xml index 18da68777c..c78ae443d6 100644 --- a/composeApp/src/androidMain/res/values-fil/strings.xml +++ b/composeApp/src/androidMain/res/values-fil/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-fr/strings.xml b/composeApp/src/androidMain/res/values-fr/strings.xml index 6e9e8c67e1..e7d3df266e 100644 --- a/composeApp/src/androidMain/res/values-fr/strings.xml +++ b/composeApp/src/androidMain/res/values-fr/strings.xml @@ -748,8 +748,11 @@ Créer une nouvelle playlist Gain de base du volume sonore Gain cible pour la normalisation du volume sonore + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ga/strings.xml b/composeApp/src/androidMain/res/values-ga/strings.xml index a9c7239423..14874dbc61 100644 --- a/composeApp/src/androidMain/res/values-ga/strings.xml +++ b/composeApp/src/androidMain/res/values-ga/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-gl/strings.xml b/composeApp/src/androidMain/res/values-gl/strings.xml index ef36c1760b..b71687a19d 100644 --- a/composeApp/src/androidMain/res/values-gl/strings.xml +++ b/composeApp/src/androidMain/res/values-gl/strings.xml @@ -746,8 +746,11 @@ Crear nova lista de reprodución Ganancia base de volume Ganancia obxetivo para a normalización do volume + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-he/strings.xml b/composeApp/src/androidMain/res/values-he/strings.xml index ac127264a7..1bd7a34980 100644 --- a/composeApp/src/androidMain/res/values-he/strings.xml +++ b/composeApp/src/androidMain/res/values-he/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-hi/strings.xml b/composeApp/src/androidMain/res/values-hi/strings.xml index 7269cc4346..895fbc00df 100644 --- a/composeApp/src/androidMain/res/values-hi/strings.xml +++ b/composeApp/src/androidMain/res/values-hi/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-hu/strings.xml b/composeApp/src/androidMain/res/values-hu/strings.xml index 4a88c9daf0..a72103cb6e 100644 --- a/composeApp/src/androidMain/res/values-hu/strings.xml +++ b/composeApp/src/androidMain/res/values-hu/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ia/strings.xml b/composeApp/src/androidMain/res/values-ia/strings.xml index d308a14679..e80ff1b5dc 100644 --- a/composeApp/src/androidMain/res/values-ia/strings.xml +++ b/composeApp/src/androidMain/res/values-ia/strings.xml @@ -746,8 +746,11 @@ Crear un nove lista de reproduction Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-id/strings.xml b/composeApp/src/androidMain/res/values-id/strings.xml index 4c54817ea4..d7192a3948 100644 --- a/composeApp/src/androidMain/res/values-id/strings.xml +++ b/composeApp/src/androidMain/res/values-id/strings.xml @@ -746,4 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played + Full Screen Lyrics Components + Title and Artists + Mini Queue + Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-in/strings.xml b/composeApp/src/androidMain/res/values-in/strings.xml index ad2a6624b6..118871d034 100644 --- a/composeApp/src/androidMain/res/values-in/strings.xml +++ b/composeApp/src/androidMain/res/values-in/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-it/strings.xml b/composeApp/src/androidMain/res/values-it/strings.xml index 786659d022..dbc76d56b2 100644 --- a/composeApp/src/androidMain/res/values-it/strings.xml +++ b/composeApp/src/androidMain/res/values-it/strings.xml @@ -746,8 +746,11 @@ Crea una nuova playlist Volume di riferimento Valore di riferimento per la normalizzazione del volume + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-iw/strings.xml b/composeApp/src/androidMain/res/values-iw/strings.xml index dd9e4f4fbf..4c4dd35951 100644 --- a/composeApp/src/androidMain/res/values-iw/strings.xml +++ b/composeApp/src/androidMain/res/values-iw/strings.xml @@ -746,4 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played + Full Screen Lyrics Components + Title and Artists + Mini Queue + Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ja/strings.xml b/composeApp/src/androidMain/res/values-ja/strings.xml index 292635a151..6a15653fef 100644 --- a/composeApp/src/androidMain/res/values-ja/strings.xml +++ b/composeApp/src/androidMain/res/values-ja/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ko/strings.xml b/composeApp/src/androidMain/res/values-ko/strings.xml index 777351820d..c658f1c07b 100644 --- a/composeApp/src/androidMain/res/values-ko/strings.xml +++ b/composeApp/src/androidMain/res/values-ko/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ml/strings.xml b/composeApp/src/androidMain/res/values-ml/strings.xml index 0de8cd1387..b8fbb701db 100644 --- a/composeApp/src/androidMain/res/values-ml/strings.xml +++ b/composeApp/src/androidMain/res/values-ml/strings.xml @@ -123,7 +123,7 @@ %1$s പ്ലേബാക്ക് ഇവന്റുകൾ നീക്കം ചെയ്യുക Existing data will be overwritten. %1$s will automatically close itself after restoring the database. ഫോൾഡർ കാഷെ - + Attention by clicking on the button below, the cache location folder will be reset to the default സ്ഥലം ഫോൾഡർ ആൻഡ്രോയിഡ് 10 മുതൽ ഈ സവിശേഷത ലഭ്യമല്ലാവും കാഷെ ലൊക്കേഷൻ ഫോൾഡർ പുന: ക്രമീകരിക്കുക @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-nl/strings.xml b/composeApp/src/androidMain/res/values-nl/strings.xml index 8bdf0ab410..1b7f1ada6a 100644 --- a/composeApp/src/androidMain/res/values-nl/strings.xml +++ b/composeApp/src/androidMain/res/values-nl/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-no/strings.xml b/composeApp/src/androidMain/res/values-no/strings.xml index 2606d941ae..c7500a5656 100644 --- a/composeApp/src/androidMain/res/values-no/strings.xml +++ b/composeApp/src/androidMain/res/values-no/strings.xml @@ -746,8 +746,11 @@ Lag ny spilleliste Grunnforsterkning for lydstyrke Målforsterkning for lydstyrkenormalisering + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-or/strings.xml b/composeApp/src/androidMain/res/values-or/strings.xml index fda149691a..0cf9fdedfa 100644 --- a/composeApp/src/androidMain/res/values-or/strings.xml +++ b/composeApp/src/androidMain/res/values-or/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-pl/strings.xml b/composeApp/src/androidMain/res/values-pl/strings.xml index 54dd203a47..c2796445ec 100644 --- a/composeApp/src/androidMain/res/values-pl/strings.xml +++ b/composeApp/src/androidMain/res/values-pl/strings.xml @@ -746,8 +746,11 @@ Utwórz nową playlistę Podstawowe wzmocnienie głośności Docelowe wzmocnienie dla normalizacji głośności + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-pt-rBR/strings.xml b/composeApp/src/androidMain/res/values-pt-rBR/strings.xml index e689098c0c..b45e57bb22 100644 --- a/composeApp/src/androidMain/res/values-pt-rBR/strings.xml +++ b/composeApp/src/androidMain/res/values-pt-rBR/strings.xml @@ -746,8 +746,11 @@ Criar uma seleção musical Estrutura de ganho Alvo ganho para a normalização do ruído + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-pt/strings.xml b/composeApp/src/androidMain/res/values-pt/strings.xml index 5efe47c78e..e386ddf723 100644 --- a/composeApp/src/androidMain/res/values-pt/strings.xml +++ b/composeApp/src/androidMain/res/values-pt/strings.xml @@ -746,8 +746,11 @@ Criar nova lista de reprodução Ganho de base de intensidade Ganho alvo para a normalização do volume + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ro/strings.xml b/composeApp/src/androidMain/res/values-ro/strings.xml index 68e9d80edc..c97ba13a15 100644 --- a/composeApp/src/androidMain/res/values-ro/strings.xml +++ b/composeApp/src/androidMain/res/values-ro/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ru/strings.xml b/composeApp/src/androidMain/res/values-ru/strings.xml index 4e6dd167c9..3b0d908258 100644 --- a/composeApp/src/androidMain/res/values-ru/strings.xml +++ b/composeApp/src/androidMain/res/values-ru/strings.xml @@ -747,9 +747,12 @@ Пользовательское зеркало Piped Создать новый плейлист Повышение уровня громкости - Наличие цели для нормализации громкости - Full Screen Lyrics Components - Title and Artists - Mini Queue - Controls + Целевая громкость для нормализации громкости + Media cannot be played + Компоненты полноэкранных текстов + Название и Исполнители + Мини-очередь + Управление + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-si/strings.xml b/composeApp/src/androidMain/res/values-si/strings.xml index b970abc0c5..36c24f0bcb 100644 --- a/composeApp/src/androidMain/res/values-si/strings.xml +++ b/composeApp/src/androidMain/res/values-si/strings.xml @@ -747,8 +747,11 @@ CC-BY-SA 3.0 Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-sr-rCS/strings.xml b/composeApp/src/androidMain/res/values-sr-rCS/strings.xml index f46a4ddd5a..04b07929ab 100644 --- a/composeApp/src/androidMain/res/values-sr-rCS/strings.xml +++ b/composeApp/src/androidMain/res/values-sr-rCS/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-sr/strings.xml b/composeApp/src/androidMain/res/values-sr/strings.xml index 853e04fc9c..81b6aca0aa 100644 --- a/composeApp/src/androidMain/res/values-sr/strings.xml +++ b/composeApp/src/androidMain/res/values-sr/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-sv/strings.xml b/composeApp/src/androidMain/res/values-sv/strings.xml index 61ea9a1c94..1c80f9f269 100644 --- a/composeApp/src/androidMain/res/values-sv/strings.xml +++ b/composeApp/src/androidMain/res/values-sv/strings.xml @@ -746,8 +746,11 @@ Skapa ny spellista Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-ta/strings.xml b/composeApp/src/androidMain/res/values-ta/strings.xml index 1c7822a146..76596417d2 100644 --- a/composeApp/src/androidMain/res/values-ta/strings.xml +++ b/composeApp/src/androidMain/res/values-ta/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-te/strings.xml b/composeApp/src/androidMain/res/values-te/strings.xml index 5caf347e62..6df67687bb 100644 --- a/composeApp/src/androidMain/res/values-te/strings.xml +++ b/composeApp/src/androidMain/res/values-te/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-tr/strings.xml b/composeApp/src/androidMain/res/values-tr/strings.xml index 04bd6c7502..bb68b6c71e 100644 --- a/composeApp/src/androidMain/res/values-tr/strings.xml +++ b/composeApp/src/androidMain/res/values-tr/strings.xml @@ -746,8 +746,11 @@ Yeni oynatma listesi oluştur Ses yüksekliği temel kazancı Ses yüksekliği normalizasyonu için hedef kazanç + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-uk/strings.xml b/composeApp/src/androidMain/res/values-uk/strings.xml index 2e4b67abfc..852ff886be 100644 --- a/composeApp/src/androidMain/res/values-uk/strings.xml +++ b/composeApp/src/androidMain/res/values-uk/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-vi/strings.xml b/composeApp/src/androidMain/res/values-vi/strings.xml index a18cf8e444..c435a8f23c 100644 --- a/composeApp/src/androidMain/res/values-vi/strings.xml +++ b/composeApp/src/androidMain/res/values-vi/strings.xml @@ -746,4 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played + Full Screen Lyrics Components + Title and Artists + Mini Queue + Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-zh-rCN/strings.xml b/composeApp/src/androidMain/res/values-zh-rCN/strings.xml index fbf360e6ed..03f3d4e59d 100644 --- a/composeApp/src/androidMain/res/values-zh-rCN/strings.xml +++ b/composeApp/src/androidMain/res/values-zh-rCN/strings.xml @@ -746,8 +746,11 @@ 创建播放列表 低音响度增益 标准化响度的目标增益 + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-zh-rTW/strings.xml b/composeApp/src/androidMain/res/values-zh-rTW/strings.xml index fdae6421d9..191f1091fc 100644 --- a/composeApp/src/androidMain/res/values-zh-rTW/strings.xml +++ b/composeApp/src/androidMain/res/values-zh-rTW/strings.xml @@ -746,8 +746,11 @@ 建立新的播放清單 Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values-zh/strings.xml b/composeApp/src/androidMain/res/values-zh/strings.xml index 0d1b55b36a..109351f18c 100644 --- a/composeApp/src/androidMain/res/values-zh/strings.xml +++ b/composeApp/src/androidMain/res/values-zh/strings.xml @@ -746,4 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played + Full Screen Lyrics Components + Title and Artists + Mini Queue + Controls + Add to favorites + Import favorites diff --git a/composeApp/src/androidMain/res/values/strings.xml b/composeApp/src/androidMain/res/values/strings.xml index ee1aaebc5a..5d917ef14e 100644 --- a/composeApp/src/androidMain/res/values/strings.xml +++ b/composeApp/src/androidMain/res/values/strings.xml @@ -746,8 +746,11 @@ Create new playlist Loudness base gain Target gain for the loudness normalization + Media cannot be played Full Screen Lyrics Components Title and Artists Mini Queue Controls + Add to favorites + Import favorites diff --git a/docs/images/Screenshot_1.png b/docs/images/Screenshot_1.png deleted file mode 100644 index 88f777f96d..0000000000 Binary files a/docs/images/Screenshot_1.png and /dev/null differ diff --git a/docs/images/Screenshot_2.png b/docs/images/Screenshot_2.png deleted file mode 100644 index 709a9ec2d3..0000000000 Binary files a/docs/images/Screenshot_2.png and /dev/null differ diff --git a/docs/images/Screenshot_3.png b/docs/images/Screenshot_3.png deleted file mode 100644 index 288392d6e0..0000000000 Binary files a/docs/images/Screenshot_3.png and /dev/null differ diff --git a/docs/images/Screenshot_4.png b/docs/images/Screenshot_4.png deleted file mode 100644 index ca722cd8d5..0000000000 Binary files a/docs/images/Screenshot_4.png and /dev/null differ diff --git a/docs/images/Screenshot_5.png b/docs/images/Screenshot_5.png deleted file mode 100644 index a62dd94bab..0000000000 Binary files a/docs/images/Screenshot_5.png and /dev/null differ diff --git a/docs/images/Screenshots/640_1.jpg b/docs/images/Screenshots/640_1.jpg deleted file mode 100644 index 8b9426a945..0000000000 Binary files a/docs/images/Screenshots/640_1.jpg and /dev/null differ diff --git a/docs/images/Screenshots/640_1.webp b/docs/images/Screenshots/640_1.webp index 03d62e766d..17c0048d7c 100644 Binary files a/docs/images/Screenshots/640_1.webp and b/docs/images/Screenshots/640_1.webp differ diff --git a/docs/images/Screenshots/640_2.jpg b/docs/images/Screenshots/640_2.jpg deleted file mode 100644 index bff0fc0ee7..0000000000 Binary files a/docs/images/Screenshots/640_2.jpg and /dev/null differ diff --git a/docs/images/Screenshots/640_2.webp b/docs/images/Screenshots/640_2.webp index f4cfbd2a43..ac423b376a 100644 Binary files a/docs/images/Screenshots/640_2.webp and b/docs/images/Screenshots/640_2.webp differ diff --git a/docs/images/Screenshots/640_3.jpg b/docs/images/Screenshots/640_3.jpg deleted file mode 100644 index 5094a37cfe..0000000000 Binary files a/docs/images/Screenshots/640_3.jpg and /dev/null differ diff --git a/docs/images/Screenshots/640_3.webp b/docs/images/Screenshots/640_3.webp index cf596d8a1f..9e31962638 100644 Binary files a/docs/images/Screenshots/640_3.webp and b/docs/images/Screenshots/640_3.webp differ diff --git a/docs/images/Screenshots/640_4.jpg b/docs/images/Screenshots/640_4.jpg deleted file mode 100644 index 4fa1a89933..0000000000 Binary files a/docs/images/Screenshots/640_4.jpg and /dev/null differ diff --git a/docs/images/Screenshots/640_4.webp b/docs/images/Screenshots/640_4.webp index 9de6148d8d..768857345c 100644 Binary files a/docs/images/Screenshots/640_4.webp and b/docs/images/Screenshots/640_4.webp differ diff --git a/docs/images/Screenshots/640_5.jpg b/docs/images/Screenshots/640_5.jpg deleted file mode 100644 index 35a1c71634..0000000000 Binary files a/docs/images/Screenshots/640_5.jpg and /dev/null differ diff --git a/docs/images/Screenshots/640_5.webp b/docs/images/Screenshots/640_5.webp index 6fe83f6feb..9f5a81cf5e 100644 Binary files a/docs/images/Screenshots/640_5.webp and b/docs/images/Screenshots/640_5.webp differ diff --git a/docs/index.html b/docs/index.html index 4385b517b4..db538d6271 100644 --- a/docs/index.html +++ b/docs/index.html @@ -11,7 +11,7 @@ + href="https://raw.githubusercontent.com/fast4x/RiMusic/master/assets/design/latest/app_icon.svg" /> @@ -35,7 +35,7 @@

Logo

@@ -56,7 +56,7 @@

- RiMusic Banner

A Open source multilingual Android application for streaming music from YouTube Music @@ -217,7 +217,7 @@

- RiMusic logo
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png index fcb7568b9b..5a4f3155a8 100644 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index 735ca79f6c..6a776446f2 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg index fe8b49c712..5390b0c35d 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg index bcc192818f..2c671fbf03 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg index c3e2bfc64d..6668163415 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg index 9b5e3c0403..15ae68129e 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg index f50e9d5492..82fe341e93 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg index 3e0d54880b..36d797dde3 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg index 1f630c7b81..813d4005d3 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg and b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg differ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43e21997ea..77b395100c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,22 +2,22 @@ [versions] compose-compiler = "1.5.15" compose-plugin = "1.6.11" -junit = "4.13.2" +#junit = "4.13.2" agp = "8.5.2" kotlin = "2.0.20" kotlin-ksp = "2.0.20-1.0.24" -kotlin-coroutine = "1.9.0-RC" +kotlin-coroutine = "1.9.0" kotlin-datetime = "0.6.1" -compose = "1.7.2" +compose = "1.7.3" compose-activity = "1.9.2" shimmer = "1.0.3" coil = "2.7.0" coil3 = "3.0.0-alpha06" -room = "2.7.0-alpha07" +room = "2.7.0-alpha09" sqlite = "2.5.0-SNAPSHOT" media3 = "1.4.1" ktor = "2.3.12" -ktor3 = "3.0.0-wasm2" +#ktor3 = "3.0.0-wasm2" brotli = "0.1.2" palette = "1.0.0" desugaring = "2.1.2" @@ -25,16 +25,16 @@ appcompat = "1.7.0" core = "1.0.1" core-ktx = "1.13.1" media = "1.7.0" -material = "1.7.2" +material = "1.7.3" materialdesktop = "1.6.11" material3 = "1.3.0" androidmaterial = "1.12.0" constraintlayout = "1.0.1" -composeruntimelivedata = "1.7.2" +composeruntimelivedata = "1.7.3" translator = "1.0.2" kotlin-csv = "1.9.3" monetcompat = "0.4.1" -navigation = "2.8.0" +navigation = "2.8.2" timber = "5.0.1" crypto = "1.1.0-alpha06" loggingInterceptor = "4.12.0" @@ -50,7 +50,7 @@ navigationKMP = "2.7.0-alpha07" vlcj = "4.8.2" conveyor = "1.11" kotlinxCoroutinesSwing = "1.9.0" -kotlinxCoroutinesAndroid = "1.9.0" +#kotlinxCoroutinesAndroid = "1.9.0" [libraries] #gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" } @@ -112,7 +112,7 @@ navigation-kmp = { group = "org.jetbrains.androidx.navigation", name = "navigati vlcj = { group = "uk.co.caprica", name = "vlcj", version.ref = "vlcj"} coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3" } coil-compose-core = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil3" } -coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil3" } +#coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor", version.ref = "coil3" } coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil3" } coil-mp = { module = "io.coil-kt.coil3:coil", version.ref = "coil3" } kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinxCoroutinesSwing" }