diff --git a/.gitignore b/.gitignore index 9bc4831..b6ef29f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,3 @@ local.properties # Claude Code session data .claude/ - -# Signing credentials — keep off version control -*.jks -*.keystore -keystore.properties diff --git a/BACKLOG.md b/BACKLOG.md index 2e5e3bf..6c5e2b7 100644 --- a/BACKLOG.md +++ b/BACKLOG.md @@ -68,10 +68,6 @@ US-15: As a user, I want an app icon and splash screen so that it feels native. US-16: As a developer, I want a signed APK for installation so that the app can be deployed. - Acceptance: Release build generated; offline functionality verified. -### Theme 8: Landscape Support -US-18: As a user, I want the app to work in landscape orientation so that I can use it however I hold my phone. -- Acceptance: In landscape, all controls are visible and usable without scrolling; layout switches to a two-column arrangement (pulse ring + BPM display on the left, sliders/buttons on the right); no content is clipped or overlapping. - ## Additional Notes - TDD: Focus on US-03, US-04, US-13 first—write failing tests, then implement. - Priorities: Complete setup (US-01-02), then audio (US-03-05), UI (US-06-07), service (US-08-10), rest. diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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/OFL.txt b/OFL.txt deleted file mode 100644 index 5ceee00..0000000 --- a/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -https://openfontlicense.org - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/README.md b/README.md index 70abbba..d0cfedc 100644 --- a/README.md +++ b/README.md @@ -102,11 +102,3 @@ See `BACKLOG.md` for all user stories and acceptance criteria. ./gradlew test # unit tests ./gradlew lint # lint checks ``` - -## License - -Pacer is free software, licensed under the GNU General Public License, -version 3 or (at your option) any later version. See [LICENSE](LICENSE). - -The bundled [JetBrains Mono](https://github.com/JetBrains/JetBrainsMono) font -is licensed under the SIL Open Font License 1.1. See [OFL.txt](OFL.txt). diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b6b258f..faaa282 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,19 +1,9 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - -import java.util.Properties - plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) } -val keystorePropsFile = rootProject.file("keystore.properties") -val keystoreProps = Properties().apply { - if (keystorePropsFile.exists()) load(keystorePropsFile.inputStream()) -} - android { namespace = "net.jeena.pacer" compileSdk = 36 @@ -29,21 +19,9 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - signingConfigs { - create("release") { - if (keystorePropsFile.exists()) { - storeFile = file(keystoreProps["storeFile"] as String) - storePassword = keystoreProps["storePassword"] as String - keyAlias = keystoreProps["keyAlias"] as String - keyPassword = keystoreProps["keyPassword"] as String - } - } - } - buildTypes { release { - isMinifyEnabled = true - signingConfig = signingConfigs.getByName("release") + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" diff --git a/app/src/androidTest/kotlin/net/jeena/pacer/PacerScreenTest.kt b/app/src/androidTest/kotlin/net/jeena/pacer/PacerScreenTest.kt deleted file mode 100644 index be89345..0000000 --- a/app/src/androidTest/kotlin/net/jeena/pacer/PacerScreenTest.kt +++ /dev/null @@ -1,71 +0,0 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - -package net.jeena.pacer - -import androidx.compose.ui.test.assertIsDisplayed -import androidx.compose.ui.test.junit4.createAndroidComposeRule -import androidx.compose.ui.test.onNodeWithText -import androidx.compose.ui.test.performClick -import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented UI tests for PacerScreen (US-14). - * Run with: ./gradlew connectedAndroidTest - */ -@RunWith(AndroidJUnit4::class) -class PacerScreenTest { - - @get:Rule - val composeRule = createAndroidComposeRule() - - @Test - fun appLaunches_andShowsStartButton() { - composeRule.onNodeWithText("START").assertIsDisplayed() - } - - @Test - fun appLaunches_andShowsTitle() { - composeRule.onNodeWithText("PACER").assertIsDisplayed() - } - - @Test - fun tappingStart_changesButtonToStop() { - composeRule.onNodeWithText("START").performClick() - composeRule.onNodeWithText("STOP").assertIsDisplayed() - } - - @Test - fun tappingStop_changesButtonBackToStart() { - composeRule.onNodeWithText("START").performClick() - composeRule.onNodeWithText("STOP").performClick() - composeRule.onNodeWithText("START").assertIsDisplayed() - } - - @Test - fun presetButton_updatesBpmDisplay() { - // Tap the "100 / SLOW" preset - composeRule.onNodeWithText("100").performClick() - composeRule.onNodeWithText("100").assertIsDisplayed() - } - - @Test - fun serviceRunning_afterTappingStart() { - composeRule.onNodeWithText("START").performClick() - composeRule.waitForIdle() - assert(PacerService.isRunning) - // Clean up - composeRule.onNodeWithText("STOP").performClick() - } - - @Test - fun serviceStopped_afterTappingStop() { - composeRule.onNodeWithText("START").performClick() - composeRule.onNodeWithText("STOP").performClick() - composeRule.waitForIdle() - assert(!PacerService.isRunning) - } -} diff --git a/app/src/main/kotlin/net/jeena/pacer/AudioEngine.kt b/app/src/main/kotlin/net/jeena/pacer/AudioEngine.kt index 20e43db..7017918 100644 --- a/app/src/main/kotlin/net/jeena/pacer/AudioEngine.kt +++ b/app/src/main/kotlin/net/jeena/pacer/AudioEngine.kt @@ -1,10 +1,6 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import android.media.AudioAttributes -import kotlin.math.pow import android.media.AudioFormat import android.media.AudioTrack import android.os.Handler @@ -26,17 +22,6 @@ class AudioEngine { companion object { private const val BEEP_DURATION_MS = 40 private const val SILENCE_CHUNK_MS = 10 - - // Map the linear 0-1 slider to a perceptually even loudness curve. - // AudioTrack.setVolume() takes a linear amplitude, but human hearing - // is logarithmic: equal dB steps sound like equal volume steps. - // We map the slider to a -40 dB … 0 dB range, so each 25% of travel - // changes perceived loudness by the same amount. - private fun toAmplitude(linear: Float): Float { - if (linear <= 0f) return 0f - val db = -40f * (1f - linear) // 0.0 → -40 dB, 1.0 → 0 dB - return 10f.pow(db / 20f) - } } private val mainHandler = Handler(Looper.getMainLooper()) @@ -84,7 +69,7 @@ class AudioEngine { .setTransferMode(AudioTrack.MODE_STREAM) .build() - audioTrack?.setVolume(toAmplitude(currentVolume)) + audioTrack?.setVolume(currentVolume) audioTrack?.play() handlerThread = HandlerThread("PacerAudio").also { it.start() } @@ -109,7 +94,7 @@ class AudioEngine { fun setVolume(volume: Float) { currentVolume = BpmCalculator.clampVolume(volume) - audioTrack?.setVolume(toAmplitude(currentVolume)) + audioTrack?.setVolume(currentVolume) } private fun audioLoop() { diff --git a/app/src/main/kotlin/net/jeena/pacer/BeepGenerator.kt b/app/src/main/kotlin/net/jeena/pacer/BeepGenerator.kt index e2e7b08..ffb4232 100644 --- a/app/src/main/kotlin/net/jeena/pacer/BeepGenerator.kt +++ b/app/src/main/kotlin/net/jeena/pacer/BeepGenerator.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import kotlin.math.sin diff --git a/app/src/main/kotlin/net/jeena/pacer/BpmCalculator.kt b/app/src/main/kotlin/net/jeena/pacer/BpmCalculator.kt index 749b691..24c04f1 100644 --- a/app/src/main/kotlin/net/jeena/pacer/BpmCalculator.kt +++ b/app/src/main/kotlin/net/jeena/pacer/BpmCalculator.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer object BpmCalculator { diff --git a/app/src/main/kotlin/net/jeena/pacer/MainActivity.kt b/app/src/main/kotlin/net/jeena/pacer/MainActivity.kt index 741011a..a03095a 100644 --- a/app/src/main/kotlin/net/jeena/pacer/MainActivity.kt +++ b/app/src/main/kotlin/net/jeena/pacer/MainActivity.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import android.content.Intent diff --git a/app/src/main/kotlin/net/jeena/pacer/PacerService.kt b/app/src/main/kotlin/net/jeena/pacer/PacerService.kt index c9206b4..3222327 100644 --- a/app/src/main/kotlin/net/jeena/pacer/PacerService.kt +++ b/app/src/main/kotlin/net/jeena/pacer/PacerService.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import android.app.NotificationChannel diff --git a/app/src/main/kotlin/net/jeena/pacer/PacerViewModel.kt b/app/src/main/kotlin/net/jeena/pacer/PacerViewModel.kt index fe7f8f2..5591c6e 100644 --- a/app/src/main/kotlin/net/jeena/pacer/PacerViewModel.kt +++ b/app/src/main/kotlin/net/jeena/pacer/PacerViewModel.kt @@ -1,30 +1,18 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import android.app.Application -import android.os.SystemClock import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.viewModelScope -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlin.math.roundToInt class PacerViewModel(application: Application) : AndroidViewModel(application) { private val ctx = application.applicationContext private val settings = SettingsRepository(ctx) - private val tapTimes = mutableListOf() - private var tapResetJob: Job? = null - var bpm by mutableIntStateOf(settings.loadBpm()) private set @@ -55,21 +43,4 @@ class PacerViewModel(application: Application) : AndroidViewModel(application) { settings.saveVolume(newVolume) if (isPlaying) ctx.startService(PacerService.updateVolumeIntent(ctx, newVolume)) } - - fun onTap() { - val now = SystemClock.elapsedRealtime() - tapTimes.removeAll { now - it > 3000 } - tapTimes.add(now) - - if (tapTimes.size >= 2) { - val avgInterval = tapTimes.zipWithNext { a, b -> b - a }.average() - updateBpm((60000.0 / avgInterval).roundToInt().coerceIn(40, 200)) - } - - tapResetJob?.cancel() - tapResetJob = viewModelScope.launch { - delay(2000) - tapTimes.clear() - } - } } diff --git a/app/src/main/kotlin/net/jeena/pacer/SettingsRepository.kt b/app/src/main/kotlin/net/jeena/pacer/SettingsRepository.kt index e76689c..6fc21e2 100644 --- a/app/src/main/kotlin/net/jeena/pacer/SettingsRepository.kt +++ b/app/src/main/kotlin/net/jeena/pacer/SettingsRepository.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import android.content.Context @@ -23,7 +20,7 @@ class SettingsRepository(context: Context) { prefs.edit().putFloat(KEY_VOLUME, volume).apply() } - fun loadBpm(): Int = prefs.getInt(KEY_BPM, 130) + fun loadBpm(): Int = prefs.getInt(KEY_BPM, 120) - fun loadVolume(): Float = prefs.getFloat(KEY_VOLUME, 0.6f) + fun loadVolume(): Float = prefs.getFloat(KEY_VOLUME, 1f) } diff --git a/app/src/main/kotlin/net/jeena/pacer/ui/PacerScreen.kt b/app/src/main/kotlin/net/jeena/pacer/ui/PacerScreen.kt index 86ee832..1cd7f03 100644 --- a/app/src/main/kotlin/net/jeena/pacer/ui/PacerScreen.kt +++ b/app/src/main/kotlin/net/jeena/pacer/ui/PacerScreen.kt @@ -1,9 +1,5 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer.ui -import android.content.res.Configuration import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.tween @@ -13,12 +9,9 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -39,10 +32,10 @@ import androidx.compose.ui.draw.scale import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.lerp -import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -112,42 +105,164 @@ fun PacerScreen(viewModel: PacerViewModel, modifier: Modifier = Modifier) { } } - val bpmColor = lerp(FG, ACCENT, bpmFlash.value) - val stepsPerSec = "%.1f steps/sec".format(bpm / 60.0) - val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE + val bpmColor = lerp(FG, ACCENT, bpmFlash.value) Box(modifier = modifier.background(BG)) { - if (isLandscape) { - LandscapeLayout( - isPlaying = isPlaying, - bpm = bpm, - volume = volume, - bpmColor = bpmColor, - stepsPerSec = stepsPerSec, - rippleScale = rippleScale.value, - rippleAlpha = rippleAlpha.value, - dotScale = dotScale.value, - onBpmChange = { viewModel.updateBpm(it) }, - onVolChange = { viewModel.updateVolume(it) }, - onToggle = { viewModel.togglePlayback() }, - onTap = { viewModel.onTap() } - ) - } else { - PortraitLayout( - isPlaying = isPlaying, - bpm = bpm, - volume = volume, - bpmColor = bpmColor, - stepsPerSec = stepsPerSec, - rippleScale = rippleScale.value, - rippleAlpha = rippleAlpha.value, - dotScale = dotScale.value, - onBpmChange = { viewModel.updateBpm(it) }, - onVolChange = { viewModel.updateVolume(it) }, - onToggle = { viewModel.togglePlayback() }, - onTap = { viewModel.onTap() } + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 24.dp) + .padding(top = 64.dp, bottom = 48.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.SpaceBetween + ) { + // Title + Text( + text = "PACER", + fontSize = 28.sp, + fontWeight = FontWeight.Bold, + fontFamily = JetBrainsMono, + color = ACCENT, + letterSpacing = 5.sp ) + + // Pulse ring + ripple + center dot + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(80.dp)) { + Canvas(modifier = Modifier.fillMaxSize()) { + drawCircle( + color = ACCENT.copy(alpha = rippleAlpha.value), + radius = (size.minDimension / 2f) * rippleScale.value, + style = Stroke(width = 2.dp.toPx()) + ) + } + Box( + modifier = Modifier + .size(50.dp) + .border(2.dp, ACCENT, CircleShape) + ) + Box( + modifier = Modifier + .size(12.dp) + .scale(dotScale.value) + .background(ACCENT, CircleShape) + ) + } + + // BPM number + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = "$bpm", + fontSize = 80.sp, + fontWeight = FontWeight.Bold, + fontFamily = JetBrainsMono, + color = bpmColor, + letterSpacing = (-2).sp + ) + Text( + text = "BPM", + fontSize = 11.sp, + fontFamily = JetBrainsMono, + color = FG.copy(alpha = 0.35f), + letterSpacing = 4.sp + ) + } + + // Start/Stop button + OutlinedButton( + onClick = { viewModel.togglePlayback() }, + shape = RectangleShape, + border = BorderStroke(2.dp, if (isPlaying) ACCENT else FG), + colors = ButtonDefaults.outlinedButtonColors( + contentColor = if (isPlaying) BG else FG, + containerColor = if (isPlaying) ACCENT else Color.Transparent + ) + ) { + Text( + text = if (isPlaying) "STOP" else "START", + fontSize = 18.sp, + fontWeight = FontWeight.Bold, + fontFamily = JetBrainsMono, + letterSpacing = 3.sp, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp) + ) + } + + // BPM slider + presets + Column(modifier = Modifier.fillMaxWidth()) { + Text( + text = "PACE", + fontSize = 10.sp, + fontFamily = JetBrainsMono, + color = FG.copy(alpha = 0.35f), + letterSpacing = 3.sp + ) + Slider( + value = bpm.toFloat(), + onValueChange = { viewModel.updateBpm(it.toInt()) }, + valueRange = 40f..200f, + colors = SliderDefaults.colors( + thumbColor = ACCENT, + activeTrackColor = ACCENT, + inactiveTrackColor = DIM + ) + ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly + ) { + PRESETS.forEach { (preset, label) -> + val active = bpm == preset + OutlinedButton( + onClick = { viewModel.updateBpm(preset) }, + modifier = Modifier.size(width = 72.dp, height = 48.dp), + shape = RectangleShape, + contentPadding = PaddingValues(0.dp), + border = BorderStroke(1.dp, if (active) ACCENT else DIM), + colors = ButtonDefaults.outlinedButtonColors( + contentColor = if (active) BG else FG.copy(alpha = 0.6f), + containerColor = if (active) ACCENT else Color.Transparent + ) + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = "$preset", + fontSize = 13.sp, + fontWeight = FontWeight.Bold, + fontFamily = JetBrainsMono + ) + Text( + text = label, + fontSize = 9.sp, + fontFamily = JetBrainsMono, + letterSpacing = 1.sp + ) + } + } + } + } + } + + // Volume slider + Column(modifier = Modifier.fillMaxWidth()) { + Text( + text = "VOLUME ${(volume * 100).toInt()}%", + fontSize = 10.sp, + fontFamily = JetBrainsMono, + color = FG.copy(alpha = 0.35f), + letterSpacing = 3.sp + ) + Slider( + value = volume, + onValueChange = { viewModel.updateVolume(it) }, + valueRange = 0f..1f, + colors = SliderDefaults.colors( + thumbColor = ACCENT, + activeTrackColor = ACCENT, + inactiveTrackColor = DIM + ) + ) + } } // Progress bar — fills linearly across one beat interval @@ -174,296 +289,3 @@ fun PacerScreen(viewModel: PacerViewModel, modifier: Modifier = Modifier) { } } } - -@Composable -private fun PortraitLayout( - isPlaying: Boolean, - bpm: Int, - volume: Float, - bpmColor: Color, - stepsPerSec: String, - rippleScale: Float, - rippleAlpha: Float, - dotScale: Float, - onBpmChange: (Int) -> Unit, - onVolChange: (Float) -> Unit, - onToggle: () -> Unit, - onTap: () -> Unit, -) { - Column( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 24.dp) - .padding(top = 64.dp, bottom = 48.dp), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.SpaceBetween - ) { - Title() - BpmDisplay(bpm, bpmColor, stepsPerSec) - PulseRing(rippleScale, rippleAlpha, dotScale, size = 80.dp) - BpmControls(bpm, onBpmChange) - VolumeControl(volume, onVolChange) - BottomButtons(isPlaying, onToggle, onTap) - } -} - -@Composable -private fun LandscapeLayout( - isPlaying: Boolean, - bpm: Int, - volume: Float, - bpmColor: Color, - stepsPerSec: String, - rippleScale: Float, - rippleAlpha: Float, - dotScale: Float, - onBpmChange: (Int) -> Unit, - onVolChange: (Float) -> Unit, - onToggle: () -> Unit, - onTap: () -> Unit, -) { - Row( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 24.dp, vertical = 16.dp), - horizontalArrangement = Arrangement.spacedBy(24.dp) - ) { - // Left column: title + BPM + pulse ring - Column( - modifier = Modifier - .weight(1f) - .fillMaxHeight(), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.SpaceEvenly - ) { - Title() - BpmDisplay(bpm, bpmColor, stepsPerSec) - PulseRing(rippleScale, rippleAlpha, dotScale, size = 64.dp) - } - - // Right column: sliders + presets + start/stop - Column( - modifier = Modifier - .weight(1f) - .fillMaxHeight(), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.SpaceBetween - ) { - BpmControls(bpm, onBpmChange) - VolumeControl(volume, onVolChange) - BottomButtons(isPlaying, onToggle, onTap) - } - } -} - -@Composable -private fun Title() { - Text( - text = "PACER", - fontSize = 28.sp, - fontWeight = FontWeight.Bold, - fontFamily = JetBrainsMono, - color = ACCENT, - letterSpacing = 5.sp - ) -} - -@Composable -private fun BpmDisplay(bpm: Int, bpmColor: Color, stepsPerSec: String) { - Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text( - text = "$bpm", - fontSize = 80.sp, - fontWeight = FontWeight.Bold, - fontFamily = JetBrainsMono, - color = bpmColor, - letterSpacing = (-2).sp - ) - Text( - text = "STEPS / MIN", - fontSize = 13.sp, - fontFamily = JetBrainsMono, - color = FG.copy(alpha = 0.65f), - letterSpacing = 2.sp - ) - Text( - text = stepsPerSec.uppercase(), - fontSize = 13.sp, - fontFamily = JetBrainsMono, - color = FG.copy(alpha = 0.5f), - letterSpacing = 1.sp - ) - } -} - -@Composable -private fun PulseRing(rippleScale: Float, rippleAlpha: Float, dotScale: Float, size: androidx.compose.ui.unit.Dp) { - Box(contentAlignment = Alignment.Center, modifier = Modifier.size(size)) { - Canvas(modifier = Modifier.fillMaxSize()) { - drawCircle( - color = ACCENT.copy(alpha = rippleAlpha), - radius = (this.size.minDimension / 2f) * rippleScale, - style = Stroke(width = 2.dp.toPx()) - ) - } - Box( - modifier = Modifier - .size(size * 0.625f) - .border(2.dp, ACCENT, CircleShape) - ) - Box( - modifier = Modifier - .size(size * 0.15f) - .scale(dotScale) - .background(ACCENT, CircleShape) - ) - } -} - -@Composable -private fun BpmControls(bpm: Int, onBpmChange: (Int) -> Unit) { - Column(modifier = Modifier.fillMaxWidth()) { - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween - ) { - Text( - text = "SLOW", - fontSize = 13.sp, - fontFamily = JetBrainsMono, - color = FG.copy(alpha = 0.65f), - letterSpacing = 2.sp - ) - Text( - text = "FAST", - fontSize = 13.sp, - fontFamily = JetBrainsMono, - color = FG.copy(alpha = 0.65f), - letterSpacing = 2.sp - ) - } - Slider( - value = bpm.toFloat(), - onValueChange = { onBpmChange(it.toInt()) }, - valueRange = 40f..200f, - colors = SliderDefaults.colors( - thumbColor = ACCENT, - activeTrackColor = ACCENT, - inactiveTrackColor = DIM - ) - ) - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceEvenly - ) { - PRESETS.forEach { (preset, label) -> - val active = bpm == preset - OutlinedButton( - onClick = { onBpmChange(preset) }, - modifier = Modifier.size(width = 72.dp, height = 48.dp), - shape = RectangleShape, - contentPadding = PaddingValues(0.dp), - border = BorderStroke(1.dp, if (active) ACCENT else DIM), - colors = ButtonDefaults.outlinedButtonColors( - contentColor = if (active) BG else FG.copy(alpha = 0.6f), - containerColor = if (active) ACCENT else Color.Transparent - ) - ) { - Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text( - text = "$preset", - fontSize = 13.sp, - fontWeight = FontWeight.Bold, - fontFamily = JetBrainsMono - ) - Text( - text = label.uppercase(), - fontSize = 10.sp, - fontFamily = JetBrainsMono, - letterSpacing = 1.sp - ) - } - } - } - } - } -} - -@Composable -private fun VolumeControl(volume: Float, onVolChange: (Float) -> Unit) { - Column(modifier = Modifier.fillMaxWidth()) { - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween - ) { - Text( - text = "VOL", - fontSize = 13.sp, - fontFamily = JetBrainsMono, - color = FG.copy(alpha = 0.65f), - letterSpacing = 2.sp - ) - Text( - text = "${(volume * 100).toInt()}%", - fontSize = 13.sp, - fontFamily = JetBrainsMono, - color = FG.copy(alpha = 0.65f), - letterSpacing = 2.sp - ) - } - Slider( - value = volume, - onValueChange = { onVolChange(it) }, - valueRange = 0f..1f, - colors = SliderDefaults.colors( - thumbColor = ACCENT, - activeTrackColor = ACCENT, - inactiveTrackColor = DIM - ) - ) - } -} - -@Composable -private fun BottomButtons(isPlaying: Boolean, onToggle: () -> Unit, onTap: () -> Unit) { - Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - OutlinedButton( - onClick = onTap, - modifier = Modifier.weight(1f), - shape = RectangleShape, - border = BorderStroke(2.dp, DIM), - colors = ButtonDefaults.outlinedButtonColors( - contentColor = FG, - containerColor = Color.Transparent - ) - ) { - Text( - text = "TAP", - fontSize = 18.sp, - fontWeight = FontWeight.Bold, - fontFamily = JetBrainsMono, - letterSpacing = 3.sp, - modifier = Modifier.padding(vertical = 6.dp) - ) - } - OutlinedButton( - onClick = onToggle, - modifier = Modifier.weight(2f), - shape = RectangleShape, - border = BorderStroke(2.dp, if (isPlaying) ACCENT else FG), - colors = ButtonDefaults.outlinedButtonColors( - contentColor = if (isPlaying) BG else FG, - containerColor = if (isPlaying) ACCENT else Color.Transparent - ) - ) { - Text( - text = if (isPlaying) "STOP" else "START", - fontSize = 18.sp, - fontWeight = FontWeight.Bold, - fontFamily = JetBrainsMono, - letterSpacing = 3.sp, - modifier = Modifier.padding(vertical = 6.dp) - ) - } - } -} diff --git a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Color.kt b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Color.kt index 84a89d1..809192a 100644 --- a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Color.kt +++ b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Color.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Font.kt b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Font.kt index f2a6ec8..9e96a12 100644 --- a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Font.kt +++ b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Font.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer.ui.theme import androidx.compose.ui.text.font.Font diff --git a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Theme.kt b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Theme.kt index 11e4a54..6a9a6d1 100644 --- a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Theme.kt +++ b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Theme.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer.ui.theme import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Type.kt b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Type.kt index c7ddd99..b513102 100644 --- a/app/src/main/kotlin/net/jeena/pacer/ui/theme/Type.kt +++ b/app/src/main/kotlin/net/jeena/pacer/ui/theme/Type.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer.ui.theme import androidx.compose.material3.Typography diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 2c01137..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 9974ba2..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 6b78462..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6b78462..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index e21de32..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index e21de32..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index d2d3c5c..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index d2d3c5c..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index a47be88..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index a47be88..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 0fff6c5..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 0fff6c5..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 06d715e..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 06d715e..a9d71ff 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/test/kotlin/net/jeena/pacer/BeepGeneratorTest.kt b/app/src/test/kotlin/net/jeena/pacer/BeepGeneratorTest.kt index 18412cc..fcab169 100644 --- a/app/src/test/kotlin/net/jeena/pacer/BeepGeneratorTest.kt +++ b/app/src/test/kotlin/net/jeena/pacer/BeepGeneratorTest.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import org.junit.Assert.assertEquals diff --git a/app/src/test/kotlin/net/jeena/pacer/BpmCalculatorTest.kt b/app/src/test/kotlin/net/jeena/pacer/BpmCalculatorTest.kt index d86d66f..89ececb 100644 --- a/app/src/test/kotlin/net/jeena/pacer/BpmCalculatorTest.kt +++ b/app/src/test/kotlin/net/jeena/pacer/BpmCalculatorTest.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import org.junit.Assert.assertEquals diff --git a/app/src/test/kotlin/net/jeena/pacer/SettingsRepositoryTest.kt b/app/src/test/kotlin/net/jeena/pacer/SettingsRepositoryTest.kt index 5fcae95..fdbe464 100644 --- a/app/src/test/kotlin/net/jeena/pacer/SettingsRepositoryTest.kt +++ b/app/src/test/kotlin/net/jeena/pacer/SettingsRepositoryTest.kt @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - package net.jeena.pacer import android.content.Context @@ -29,8 +26,8 @@ class SettingsRepositoryTest { prefs = mock() whenever(prefs.edit()).thenReturn(editor) - whenever(prefs.getInt(eq(SettingsRepository.KEY_BPM), any())).thenReturn(130) - whenever(prefs.getFloat(eq(SettingsRepository.KEY_VOLUME), any())).thenReturn(0.6f) + whenever(prefs.getInt(eq(SettingsRepository.KEY_BPM), any())).thenReturn(120) + whenever(prefs.getFloat(eq(SettingsRepository.KEY_VOLUME), any())).thenReturn(1f) context = mock() whenever(context.getSharedPreferences(any(), any())).thenReturn(prefs) @@ -65,18 +62,18 @@ class SettingsRepositoryTest { } @Test - fun `loadBpm returns default 130 when nothing saved`() { + fun `loadBpm returns default 120 when nothing saved`() { whenever(prefs.getInt(eq(SettingsRepository.KEY_BPM), any())).thenAnswer { it.getArgument(1) as Int } - assertEquals(130, repo.loadBpm()) + assertEquals(120, repo.loadBpm()) } @Test - fun `loadVolume returns default 0_6f when nothing saved`() { + fun `loadVolume returns default 1f when nothing saved`() { whenever(prefs.getFloat(eq(SettingsRepository.KEY_VOLUME), any())).thenAnswer { it.getArgument(1) as Float } - assertEquals(0.6f, repo.loadVolume()) + assertEquals(1f, repo.loadVolume()) } } diff --git a/build.gradle.kts b/build.gradle.kts index a249f99..9deb573 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false diff --git a/settings.gradle.kts b/settings.gradle.kts index b9a33ff..d627f97 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2026 Jeena -// SPDX-License-Identifier: GPL-3.0-or-later - pluginManagement { repositories { google {