diff --git a/.idea/misc.xml b/.idea/misc.xml index 36e412f..bdd9278 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,63 +1,6 @@ - - - + diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 53d1f3d..0000000 --- a/LICENSE +++ /dev/null @@ -1,675 +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/app/build.gradle b/app/build.gradle index c354733..c8fc707 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,16 @@ plugins { id 'com.android.application' - id 'kotlin-android' + id 'org.jetbrains.kotlin.android' } android { - compileSdk 32 + namespace 'ch.broillet.jarvis.android' + compileSdk 33 defaultConfig { - applicationId "ch.mathieubroillet.jarvis.android" - minSdk 29 - targetSdk 32 + applicationId "ch.broillet.jarvis.android" + minSdk 32 + targetSdk 33 versionCode 1 versionName "1.0" @@ -31,14 +32,12 @@ android { } kotlinOptions { jvmTarget = '1.8' - useIR = true } buildFeatures { compose true } composeOptions { - kotlinCompilerExtensionVersion compose_version - kotlinCompilerVersion '1.5.21' + kotlinCompilerExtensionVersion '1.1.1' } packagingOptions { resources { @@ -49,20 +48,25 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.0' - implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation 'androidx.activity:activity-compose:1.6.1' implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" - implementation "androidx.navigation:navigation-compose:2.4.0-rc01" + implementation 'androidx.compose.material3:material3:1.1.0-alpha02' + implementation 'com.google.android.material:material:1.7.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" + + implementation "androidx.navigation:navigation-compose:2.6.0-alpha04" implementation 'com.google.accompanist:accompanist-permissions:0.22.0-rc' implementation 'com.google.accompanist:accompanist-insets:0.22.0-rc' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0' - implementation 'com.github.squti:Android-Wave-Recorder:1.6.0' + + implementation 'com.github.squti:Android-Wave-Recorder:1.7.0' implementation("com.squareup.okhttp3:okhttp:4.9.3") implementation 'com.google.code.gson:gson:2.8.9' - implementation 'androidx.activity:activity-compose:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" } \ No newline at end of file diff --git a/app/src/androidTest/java/ch/mathieubroillet/jarvis/android/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ch/broillet/jarvis/android/ExampleInstrumentedTest.kt similarity index 81% rename from app/src/androidTest/java/ch/mathieubroillet/jarvis/android/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/ch/broillet/jarvis/android/ExampleInstrumentedTest.kt index b9fce6e..076f387 100644 --- a/app/src/androidTest/java/ch/mathieubroillet/jarvis/android/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/ch/broillet/jarvis/android/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android +package ch.broillet.jarvis.android import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("ch.mathieubroillet.jarvis.android", appContext.packageName) + assertEquals("ch.broillet.jarvis.android", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 71966b1..528f326 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ - + xmlns:tools="http://schemas.android.com/tools"> @@ -9,20 +8,22 @@ - + + android:theme="@style/Theme.Jarvisclientapp"> + @@ -30,10 +31,10 @@ - + diff --git a/app/src/main/java/ch/broillet/jarvis/android/MainActivity.kt b/app/src/main/java/ch/broillet/jarvis/android/MainActivity.kt new file mode 100644 index 0000000..0cf2559 --- /dev/null +++ b/app/src/main/java/ch/broillet/jarvis/android/MainActivity.kt @@ -0,0 +1,50 @@ +package ch.broillet.jarvis.android + +import android.os.Bundle +import android.view.WindowManager +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.animation.core.withInfiniteAnimationFrameMillis +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.Composable +import androidx.compose.runtime.ReadOnlyComposable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.tooling.preview.Preview +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsControllerCompat +import ch.broillet.jarvis.android.nav.Navigation +import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme +import com.google.android.material.elevation.SurfaceColors + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setContent { + JarvisclientappTheme { + window.navigationBarColor = MaterialTheme.colorScheme.background.hashCode() // Set color of system navigationBar same as BottomNavigationView + + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.surface + ) { + DefaultPreview() + } + } + } + } +} + + +@Preview(showBackground = true) +@Composable +fun DefaultPreview() { + JarvisclientappTheme { + Navigation() + } +} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/audio/AudioRecorder.kt b/app/src/main/java/ch/broillet/jarvis/android/audio/AudioRecorder.kt similarity index 86% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/audio/AudioRecorder.kt rename to app/src/main/java/ch/broillet/jarvis/android/audio/AudioRecorder.kt index 8ba3fce..8e81137 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/audio/AudioRecorder.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/audio/AudioRecorder.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android.audio +package ch.broillet.jarvis.android.audio import android.content.Context import com.github.squti.androidwaverecorder.WaveRecorder @@ -29,7 +29,7 @@ class AudioRecorder( fun getAudioRecorder(context: Context): AudioRecorder { val outputFile = context.filesDir.absolutePath + "/temp_recording.wav" - val waveRecorder: WaveRecorder = WaveRecorder(outputFile) + val waveRecorder = WaveRecorder(outputFile) waveRecorder.noiseSuppressorActive = true return AudioRecorder(audioTempFileOutput = outputFile, waveRecorder = waveRecorder) diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/chat/ConversationUiState.kt b/app/src/main/java/ch/broillet/jarvis/android/chat/ConversationUiState.kt similarity index 91% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/chat/ConversationUiState.kt rename to app/src/main/java/ch/broillet/jarvis/android/chat/ConversationUiState.kt index 69f6f17..5cfb646 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/chat/ConversationUiState.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/chat/ConversationUiState.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android.chat +package ch.broillet.jarvis.android.chat import androidx.compose.runtime.Immutable import androidx.compose.runtime.mutableStateListOf diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/chat/Messages.kt b/app/src/main/java/ch/broillet/jarvis/android/chat/Messages.kt similarity index 90% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/chat/Messages.kt rename to app/src/main/java/ch/broillet/jarvis/android/chat/Messages.kt index 67c1cc4..a28c779 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/chat/Messages.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/chat/Messages.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android.chat +package ch.broillet.jarvis.android.chat import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -6,16 +6,16 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import ch.mathieubroillet.jarvis.android.R -import ch.mathieubroillet.jarvis.android.ui.theme.productSansFont +import ch.broillet.jarvis.android.R +import ch.broillet.jarvis.android.ui.theme.productSansFont @Composable fun Messages( @@ -72,7 +72,7 @@ fun MessageFromJarvis( modifier = Modifier .fillMaxWidth(fraction = 0.9F) .clip(RoundedCornerShape(15.dp)) - .background(color = MaterialTheme.colors.secondaryVariant) + .background(color = MaterialTheme.colorScheme.secondaryContainer) .padding(horizontal = 10.dp, vertical = 10.dp) ) { Text(text = text, fontFamily = productSansFont) @@ -119,7 +119,7 @@ fun MessageFromUser(text: String) { modifier = Modifier .fillMaxWidth(fraction = 0.8F) .clip(RoundedCornerShape(15.dp)) - .background(color = MaterialTheme.colors.secondary) + .background(color = MaterialTheme.colorScheme.secondary) .padding(horizontal = 10.dp, vertical = 10.dp) ) { Text( diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/nav/Navigation.kt b/app/src/main/java/ch/broillet/jarvis/android/nav/Navigation.kt similarity index 75% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/nav/Navigation.kt rename to app/src/main/java/ch/broillet/jarvis/android/nav/Navigation.kt index a94a73a..c0c3b27 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/nav/Navigation.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/nav/Navigation.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android.nav +package ch.broillet.jarvis.android.nav import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext @@ -7,13 +7,13 @@ import androidx.navigation.NavController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import ch.mathieubroillet.jarvis.android.R -import ch.mathieubroillet.jarvis.android.audio.getAudioRecorder -import ch.mathieubroillet.jarvis.android.chat.ConversationUiState -import ch.mathieubroillet.jarvis.android.chat.Message -import ch.mathieubroillet.jarvis.android.pages.DisplayMainPage -import ch.mathieubroillet.jarvis.android.pages.DisplayPermissionsPage -import ch.mathieubroillet.jarvis.android.pages.DisplaySettingsPage +import ch.broillet.jarvis.android.R +import ch.broillet.jarvis.android.audio.getAudioRecorder +import ch.broillet.jarvis.android.chat.ConversationUiState +import ch.broillet.jarvis.android.chat.Message +import ch.broillet.jarvis.android.pages.DisplayMainPage +import ch.broillet.jarvis.android.pages.DisplayPermissionsPage +import ch.broillet.jarvis.android.pages.DisplaySettingsPage import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberMultiplePermissionsState @@ -22,7 +22,10 @@ import com.google.accompanist.permissions.rememberMultiplePermissionsState fun Navigation() { val navController = rememberNavController() - val permissions = listOf(android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.WRITE_EXTERNAL_STORAGE) + val permissions = listOf( + android.Manifest.permission.RECORD_AUDIO, + //android.Manifest.permission.WRITE_EXTERNAL_STORAGE + ) val permissionState = rememberMultiplePermissionsState(permissions) diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/nav/Screen.kt b/app/src/main/java/ch/broillet/jarvis/android/nav/Screen.kt similarity index 81% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/nav/Screen.kt rename to app/src/main/java/ch/broillet/jarvis/android/nav/Screen.kt index d60830d..02826a2 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/nav/Screen.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/nav/Screen.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android.nav +package ch.broillet.jarvis.android.nav sealed class Screen(val route: String){ object MainScreen : Screen("main_screen") diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/pages/MainPage.kt b/app/src/main/java/ch/broillet/jarvis/android/pages/MainPage.kt similarity index 61% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/pages/MainPage.kt rename to app/src/main/java/ch/broillet/jarvis/android/pages/MainPage.kt index 26c5c04..37701c9 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/pages/MainPage.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/pages/MainPage.kt @@ -1,7 +1,11 @@ -package ch.mathieubroillet.jarvis.android.pages +package ch.broillet.jarvis.android.pages import androidx.compose.foundation.layout.* -import androidx.compose.material.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Edit +import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material.icons.outlined.Share +import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -13,17 +17,18 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController -import ch.mathieubroillet.jarvis.android.R -import ch.mathieubroillet.jarvis.android.audio.AudioRecorder -import ch.mathieubroillet.jarvis.android.chat.ConversationUiState -import ch.mathieubroillet.jarvis.android.chat.Message -import ch.mathieubroillet.jarvis.android.chat.Messages -import ch.mathieubroillet.jarvis.android.nav.Screen -import ch.mathieubroillet.jarvis.android.ui.theme.JarvisComposeTheme -import ch.mathieubroillet.jarvis.android.ui.theme.productSansFont -import ch.mathieubroillet.jarvis.android.utils.DefaultBox -import ch.mathieubroillet.jarvis.android.utils.IconAlertDialogTextField -import ch.mathieubroillet.jarvis.android.utils.contactServerWithFileAudioRecording +import ch.broillet.jarvis.android.R +import ch.broillet.jarvis.android.audio.AudioRecorder +import ch.broillet.jarvis.android.chat.ConversationUiState +import ch.broillet.jarvis.android.chat.Message +import ch.broillet.jarvis.android.chat.Messages +import ch.broillet.jarvis.android.nav.Screen +import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme +import ch.broillet.jarvis.android.ui.theme.productSansFont +import ch.broillet.jarvis.android.utils.DefaultBox +import ch.broillet.jarvis.android.utils.DotsFlashing +import ch.broillet.jarvis.android.utils.DotsTyping +import ch.broillet.jarvis.android.utils.contactServerWithFileAudioRecording import com.github.squti.androidwaverecorder.RecorderState import com.github.squti.androidwaverecorder.WaveRecorder import org.json.JSONObject @@ -40,17 +45,6 @@ fun Base(navController: NavController, uiState: ConversationUiState) { .fillMaxWidth() ) { Row(Modifier.align(Alignment.End)) { - var text by remember { mutableStateOf("") } - - IconAlertDialogTextField( - buttonIcon = R.drawable.ic_baseline_keyboard_24, - title = stringResource(id = R.string.main_page_dialog_ask_me_anything), - label = stringResource(id = R.string.main_page_dialog_type_a_sentence), - text = text, - textFieldValue = { text = it }, - onOKClick = { uiState.addMessage(Message(false, text)); text = "" } - ) - DropDownSettingsMenu(navController) } @@ -74,27 +68,43 @@ fun DropDownSettingsMenu(navController: NavController) { ) } - DropdownMenu( expanded = expanded, onDismissRequest = { expanded = false }, offset = DpOffset((-500).dp, 0.dp) ) { - DropdownMenuItem(onClick = { navController.navigate(Screen.PermissionsScreen.route) }) { - Text(stringResource(id = R.string.main_page_delete_conversation)) - } - DropdownMenuItem(onClick = { navController.navigate(Screen.SettingsScreen.route) }) { - Text(stringResource(id = R.string.settings)) - } - Divider() - DropdownMenuItem(onClick = { /* Handle send feedback! */ }) { - Text(stringResource(id = R.string.report_an_issue)) - } + DropdownMenuItem( + text = { Text(stringResource(id = R.string.main_page_delete_conversation)) }, + onClick = { navController.navigate(Screen.PermissionsScreen.route) }, + leadingIcon = { + Icon( + Icons.Outlined.Edit, + contentDescription = null + ) + }) + DropdownMenuItem( + text = { Text(stringResource(id = R.string.settings)) }, + onClick = { navController.navigate(Screen.SettingsScreen.route) }, + leadingIcon = { + Icon( + Icons.Outlined.Settings, + contentDescription = null + ) + }) + DropdownMenuItem( + text = { Text(stringResource(id = R.string.report_an_issue)) }, + onClick = { /* Handle send feedback! */ }, + leadingIcon = { + Icon( + Icons.Outlined.Share, + contentDescription = null + ) + }) } } @Composable -fun StartRecordingFAB(onClick: () -> Unit, isRecording: Boolean) { +fun StartRecordingFAB(onClick: () -> Unit, isRecording: Boolean, isProcessing: Boolean) { //We create a row that we align to the bottom center of the parent box Row( Modifier @@ -105,10 +115,18 @@ fun StartRecordingFAB(onClick: () -> Unit, isRecording: Boolean) { //Microphone floating button to manually start/stop listening FloatingActionButton(onClick = onClick, modifier = Modifier.size(70.dp)) { - Icon( - painter = painterResource(id = if (isRecording) R.drawable.ic_baseline_shield_24 else R.drawable.ic_baseline_mic_24), - contentDescription = "microphone" - ) + if (isRecording) { + DotsTyping(7.dp, 3, 300, MaterialTheme.colorScheme.secondary, 2.dp) + } else { + if (isProcessing) { + DotsFlashing(7.dp, 3, 300, MaterialTheme.colorScheme.secondary, 2.dp) + } else { + Icon( + painter = painterResource(id = R.drawable.ic_baseline_mic_24), + contentDescription = "microphone" + ) + } + } } } } @@ -143,17 +161,20 @@ fun DisplayMainPage( .padding(bottom = 40.dp) ) { var listening: Boolean by remember { mutableStateOf(false) } + var processing: Boolean by remember { mutableStateOf(false) } audioRecorder.waveRecorder.onStateChangeListener = { when (it) { RecorderState.RECORDING -> listening = true RecorderState.STOP -> { listening = false - + processing = true thread { val requestOutput = contactServerWithFileAudioRecording(audioRecorder.getOutputFile()) + processing = false + val json = JSONObject(requestOutput) val sent = json.getString("transcription") @@ -169,7 +190,8 @@ fun DisplayMainPage( StartRecordingFAB( onClick = { if (listening) audioRecorder.stopRecording() else audioRecorder.startRecording() }, - isRecording = listening + isRecording = listening, + isProcessing = processing ) } } @@ -178,7 +200,7 @@ fun DisplayMainPage( @Preview(showBackground = true) @Composable fun MainPagePreview() { - JarvisComposeTheme { + JarvisclientappTheme { DisplayMainPage( rememberNavController(), ConversationUiState( listOf(Message(true, stringResource(id = R.string.demo_message_1))) diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/pages/PermissionsPage.kt b/app/src/main/java/ch/broillet/jarvis/android/pages/PermissionsPage.kt similarity index 82% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/pages/PermissionsPage.kt rename to app/src/main/java/ch/broillet/jarvis/android/pages/PermissionsPage.kt index 34b6fe0..79acd13 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/pages/PermissionsPage.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/pages/PermissionsPage.kt @@ -1,9 +1,9 @@ -package ch.mathieubroillet.jarvis.android.pages +package ch.broillet.jarvis.android.pages import android.Manifest import androidx.compose.foundation.layout.* -import androidx.compose.material.Icon -import androidx.compose.material.Text +import androidx.compose.material3.Icon +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -14,26 +14,25 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController -import ch.mathieubroillet.jarvis.android.R -import ch.mathieubroillet.jarvis.android.ui.theme.JarvisComposeTheme -import ch.mathieubroillet.jarvis.android.ui.theme.productSansFont -import ch.mathieubroillet.jarvis.android.utils.DefaultBox -import ch.mathieubroillet.jarvis.android.utils.requestPermissionButton - +import ch.broillet.jarvis.android.R +import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme +import ch.broillet.jarvis.android.ui.theme.productSansFont +import ch.broillet.jarvis.android.utils.DefaultBox +import ch.broillet.jarvis.android.utils.requestPermissionButton @Composable fun DisplayPermissionsPage(navController: NavController) { DefaultBox { - PermissionsBase(navController) + PermissionsBase() } } @Composable -fun PermissionsBase(navController: NavController) { +fun PermissionsBase() { Column( Modifier .padding(bottom = 25.dp) - .fillMaxSize() + .fillMaxWidth() ) { Row { Icon( @@ -62,12 +61,12 @@ fun PermissionsBase(navController: NavController) { Manifest.permission.RECORD_AUDIO ) - PermissionRow( + /*PermissionRow( R.drawable.ic_baseline_folder_open_24, stringResource(id = R.string.permission_files), stringResource(id = R.string.permission_files_description), Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + )*/ } } @@ -89,7 +88,9 @@ fun PermissionRow( Icon( painter = painterResource(id = icon), contentDescription = "permission icon", - modifier = Modifier.size(40.dp).padding(end = 10.dp) + modifier = Modifier + .size(40.dp) + .padding(end = 10.dp) ) Column { Text( @@ -112,7 +113,7 @@ fun PermissionRow( @Preview(showBackground = true) @Composable fun PermissionsPagePreview() { - JarvisComposeTheme { + JarvisclientappTheme { DisplayPermissionsPage(rememberNavController()) } } \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/pages/SettingsPage.kt b/app/src/main/java/ch/broillet/jarvis/android/pages/SettingsPage.kt similarity index 74% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/pages/SettingsPage.kt rename to app/src/main/java/ch/broillet/jarvis/android/pages/SettingsPage.kt index e041c39..91b8924 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/pages/SettingsPage.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/pages/SettingsPage.kt @@ -1,11 +1,11 @@ -package ch.mathieubroillet.jarvis.android.pages +package ch.broillet.jarvis.android.pages import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding -import androidx.compose.material.Icon -import androidx.compose.material.IconButton -import androidx.compose.material.Text +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource @@ -15,11 +15,11 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavController import androidx.navigation.compose.rememberNavController -import ch.mathieubroillet.jarvis.android.R -import ch.mathieubroillet.jarvis.android.nav.Screen -import ch.mathieubroillet.jarvis.android.ui.theme.JarvisComposeTheme -import ch.mathieubroillet.jarvis.android.ui.theme.productSansFont -import ch.mathieubroillet.jarvis.android.utils.DefaultBox +import ch.broillet.jarvis.android.R +import ch.broillet.jarvis.android.nav.Screen +import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme +import ch.broillet.jarvis.android.ui.theme.productSansFont +import ch.broillet.jarvis.android.utils.DefaultBox @Composable @@ -52,7 +52,7 @@ fun SettingsBase(navController: NavController) { @Preview(showBackground = true) @Composable fun SettingsPagePreview() { - JarvisComposeTheme { + JarvisclientappTheme { DisplaySettingsPage(rememberNavController()) } } \ No newline at end of file diff --git a/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Color.kt b/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Color.kt new file mode 100644 index 0000000..91010b5 --- /dev/null +++ b/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Color.kt @@ -0,0 +1,69 @@ +package ch.broillet.jarvis.android.ui.theme + +import androidx.compose.ui.graphics.Color + + +val md_theme_light_primary = Color(0xFF006D3E) +val md_theme_light_onPrimary = Color(0xFFFFFFFF) +val md_theme_light_primaryContainer = Color(0xFF96F7B8) +val md_theme_light_onPrimaryContainer = Color(0xFF00210F) +val md_theme_light_secondary = Color(0xFF4F6354) +val md_theme_light_onSecondary = Color(0xFFFFFFFF) +val md_theme_light_secondaryContainer = Color(0xFFD1E8D5) +val md_theme_light_onSecondaryContainer = Color(0xFF0C1F13) +val md_theme_light_tertiary = Color(0xFF3B6470) +val md_theme_light_onTertiary = Color(0xFFFFFFFF) +val md_theme_light_tertiaryContainer = Color(0xFFBEEAF7) +val md_theme_light_onTertiaryContainer = Color(0xFF001F26) +val md_theme_light_error = Color(0xFFBA1A1A) +val md_theme_light_errorContainer = Color(0xFFFFDAD6) +val md_theme_light_onError = Color(0xFFFFFFFF) +val md_theme_light_onErrorContainer = Color(0xFF410002) +val md_theme_light_background = Color(0xFFFBFDF8) +val md_theme_light_onBackground = Color(0xFF191C1A) +val md_theme_light_surface = Color(0xFFFBFDF8) +val md_theme_light_onSurface = Color(0xFF191C1A) +val md_theme_light_surfaceVariant = Color(0xFFDCE5DB) +val md_theme_light_onSurfaceVariant = Color(0xFF414942) +val md_theme_light_outline = Color(0xFF717971) +val md_theme_light_inverseOnSurface = Color(0xFFF0F1EC) +val md_theme_light_inverseSurface = Color(0xFF2E312E) +val md_theme_light_inversePrimary = Color(0xFF7ADA9E) +val md_theme_light_shadow = Color(0xFF000000) +val md_theme_light_surfaceTint = Color(0xFF006D3E) +val md_theme_light_outlineVariant = Color(0xFFC0C9C0) +val md_theme_light_scrim = Color(0xFF000000) + +val md_theme_dark_primary = Color(0xFF7ADA9E) +val md_theme_dark_onPrimary = Color(0xFF00391E) +val md_theme_dark_primaryContainer = Color(0xFF00522E) +val md_theme_dark_onPrimaryContainer = Color(0xFF96F7B8) +val md_theme_dark_secondary = Color(0xFFB6CCB9) +val md_theme_dark_onSecondary = Color(0xFF213527) +val md_theme_dark_secondaryContainer = Color(0xFF374B3D) +val md_theme_dark_onSecondaryContainer = Color(0xFFD1E8D5) +val md_theme_dark_tertiary = Color(0xFFA3CDDB) +val md_theme_dark_onTertiary = Color(0xFF023640) +val md_theme_dark_tertiaryContainer = Color(0xFF214C57) +val md_theme_dark_onTertiaryContainer = Color(0xFFBEEAF7) +val md_theme_dark_error = Color(0xFFFFB4AB) +val md_theme_dark_errorContainer = Color(0xFF93000A) +val md_theme_dark_onError = Color(0xFF690005) +val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) +val md_theme_dark_background = Color(0xFF191C1A) +val md_theme_dark_onBackground = Color(0xFFE1E3DE) +val md_theme_dark_surface = Color(0xFF191C1A) +val md_theme_dark_onSurface = Color(0xFFE1E3DE) +val md_theme_dark_surfaceVariant = Color(0xFF414942) +val md_theme_dark_onSurfaceVariant = Color(0xFFC0C9C0) +val md_theme_dark_outline = Color(0xFF8A938B) +val md_theme_dark_inverseOnSurface = Color(0xFF191C1A) +val md_theme_dark_inverseSurface = Color(0xFFE1E3DE) +val md_theme_dark_inversePrimary = Color(0xFF006D3E) +val md_theme_dark_shadow = Color(0xFF000000) +val md_theme_dark_surfaceTint = Color(0xFF7ADA9E) +val md_theme_dark_outlineVariant = Color(0xFF414942) +val md_theme_dark_scrim = Color(0xFF000000) + + +val seed = Color(0xFF056D3F) diff --git a/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Theme.kt b/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Theme.kt new file mode 100644 index 0000000..a048d15 --- /dev/null +++ b/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Theme.kt @@ -0,0 +1,104 @@ +package ch.broillet.jarvis.android.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.ViewCompat + +private val DarkColorScheme = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary +) + +private val LightColorScheme = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary +) + +@Composable +fun JarvisclientappTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb() + ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt b/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Type.kt similarity index 68% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt rename to app/src/main/java/ch/broillet/jarvis/android/ui/theme/Type.kt index 13ae2e8..5c7bb4f 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Type.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/ui/theme/Type.kt @@ -1,13 +1,13 @@ -package ch.mathieubroillet.jarvis.android.ui.theme +package ch.broillet.jarvis.android.ui.theme -import androidx.compose.material.Typography +import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import ch.mathieubroillet.jarvis.android.R +import ch.broillet.jarvis.android.R // Adding the Product Sans fonts val productSansFont = FontFamily( @@ -24,23 +24,30 @@ val productSansFont = FontFamily( Font(R.font.google_black_italic, weight = FontWeight.Black, style = FontStyle.Italic) ) + // Set of Material typography styles to start with val Typography = Typography( - body1 = TextStyle( + bodyLarge = TextStyle( fontFamily = productSansFont, fontWeight = FontWeight.Normal, - fontSize = 16.sp + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp ), - button = TextStyle( - fontFamily = productSansFont, + labelSmall = TextStyle( + fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, - fontSize = 14.sp - ), - caption = TextStyle( - fontFamily = productSansFont, - fontWeight = FontWeight.Normal, - fontSize = 12.sp - ), - defaultFontFamily = productSansFont -) - + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/ch/broillet/jarvis/android/utils/DotsLoaders.kt b/app/src/main/java/ch/broillet/jarvis/android/utils/DotsLoaders.kt new file mode 100644 index 0000000..16a1c89 --- /dev/null +++ b/app/src/main/java/ch/broillet/jarvis/android/utils/DotsLoaders.kt @@ -0,0 +1,258 @@ +// Thanks to EugeneTheDev : https://gist.github.com/EugeneTheDev/a27664cb7e7899f964348b05883cbccd + +package ch.broillet.jarvis.android.utils + +import androidx.compose.animation.core.* +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.State +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp + + +@Composable +fun DotsPulsing(dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp) { + + @Composable + fun Dot(scale: Float) { + Spacer( + Modifier + .size(dotSize) + .scale(scale) + .background( + color = dotColor, shape = CircleShape + ) + ) + } + + val infiniteTransition = rememberInfiniteTransition() + + @Composable + fun animateScaleWithDelay(delay: Int) = infiniteTransition.animateFloat( + initialValue = 0f, + targetValue = 0f, + animationSpec = infiniteRepeatable(animation = keyframes { + durationMillis = delayUnit * numberOfDots + 0f at delay with LinearEasing + 1f at delay + delayUnit with LinearEasing + 0f at delay + numberOfDots * delayUnit + }) + ) + + val scales = arrayListOf>() + for (i in 0 until numberOfDots) { + scales.add(animateScaleWithDelay(delay = i * delayUnit)) + } + + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center + ) { + scales.forEach { + Dot(it.value) + Spacer(Modifier.width(spaceBetween)) + } + } +} + + +@Composable +fun DotsElastic(dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp) { + val minScale = 0.6f + + @Composable + fun Dot(scale: Float) { + Spacer( + Modifier + .size(dotSize) + .scale(scaleX = minScale, scaleY = scale) + .background( + color = dotColor, shape = CircleShape + ) + ) + } + + val infiniteTransition = rememberInfiniteTransition() + + @Composable + fun animateScaleWithDelay(delay: Int) = infiniteTransition.animateFloat( + initialValue = minScale, + targetValue = minScale, + animationSpec = infiniteRepeatable(animation = keyframes { + durationMillis = numberOfDots * delayUnit + minScale at delay with LinearEasing + 1f at delay + delayUnit with LinearEasing + minScale at delay + numberOfDots * delayUnit + }) + ) + + val scales = arrayListOf>() + for (i in 0 until numberOfDots) { + scales.add(animateScaleWithDelay(delay = i * delayUnit)) + } + + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center + ) { + scales.forEach { + Dot(it.value) + Spacer(Modifier.width(spaceBetween)) + } + } +} + +@Composable +fun DotsFlashing( + dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp +) { + val minAlpha = 0.1f + + @Composable + fun Dot(alpha: Float) = Spacer( + Modifier + .size(dotSize) + .alpha(alpha) + .background( + color = dotColor, shape = CircleShape + ) + ) + + val infiniteTransition = rememberInfiniteTransition() + + @Composable + fun animateAlphaWithDelay(delay: Int) = infiniteTransition.animateFloat( + initialValue = minAlpha, + targetValue = minAlpha, + animationSpec = infiniteRepeatable(animation = keyframes { + durationMillis = numberOfDots * delayUnit + minAlpha at delay with LinearEasing + 1f at delay + delayUnit with LinearEasing + minAlpha at delay + numberOfDots * delayUnit + }) + ) + + val alphas = arrayListOf>() + for (i in 0 until numberOfDots) { + alphas.add(animateAlphaWithDelay(delay = i * delayUnit)) + } + + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center + ) { + alphas.forEach { + Dot(it.value) + Spacer(Modifier.width(spaceBetween)) + } + } +} + +@Composable +fun DotsTyping(dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp) { + val maxOffset = (numberOfDots * 2).toFloat() + + @Composable + fun Dot(offset: Float) { + Spacer( + Modifier + .size(dotSize) + .offset(y = -offset.dp) + .background( + color = dotColor, shape = CircleShape + ) + ) + } + + val infiniteTransition = rememberInfiniteTransition() + + @Composable + fun animateOffsetWithDelay(delay: Int) = infiniteTransition.animateFloat( + initialValue = 0f, + targetValue = 0f, + animationSpec = infiniteRepeatable(animation = keyframes { + durationMillis = numberOfDots * delayUnit + 0f at delay with LinearEasing + maxOffset at delay + delayUnit with LinearEasing + 0f at delay + (numberOfDots * delayUnit / 2) + }) + ) + + val offsets = arrayListOf>() + for (i in 0 until numberOfDots) { + offsets.add(animateOffsetWithDelay(delay = i * delayUnit)) + } + + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center, + modifier = Modifier.padding(top = maxOffset.dp) + ) { + offsets.forEach { + Dot(it.value) + Spacer(Modifier.width(spaceBetween)) + } + } +} + +@Composable +fun DotsCollision( + dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp +) { + val maxOffset = 30f + val delayUnit = 500 + + @Composable + fun Dot(offset: Float) { + Spacer( + Modifier + .size(dotSize) + .offset(x = offset.dp) + .background( + color = dotColor, shape = CircleShape + ) + ) + } + + val infiniteTransition = rememberInfiniteTransition() + + val offsetLeft by infiniteTransition.animateFloat( + initialValue = 0f, + targetValue = 0f, + animationSpec = infiniteRepeatable(animation = keyframes { + durationMillis = delayUnit * 3 + 0f at 0 with LinearEasing + -maxOffset at delayUnit / 2 with LinearEasing + 0f at delayUnit + }) + ) + val offsetRight by infiniteTransition.animateFloat( + initialValue = 0f, + targetValue = 0f, + animationSpec = infiniteRepeatable(animation = keyframes { + durationMillis = delayUnit * 3 + 0f at delayUnit with LinearEasing + maxOffset at delayUnit + delayUnit / 2 with LinearEasing + 0f at delayUnit * 2 + }) + ) + + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center, + modifier = Modifier.padding(horizontal = maxOffset.dp) + ) { + Dot(offsetLeft) + Spacer(Modifier.width(spaceBetween)) + for (i in 0 until numberOfDots - 2) { + Dot(0f) + Spacer(Modifier.width(spaceBetween)) + } + Dot(offsetRight) + } +} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/PermissionsUtils.kt b/app/src/main/java/ch/broillet/jarvis/android/utils/PermissionsUtils.kt similarity index 88% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/utils/PermissionsUtils.kt rename to app/src/main/java/ch/broillet/jarvis/android/utils/PermissionsUtils.kt index 9660f93..01c41f6 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/PermissionsUtils.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/utils/PermissionsUtils.kt @@ -1,14 +1,15 @@ -package ch.mathieubroillet.jarvis.android.utils +package ch.broillet.jarvis.android.utils import androidx.compose.material.* +import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import ch.mathieubroillet.jarvis.android.R import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionRequired import com.google.accompanist.permissions.rememberPermissionState +import ch.broillet.jarvis.android.R @OptIn(ExperimentalPermissionsApi::class) @@ -30,7 +31,7 @@ fun requestPermissionButton(permission: String) { permissionNotAvailableContent = { Button( onClick = { openAppSettings(context) }, - colors = ButtonDefaults.buttonColors(backgroundColor = MaterialTheme.colors.error) + colors = ButtonDefaults.buttonColors(contentColor = MaterialTheme.colorScheme.error) ) { Text(text = stringResource(id = R.string.permissions_page_permission_denied)) Icon( diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/RequestsUtils.kt b/app/src/main/java/ch/broillet/jarvis/android/utils/RequestsUtils.kt similarity index 97% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/utils/RequestsUtils.kt rename to app/src/main/java/ch/broillet/jarvis/android/utils/RequestsUtils.kt index ffa7494..4c3fd20 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/RequestsUtils.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/utils/RequestsUtils.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android.utils +package ch.broillet.jarvis.android.utils import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/Utils.kt b/app/src/main/java/ch/broillet/jarvis/android/utils/Utils.kt similarity index 94% rename from app/src/main/java/ch/mathieubroillet/jarvis/android/utils/Utils.kt rename to app/src/main/java/ch/broillet/jarvis/android/utils/Utils.kt index 3878003..2ff7c62 100644 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/Utils.kt +++ b/app/src/main/java/ch/broillet/jarvis/android/utils/Utils.kt @@ -1,4 +1,4 @@ -package ch.mathieubroillet.jarvis.android.utils +package ch.broillet.jarvis.android.utils import android.content.Context import android.content.Intent diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/MainActivity.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/MainActivity.kt deleted file mode 100644 index ef46ff8..0000000 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/MainActivity.kt +++ /dev/null @@ -1,50 +0,0 @@ -package ch.mathieubroillet.jarvis.android - -import android.os.Bundle -import android.view.WindowManager -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Surface -import androidx.compose.ui.Modifier -import androidx.core.view.WindowCompat -import androidx.core.view.WindowInsetsControllerCompat -import ch.mathieubroillet.jarvis.android.nav.Navigation -import ch.mathieubroillet.jarvis.android.ui.theme.JarvisComposeTheme - - -class MainActivity : ComponentActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - - WindowCompat.setDecorFitsSystemWindows(window, false) - window.setFlags( - WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, - WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS - ) - - setContent { - - // Fix the status & navigation bars staying white when white theme is on with activity in fullscreen - val wic = WindowInsetsControllerCompat(window, window.decorView) - wic.isAppearanceLightStatusBars = !isSystemInDarkTheme() - wic.isAppearanceLightNavigationBars = !isSystemInDarkTheme() - - JarvisComposeTheme { - // A surface container using the 'background' color from the theme - Surface( - color = MaterialTheme.colors.background, modifier = Modifier - .fillMaxWidth() - .fillMaxHeight() - ) { - Navigation() - } - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Color.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Color.kt deleted file mode 100644 index 050f2ca..0000000 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Color.kt +++ /dev/null @@ -1,58 +0,0 @@ -package ch.mathieubroillet.jarvis.android.ui.theme - -import androidx.compose.ui.graphics.Color - -val md_theme_light_primary = Color(0xFF006d40) -val md_theme_light_onPrimary = Color(0xFFffffff) -val md_theme_light_primaryContainer = Color(0xFF73fcb2) -val md_theme_light_onPrimaryContainer = Color(0xFF002110) -val md_theme_light_secondary = Color(0xFF4e6355) -val md_theme_light_onSecondary = Color(0xFFffffff) -val md_theme_light_secondaryContainer = Color(0xFFd1e9d6) -val md_theme_light_onSecondaryContainer = Color(0xFF0c1f14) -val md_theme_light_tertiary = Color(0xFF3b6471) -val md_theme_light_onTertiary = Color(0xFFffffff) -val md_theme_light_tertiaryContainer = Color(0xFFbee9f8) -val md_theme_light_onTertiaryContainer = Color(0xFF001f27) -val md_theme_light_error = Color(0xFFba1b1b) -val md_theme_light_errorContainer = Color(0xFFffdad4) -val md_theme_light_onError = Color(0xFFffffff) -val md_theme_light_onErrorContainer = Color(0xFF410001) -val md_theme_light_background = Color(0xFFfbfdf8) -val md_theme_light_onBackground = Color(0xFF191c1a) -val md_theme_light_surface = Color(0xFFfbfdf8) -val md_theme_light_onSurface = Color(0xFF191c1a) -val md_theme_light_surfaceVariant = Color(0xFFdce5dc) -val md_theme_light_onSurfaceVariant = Color(0xFF404942) -val md_theme_light_outline = Color(0xFF717972) -val md_theme_light_inverseOnSurface = Color(0xFFeff1ec) -val md_theme_light_inverseSurface = Color(0xFF2e312e) - -val md_theme_dark_primary = Color(0xFF53df98) -val md_theme_dark_onPrimary = Color(0xFF00391f) -val md_theme_dark_primaryContainer = Color(0xFF00522f) -val md_theme_dark_onPrimaryContainer = Color(0xFF73fcb2) -val md_theme_dark_secondary = Color(0xFFb5ccba) -val md_theme_dark_onSecondary = Color(0xFF213528) -val md_theme_dark_secondaryContainer = Color(0xFF374b3e) -val md_theme_dark_onSecondaryContainer = Color(0xFFd1e9d6) -val md_theme_dark_tertiary = Color(0xFFa3cddc) -val md_theme_dark_onTertiary = Color(0xFF033541) -val md_theme_dark_tertiaryContainer = Color(0xFF224c58) -val md_theme_dark_onTertiaryContainer = Color(0xFFbee9f8) -val md_theme_dark_error = Color(0xFFffb4a9) -val md_theme_dark_errorContainer = Color(0xFF930006) -val md_theme_dark_onError = Color(0xFF680003) -val md_theme_dark_onErrorContainer = Color(0xFFffdad4) -val md_theme_dark_background = Color(0xFF191c1a) -val md_theme_dark_onBackground = Color(0xFFe2e3df) -val md_theme_dark_surface = Color(0xFF191c1a) -val md_theme_dark_onSurface = Color(0xFFe2e3df) -val md_theme_dark_surfaceVariant = Color(0xFF404942) -val md_theme_dark_onSurfaceVariant = Color(0xFFc0c9c0) -val md_theme_dark_outline = Color(0xFF8a938b) -val md_theme_dark_inverseOnSurface = Color(0xFF191c1a) -val md_theme_dark_inverseSurface = Color(0xFFe2e3df) - -val seed = Color(0xFF2ec27e) -val error = Color(0xFFba1b1b) \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt deleted file mode 100644 index f2371d7..0000000 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Shape.kt +++ /dev/null @@ -1,11 +0,0 @@ -package ch.mathieubroillet.jarvis.android.ui.theme - -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Shapes -import androidx.compose.ui.unit.dp - -val Shapes = Shapes( - small = RoundedCornerShape(12.dp), - medium = RoundedCornerShape(14.dp), - large = RoundedCornerShape(20.dp) -) \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Theme.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Theme.kt deleted file mode 100644 index 633e7ed..0000000 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/ui/theme/Theme.kt +++ /dev/null @@ -1,57 +0,0 @@ -package ch.mathieubroillet.jarvis.android.ui.theme - -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material.MaterialTheme -import androidx.compose.material.darkColors -import androidx.compose.material.lightColors -import androidx.compose.runtime.Composable - -private val LightThemeColors = lightColors( - - primary = md_theme_light_primary, - primaryVariant = md_theme_light_primaryContainer, - onPrimary = md_theme_light_onPrimary, - secondary = md_theme_light_secondary, - secondaryVariant = md_theme_light_secondaryContainer, - onSecondary = md_theme_light_onSecondary, - error = md_theme_light_error, - onError = md_theme_light_onError, - background = md_theme_light_background, - onBackground = md_theme_light_onBackground, - surface = md_theme_light_surface, - onSurface = md_theme_light_onSurface -) -private val DarkThemeColors = darkColors( - - primary = md_theme_dark_primary, - primaryVariant = md_theme_dark_primaryContainer, - onPrimary = md_theme_dark_onPrimary, - secondary = md_theme_dark_secondary, - secondaryVariant = md_theme_dark_secondaryContainer, - onSecondary = md_theme_dark_onSecondary, - error = md_theme_dark_error, - onError = md_theme_dark_onError, - background = md_theme_dark_background, - onBackground = md_theme_dark_onBackground, - surface = md_theme_dark_surface, - onSurface = md_theme_dark_onSurface -) - -@Composable -fun JarvisComposeTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - content: @Composable() () -> Unit -) { - val colors = if (darkTheme) { - DarkThemeColors - } else { - LightThemeColors - } - - MaterialTheme( - colors = colors, - typography = Typography, - shapes = Shapes, - content = content - ) -} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/Dialogs.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/Dialogs.kt deleted file mode 100644 index a245483..0000000 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/Dialogs.kt +++ /dev/null @@ -1,131 +0,0 @@ -package ch.mathieubroillet.jarvis.android.utils - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.* -import androidx.compose.runtime.Composable -import androidx.compose.runtime.DisposableEffect -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.ui.ExperimentalComposeUiApi -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.graphics.RectangleShape -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import ch.mathieubroillet.jarvis.android.R -import ch.mathieubroillet.jarvis.android.ui.theme.JarvisComposeTheme -import ch.mathieubroillet.jarvis.android.ui.theme.productSansFont - -@OptIn(ExperimentalComposeUiApi::class) -@Composable -fun IconAlertDialogTextField( - buttonIcon: Int = R.drawable.ic_baseline_error_24, - title: String = "Title", - label: String = "Label", - text: String, - textFieldValue: (String) -> Unit, - onOKClick: () -> Unit -) { - JarvisComposeTheme { - Column { - val openDialog = remember { mutableStateOf(false) } - - IconButton(onClick = { openDialog.value = true }) { - Icon( - painter = painterResource(id = buttonIcon), - contentDescription = "icon button with dialog" - ) - } - - if (openDialog.value) { - AlertDialog( - onDismissRequest = { - // Dismiss the dialog when the user clicks outside the dialog or on the back - // button. If you want to disable that functionality, simply use an empty - // onCloseRequest. - openDialog.value = false - }, - title = null, - text = null, - buttons = { - Column { - Box( - modifier = Modifier - .clip(RectangleShape) - .background(color = MaterialTheme.colors.secondaryVariant) - .padding(horizontal = 20.dp, vertical = 15.dp) - .fillMaxWidth() - ) { - Text( - text = title, - fontFamily = productSansFont, - fontSize = 30.sp - ) - } - Box( - modifier = Modifier - .clip(RectangleShape) - .background(color = MaterialTheme.colors.background) - .padding(horizontal = 20.dp) - .padding(top = 15.dp, bottom = 10.dp) - .fillMaxWidth() - ) { - Column { - val (focusRequester) = FocusRequester.createRefs() - - OutlinedTextField( - value = text, - onValueChange = textFieldValue, - label = { Text(text = label) }, - colors = TextFieldDefaults.outlinedTextFieldColors( - focusedBorderColor = MaterialTheme.colors.secondaryVariant, - focusedLabelColor = MaterialTheme.colors.secondary - ), - singleLine = true, - modifier = Modifier.focusRequester(focusRequester) - ) - //Auto-focus on the textfield when opening the dialog which opens the keyboard directly. - DisposableEffect(Unit) { - focusRequester.requestFocus() - onDispose { } - } - - Row( - Modifier - .fillMaxWidth() - .padding(top = 5.dp), - horizontalArrangement = Arrangement.End - ) { - TextButton(onClick = { openDialog.value = false }) { - Text( - text = stringResource(id = R.string.cancel), - color = MaterialTheme.colors.secondary - ) - } - TextButton(onClick = { - onOKClick(); openDialog.value = false - }, enabled = text.isNotEmpty()) { - Text( - text = stringResource(id = R.string.ok), - //TODO: change color to gray when disabled - color = MaterialTheme.colors.secondary, - ) - } - } - } - } - } - }, - shape = RoundedCornerShape(8.dp) - ) - } - } - - } -} \ No newline at end of file diff --git a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/DotsLoaders.kt b/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/DotsLoaders.kt deleted file mode 100644 index 8868dfa..0000000 --- a/app/src/main/java/ch/mathieubroillet/jarvis/android/utils/DotsLoaders.kt +++ /dev/null @@ -1,332 +0,0 @@ -// Thanks to EugeneTheDev : https://gist.github.com/EugeneTheDev/a27664cb7e7899f964348b05883cbccd - -package ch.mathieubroillet.jarvis.android.utils - -import androidx.compose.animation.core.* -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.alpha -import androidx.compose.ui.draw.scale -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp - -val dotSize = 20.dp -val delayUnit = 150 - -@Composable -fun DotsPulsing() { - - @Composable - fun Dot( - scale: Float - ) = Spacer( - Modifier - .size(dotSize) - .scale(scale) - .background( - color = MaterialTheme.colors.primary, - shape = CircleShape - ) - ) - - val infiniteTransition = rememberInfiniteTransition() - - @Composable - fun animateScaleWithDelay(delay: Int) = infiniteTransition.animateFloat( - initialValue = 0f, - targetValue = 0f, - animationSpec = infiniteRepeatable( - animation = keyframes { - durationMillis = delayUnit * 4 - 0f at delay with LinearEasing - 1f at delay + delayUnit with LinearEasing - 0f at delay + delayUnit * 2 - } - ) - ) - - val scale1 by animateScaleWithDelay(0) - val scale2 by animateScaleWithDelay(delayUnit) - val scale3 by animateScaleWithDelay(delayUnit * 2) - - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center - ) { - val spaceSize = 2.dp - - Dot(scale1) - Spacer(Modifier.width(spaceSize)) - Dot(scale2) - Spacer(Modifier.width(spaceSize)) - Dot(scale3) - } -} - -@Composable -fun DotsElastic() { - val minScale = 0.6f - - @Composable - fun Dot( - scale: Float - ) = Spacer( - Modifier - .size(dotSize) - .scale(scaleX = minScale, scaleY = scale) - .background( - color = MaterialTheme.colors.primary, - shape = CircleShape - ) - ) - - val infiniteTransition = rememberInfiniteTransition() - - @Composable - fun animateScaleWithDelay(delay: Int) = infiniteTransition.animateFloat( - initialValue = minScale, - targetValue = minScale, - animationSpec = infiniteRepeatable( - animation = keyframes { - durationMillis = delayUnit * 4 - minScale at delay with LinearEasing - 1f at delay + delayUnit with LinearEasing - minScale at delay + delayUnit * 2 - } - ) - ) - - val scale1 by animateScaleWithDelay(0) - val scale2 by animateScaleWithDelay(delayUnit) - val scale3 by animateScaleWithDelay(delayUnit * 2) - - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center - ) { - val spaceSize = 2.dp - - Dot(scale1) - Spacer(Modifier.width(spaceSize)) - Dot(scale2) - Spacer(Modifier.width(spaceSize)) - Dot(scale3) - } -} - -@Composable -fun DotsFlashing() { - val minAlpha = 0.1f - - @Composable - fun Dot( - alpha: Float - ) = Spacer( - Modifier - .size(dotSize) - .alpha(alpha) - .background( - color = MaterialTheme.colors.primary, - shape = CircleShape - ) - ) - - val infiniteTransition = rememberInfiniteTransition() - - @Composable - fun animateAlphaWithDelay(delay: Int) = infiniteTransition.animateFloat( - initialValue = minAlpha, - targetValue = minAlpha, - animationSpec = infiniteRepeatable( - animation = keyframes { - durationMillis = delayUnit * 4 - minAlpha at delay with LinearEasing - 1f at delay + delayUnit with LinearEasing - minAlpha at delay + delayUnit * 2 - } - ) - ) - - val alpha1 by animateAlphaWithDelay(0) - val alpha2 by animateAlphaWithDelay(delayUnit) - val alpha3 by animateAlphaWithDelay(delayUnit * 2) - - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center - ) { - val spaceSize = 2.dp - - Dot(alpha1) - Spacer(Modifier.width(spaceSize)) - Dot(alpha2) - Spacer(Modifier.width(spaceSize)) - Dot(alpha3) - } -} - -@Composable -fun DotsTyping() { - val maxOffset = 10f - - @Composable - fun Dot( - offset: Float - ) = Spacer( - Modifier - .size(dotSize) - .offset(y = -offset.dp) - .background( - color = MaterialTheme.colors.primary, - shape = CircleShape - ) - ) - - val infiniteTransition = rememberInfiniteTransition() - - @Composable - fun animateOffsetWithDelay(delay: Int) = infiniteTransition.animateFloat( - initialValue = 0f, - targetValue = 0f, - animationSpec = infiniteRepeatable( - animation = keyframes { - durationMillis = delayUnit * 4 - 0f at delay with LinearEasing - maxOffset at delay + delayUnit with LinearEasing - 0f at delay + delayUnit * 2 - } - ) - ) - - val offset1 by animateOffsetWithDelay(0) - val offset2 by animateOffsetWithDelay(delayUnit) - val offset3 by animateOffsetWithDelay(delayUnit * 2) - - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center, - modifier = Modifier.padding(top = maxOffset.dp) - ) { - val spaceSize = 2.dp - - Dot(offset1) - Spacer(Modifier.width(spaceSize)) - Dot(offset2) - Spacer(Modifier.width(spaceSize)) - Dot(offset3) - } -} - -@Composable -fun DotsCollision() { - val maxOffset = 30f - val delayUnit = 500 // it's better to use longer delay for this animation - - @Composable - fun Dot( - offset: Float - ) = Spacer( - Modifier - .size(dotSize) - .offset(x = offset.dp) - .background( - color = MaterialTheme.colors.primary, - shape = CircleShape - ) - ) - - val infiniteTransition = rememberInfiniteTransition() - - val offsetLeft by infiniteTransition.animateFloat( - initialValue = 0f, - targetValue = 0f, - animationSpec = infiniteRepeatable( - animation = keyframes { - durationMillis = delayUnit * 3 - 0f at 0 with LinearEasing - -maxOffset at delayUnit / 2 with LinearEasing - 0f at delayUnit - } - ) - ) - val offsetRight by infiniteTransition.animateFloat( - initialValue = 0f, - targetValue = 0f, - animationSpec = infiniteRepeatable( - animation = keyframes { - durationMillis = delayUnit * 3 - 0f at delayUnit with LinearEasing - maxOffset at delayUnit + delayUnit / 2 with LinearEasing - 0f at delayUnit * 2 - } - ) - ) - - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center, - modifier = Modifier.padding(horizontal = maxOffset.dp) - ) { - val spaceSize = 2.dp - - Dot(offsetLeft) - Spacer(Modifier.width(spaceSize)) - Dot(0f) - Spacer(Modifier.width(spaceSize)) - Dot(offsetRight) - } -} - - -@Preview(showBackground = true) -@Composable -fun DotsPreview() = MaterialTheme { - Column(modifier = Modifier.padding(4.dp)) { - val spaceSize = 16.dp - - Text( - text = "Dots pulsing", - style = MaterialTheme.typography.h5 - ) - DotsPulsing() - - Spacer(Modifier.height(spaceSize)) - - Text( - text = "Dots elastic", - style = MaterialTheme.typography.h5 - ) - DotsElastic() - - Spacer(Modifier.height(spaceSize)) - - Text( - text = "Dots flashing", - style = MaterialTheme.typography.h5 - ) - DotsFlashing() - - Spacer(Modifier.height(spaceSize)) - - Text( - text = "Dots typing", - style = MaterialTheme.typography.h5 - ) - DotsTyping() - - Spacer(Modifier.height(spaceSize)) - - Text( - text = "Dots collision", - style = MaterialTheme.typography.h5 - ) - DotsCollision() - } -} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index af5f3ca..0000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 1817c95..542be2f 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,22 +1,5 @@ - - - - - + + +