diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..f288702
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..2aa00ec
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,7 @@
+All the files in this repository are part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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.
+
+A copy of the GNU General Public License is included in this repository, in the file under the name COPYING. If you wish, see .
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4f32713
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+# DeNa Drive
+
+This Android application aims to make it possible to access your own (or of someone who has given you explicit access to theirs) Google Drive storage.
+
+This app is intended to be useful, not harmful. I (the author) do not approve nor take any responsibility for misusage.
+
+If you ever need to contact me for any reason you can do so at this email address "albymine64@gmail.com".
+
+A built apk is not available at the moment as the project hasn't reached a release state yet.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6a01c00..baf79d5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -73,4 +73,5 @@ dependencies {
implementation(libs.google.auth.library.oauth2.http)
implementation(libs.kotlinx.serialization.json)
+
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0be5f0..3aecb6d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,16 @@
+
@@ -45,24 +57,6 @@
android:exported="false"
android:label="@string/app_name"
android:theme="@style/Theme.DeNaDrive">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/bbc/denadrive/DriveRequester.kt b/app/src/main/java/com/bbc/denadrive/DriveRequester.kt
new file mode 100644
index 0000000..00dafb8
--- /dev/null
+++ b/app/src/main/java/com/bbc/denadrive/DriveRequester.kt
@@ -0,0 +1,64 @@
+package com.bbc.denadrive
+
+import android.content.Context
+import android.util.Log
+import com.bbc.denadrive.apihandlers.DriveResponseBody
+import com.bbc.denadrive.apihandlers.ResponsesHandler
+import com.bbc.denadrive.apihandlers.makeDriveApiCall
+import com.bbc.denadrive.oauth.AuthStatePersistence
+import okhttp3.HttpUrl
+
+object DriveRequester {
+
+ fun makeNewRequest(
+ context: Context,
+ url: String,
+ builderModifier: (HttpUrl.Builder) -> Unit,
+ callback: (String?, Exception?) -> Unit
+ ) {
+ val authPersistence = AuthStatePersistence
+ val authState = authPersistence.retrieveAuthState(context)
+ makeDriveApiCall(context, authState, url, builderModifier, callback)
+ authPersistence.putAuthState(context, authState)
+ }
+
+ fun populateTree(
+ context: Context,
+ tree: FolderTree
+ ) {
+ Log.e("MEOW", "populateTree: got here", )
+ val myUrl = "https://www.googleapis.com/drive/v3/files?trashed=false&orderBy=folder"
+ makeNewRequest(
+ context = context,
+ url = myUrl,
+ builderModifier = { builder ->
+ builder.addQueryParameter(
+ name = "q",
+ value = "'${tree.value.id}' in parents"
+ )
+ }
+ ) { response, exception ->
+ Log.e("MOO", "populateTree: and here", )
+ if (exception != null) {
+ Log.e("RESPONSE EXCEPTION", "populateTree: ${exception.message}", )
+ } else {
+ val responseBody = ResponsesHandler.newResponseArrived(response)
+ if (responseBody != null) {
+ tree.addChildren(
+ responseBody.files.map { file -> FolderTree(
+ value = file,
+ ownPath = "${tree.ownPath}/${file.id}",
+ parent = tree
+ ) }
+ )
+ Log.e("CURRENT", "populateTree: ${tree.value}", )
+ Log.e("CHILDREN", "populateTree: ${responseBody.files}", )
+ for (child in tree.getChildren()) {
+ if (!child.isLeaf()) populateTree(context, child)
+ }
+ Log.e("MOO", "populateTree: also here?", )
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bbc/denadrive/FolderTree.kt b/app/src/main/java/com/bbc/denadrive/FolderTree.kt
new file mode 100644
index 0000000..bc04d0e
--- /dev/null
+++ b/app/src/main/java/com/bbc/denadrive/FolderTree.kt
@@ -0,0 +1,86 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
+package com.bbc.denadrive
+
+import android.util.Log
+import com.bbc.denadrive.apihandlers.MyFile
+import java.util.stream.Collectors
+
+class FolderTree(
+ val value: MyFile,
+ val ownPath: String = value.id,
+ private val children: MutableList = mutableListOf(),
+ val parent: FolderTree? = null
+) {
+
+ fun isLeaf(): Boolean {
+ return !value.isFolder()
+ }
+
+ fun addChild(file: MyFile) {
+ children.add(FolderTree(file))
+ }
+
+ fun accChild(tree: FolderTree) {
+ children.add(tree)
+ }
+
+ fun addChildren(trees: List) {
+ children.addAll(trees)
+ }
+
+ fun accChildren(files: List) {
+ val trees = files.map { file -> FolderTree(file) }
+ children.addAll(trees)
+ }
+
+ fun getChildren(): List {
+ return children
+ }
+
+ fun stepForward(folderId: String): FolderTree {
+ if (folderId.isEmpty()) return this
+ val didIFindIt =
+ children.parallelStream().filter { tree -> tree.value.id == folderId }
+ .collect(Collectors.toList())
+ if (didIFindIt.isEmpty()) {
+ throw PathNotFoundException("Folder with id $folderId not found")
+ } else {
+ return didIFindIt[0]
+ }
+ }
+
+// fun goToPath(path: String): FolderTree {
+// Log.e("INVOKED", "goToPath: $path", )
+// if (path.isEmpty()) return this
+// val target = path.substringBefore("/")
+// val idList =
+// children.parallelStream().filter { tree -> tree.value.id == target }
+// .collect(Collectors.toList())
+//
+// if (idList.isEmpty()) {
+// Log.e("NOT FOUND", "goToPath: $children", )
+// throw PathNotFoundException("Folder with id $target not found")
+// } else {
+// return idList[0].goToPath(path.substringAfter("/"))
+// }
+// }
+
+ override fun toString(): String {
+ return "$value"
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bbc/denadrive/FolderTreeBuilder.kt b/app/src/main/java/com/bbc/denadrive/FolderTreeBuilder.kt
new file mode 100644
index 0000000..ea61b13
--- /dev/null
+++ b/app/src/main/java/com/bbc/denadrive/FolderTreeBuilder.kt
@@ -0,0 +1,98 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
+package com.bbc.denadrive
+
+//import com.bbc.denadrive.apihandlers.MyFile
+//import kotlinx.coroutines.DelicateCoroutinesApi
+//import kotlinx.coroutines.GlobalScope
+//import kotlinx.coroutines.async
+//import kotlinx.coroutines.awaitAll
+//import kotlinx.coroutines.coroutineScope
+//import kotlinx.coroutines.launch
+//
+//class FolderTreeBuilder(
+// private val childGetterFunction: (MyFile) -> Pair>,
+// private val rootFolder: MyFile = MyFile(
+// kind = "drive#file",
+// mimeType = "application/vnd.google-apps.folder",
+// id = "root",
+// name = "My Drive"
+// )
+//) {
+//
+// fun build(): FolderTree {
+// return unfoldToFolderTree(
+// childGetterFunction,
+// rootFolder
+// )
+// }
+//
+// fun faiStoAlbero(
+// seed: MyFile,
+// getChildren: (MyFile) -> List
+// ): FolderTree {
+// val albero = FolderTree(seed)
+// val childrenSeeds = getChildren(seed)
+// for (x in childrenSeeds) {
+// albero.accChild(faiStoAlbero(x, getChildren))
+// }
+// return albero
+// }
+//
+// @OptIn(DelicateCoroutinesApi::class)
+// private fun generateTree(
+// seed: MyFile,
+// fetchChildren: suspend (MyFile) -> MutableList,
+// callback: (FolderTree) -> Unit
+// ) {
+// GlobalScope.launch {
+// val result = generateTreeAsync(seed, fetchChildren)
+// callback(result)
+// }
+// }
+//
+// private suspend fun generateTreeAsync(
+// seed: MyFile,
+// fetchChildren: suspend (MyFile) -> MutableList
+// ): FolderTree = coroutineScope {
+//
+// val childrenSeeds = fetchChildren(seed)
+// val children = childrenSeeds.map { child -> async { generateTreeAsync(child, fetchChildren) } }
+// .awaitAll()
+//
+// val mutableChildren = mutableListOf()
+// mutableChildren.addAll(children)
+//
+// FolderTree(seed, mutableChildren)
+// }
+//
+// private fun unfoldToFolderTree(
+// getTreeFromFile: (MyFile) -> Pair>,
+// seed: MyFile
+// ): FolderTree {
+// val pair = getTreeFromFile(seed)
+// if (pair.first.isLeaf()) return pair.first
+// pair.first.addChildren(
+// pair.second.map { file ->
+// unfoldToFolderTree(
+// getTreeFromFile, file
+// )
+// }
+// )
+// return pair.first
+// }
+//
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/bbc/denadrive/HomeNotAuthActivity.kt b/app/src/main/java/com/bbc/denadrive/HomeNotAuthActivity.kt
index fa37546..6f2e6d5 100644
--- a/app/src/main/java/com/bbc/denadrive/HomeNotAuthActivity.kt
+++ b/app/src/main/java/com/bbc/denadrive/HomeNotAuthActivity.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive
import android.app.PendingIntent
diff --git a/app/src/main/java/com/bbc/denadrive/MainActivity.kt b/app/src/main/java/com/bbc/denadrive/MainActivity.kt
index 30a7068..15b3f6e 100644
--- a/app/src/main/java/com/bbc/denadrive/MainActivity.kt
+++ b/app/src/main/java/com/bbc/denadrive/MainActivity.kt
@@ -1,6 +1,20 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive
-import android.app.PendingIntent
import android.content.Intent
import android.os.Bundle
import android.util.Log
@@ -12,39 +26,51 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
-import androidx.core.net.toUri
+import androidx.navigation.compose.rememberNavController
+import com.bbc.denadrive.apihandlers.DriveResponseBody
+import com.bbc.denadrive.apihandlers.MyFile
import com.bbc.denadrive.apihandlers.ResponsesHandler
+import com.bbc.denadrive.apihandlers.ResponsesViewer
import com.bbc.denadrive.apihandlers.makeDriveApiCall
import com.bbc.denadrive.home.ScaffoldWithSidebar
import com.bbc.denadrive.oauth.AuthStatePersistence
-import com.bbc.denadrive.oauth.retrieveAuthServConf
import com.bbc.denadrive.ui.theme.DeNaDriveTheme
import net.openid.appauth.AuthorizationException
-import net.openid.appauth.AuthorizationRequest
import net.openid.appauth.AuthorizationResponse
-import net.openid.appauth.AuthorizationService
-import net.openid.appauth.ResponseTypeValues
+import okhttp3.HttpUrl
class MainActivity : ComponentActivity() {
- private lateinit var responsesHandler: ResponsesHandler
+ private lateinit var responsesViewer: ResponsesViewer
private var currentPath: String = "root"
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- responsesHandler = ResponsesHandler()
+ responsesViewer = ResponsesViewer()
+
+ DriveRequester.populateTree(this, responsesViewer.folderTree)
+
+// onBackPressedDispatcher.addCallback(this) {
+// if (currentPath != "root") goToFolder("", false)
+// else finish()
+// }
onBackPressedDispatcher.addCallback(this) {
- if (currentPath != "root") makeNewRequest("", false)
- else finish()
+ if (responsesViewer.currentFolderTree.value.parent != null) {
+ responsesViewer.currentFolderTree.value =
+ responsesViewer.currentFolderTree.value.parent!!
+ } else {
+ finish()
+ }
}
- makeNewRequest(parentFolder = "root", forward = true, isFirstRequest = true)
+// goToFolder(parentFolder = "root", forward = true, isFirstRequest = true)
setContent {
+// val navController = rememberNavController()
ScaffoldWithSidebar(
- responsesHandler,
+ responsesViewer,
{ name ->
Toast.makeText(
this,
@@ -52,81 +78,114 @@ class MainActivity : ComponentActivity() {
Toast.LENGTH_SHORT
).show()
},
- { parent -> makeNewRequest(parent, true) }) {
+ { folder ->
+ responsesViewer.currentFolderTree.value =
+ responsesViewer.currentFolderTree.value.stepForward(folder)
+// responsesViewer.currentFolderTree.value =
+// responsesViewer.currentFolderTree.value.goToPath("$folder/")
+// parent ->
+// goToFolder(parent, true)
+ }
+ ) {
+ responsesViewer.toggleUpdaters()
+// getApps()
}
}
}
- private fun makeNewRequest(
- parentFolder: String, forward: Boolean, isFirstRequest: Boolean = false
- ) {
- responsesHandler.lastResponseBody.value = null
- val authPersistence = AuthStatePersistence
- val authState = authPersistence.retrieveAuthState(this)
- val actualFolder: String
- if (!isFirstRequest) {
- if (forward) {
- currentPath += "/$parentFolder"
- actualFolder = parentFolder
- } else {
- currentPath = currentPath.substringBeforeLast("/")
- actualFolder =
- if (currentPath != "root") currentPath.substringAfterLast("/")
- else "root"
- }
- } else actualFolder = parentFolder
-// val path = if (parentFolder != "root") "root/$parentFolder" else parentFolder
- Log.e("WAAAT", "makeNewRequest: $actualFolder")
- Log.e("WAAAT", "makeNewRequest: $currentPath")
- val myUrl = "https://www.googleapis.com/drive/v3/files?trashed=false&orderBy=folder"
- makeDriveApiCall(this, authState, myUrl, actualFolder) {
- response, exception ->
- if (exception != null) {
- Log.e("ECCOLO", "${exception.cause}")
- Log.e("ECCOLO", "${exception.message}")
- }
- else {
- Log.e("UOOOO", "$response")
- responsesHandler.newResponseArrived(response)
- }
- }
- authPersistence.putAuthState(this, authState)
- }
+// private fun getApps() {
+// val myUrl = "https://www.googleapis.com/drive/v3/apps"
+// makeNewRequest(myUrl) { }
+// }
- override fun onNewIntent(intent: Intent) {
- super.onNewIntent(intent)
- val resp = AuthorizationResponse.fromIntent(intent)
- val ex = AuthorizationException.fromIntent(intent)
- if (resp != null) {
- Toast.makeText(this, "YES", Toast.LENGTH_SHORT).show()
- }
- else {
- if (ex != null) {
- Toast.makeText(this, "NOPE ${ex.error}", Toast.LENGTH_SHORT).show()
- }
- }
+// private fun askForFolder(folderId: String) {
+// val myUrl = "https://www.googleapis.com/drive/v3/files"
+// makeNewRequest(myUrl, { builder ->
+// builder.addQueryParameter("q", "'$folderId' in parents")
+// }) { response, exception ->
+// if (exception != null) {
+// Log.e("TAG", "askForFolder: Something went wrong")
+// } else {
+// // fai quel che ti pare
+// }
+// }
+// }
+//
+// private fun goToFolder(
+// parentFolder: String, forward: Boolean, isFirstRequest: Boolean = false
+// ) {
+// responsesViewer.lastResponseBody.value = null
+// val actualFolder: String
+// if (!isFirstRequest) {
+// if (forward) {
+// currentPath += "/$parentFolder"
+// actualFolder = parentFolder
+// } else {
+// currentPath = currentPath.substringBeforeLast("/")
+// actualFolder =
+// if (currentPath != "root") currentPath.substringAfterLast("/")
+// else "root"
+// }
+// } else actualFolder = parentFolder
+//
+// val myUrl = "https://www.googleapis.com/drive/v3/files?trashed=false&orderBy=folder"
+// makeNewRequest(myUrl, { builder ->
+// builder.addQueryParameter("q", "'$actualFolder' in parents")
+// }) { response, exception ->
+// if (exception != null) {
+// Log.e("ECCOLO", "${exception.cause}")
+// Log.e("ECCOLO", "${exception.message}")
+// } else {
+// Log.e("UOOOO", "$response")
+// responsesViewer.newResponseArrived(response)
+// }
+// }
+// }
+//
+// private fun makeNewRequest(
+// url: String,
+// builderModifier: (HttpUrl.Builder) -> Unit,
+// callback: (String?, Exception?) -> Unit
+// ) {
+// val authPersistence = AuthStatePersistence
+// val authState = authPersistence.retrieveAuthState(this)
+// makeDriveApiCall(this, authState, url, builderModifier, callback)
+// authPersistence.putAuthState(this, authState)
+// }
- setContent {
-// val navController = rememberNavController()
-// ScaffoldWithSidebar(navController) { }
- Greeting("bah")
- }
- }
+// override fun onNewIntent(intent: Intent) {
+// super.onNewIntent(intent)
+// val resp = AuthorizationResponse.fromIntent(intent)
+// val ex = AuthorizationException.fromIntent(intent)
+// if (resp != null) {
+// Toast.makeText(this, "YES", Toast.LENGTH_SHORT).show()
+// } else {
+// if (ex != null) {
+// Toast.makeText(this, "NOPE ${ex.error}", Toast.LENGTH_SHORT).show()
+// }
+// }
+//
+// setContent {
+//// val navController = rememberNavController()
+//// ScaffoldWithSidebar(navController) { }
+// Greeting("bah")
+// }
+// }
}
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
- Text(
- text = "Hello $name!",
- modifier = modifier
- )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
- DeNaDriveTheme {
- Greeting("Android")
- }
-}
\ No newline at end of file
+//@Composable
+//fun Greeting(name: String, modifier: Modifier = Modifier) {
+// Text(
+// text = "Hello $name!",
+// modifier = modifier
+// )
+//}
+//
+//@Preview(showBackground = true)
+//@Composable
+//fun GreetingPreview() {
+// DeNaDriveTheme {
+// Greeting("Android")
+// }
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/bbc/denadrive/MyNavGraph.kt b/app/src/main/java/com/bbc/denadrive/MyNavGraph.kt
index 4658e3d..99dc988 100644
--- a/app/src/main/java/com/bbc/denadrive/MyNavGraph.kt
+++ b/app/src/main/java/com/bbc/denadrive/MyNavGraph.kt
@@ -1,34 +1,63 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive
-import androidx.compose.runtime.Composable
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import com.bbc.denadrive.apihandlers.ResponsesHandler
-import com.bbc.denadrive.home.MyListVisualizer
-
+//import android.util.Log
+//import androidx.compose.runtime.Composable
+//import androidx.navigation.NavHostController
+//import androidx.navigation.compose.NavHost
+//import androidx.navigation.compose.composable
+//import com.bbc.denadrive.apihandlers.ResponsesViewer
+//import com.bbc.denadrive.home.AnotherVisualizer
+//import com.bbc.denadrive.home.MyListVisualizer
+//
//@Composable
-//fun NavigationGraph(navController: NavHostController,
-// responsesHandler: ResponsesHandler,
-// onFileClick: (String) -> Unit,
-// onFolderClick: (String) -> Unit) {
+//fun NavigationGraph(
+// navController: NavHostController,
+// responsesViewer: ResponsesViewer,
+// onFileClick: (String) -> Unit,
+// onFolderClick: (String) -> Unit
+//) {
// // Create a NavHost that defines the navigation graph
-// NavHost(navController = navController, startDestination = "path/root") {
+// NavHost(navController = navController, startDestination = "root/") {
+// composable("root/{path}") { backStackEntry ->
+// val path = backStackEntry.arguments?.getString("path")!!
+// responsesViewer.currentFolderTree.value =
+// responsesViewer.folderTree.goToPath("$path/")
+// AnotherVisualizer(
+// responsesViewer,
+// onFileClick,
+// onFolderClick
+// )
+// }
// // Define the home screen destination
-// composable("home") { HomeScreen(navController) }
+//// composable("home") { HomeScreen(navController) }
//
// // Define the details screen destination with an argument
-// composable("details/{itemId}") { backStackEntry ->
-// // Retrieve the argument from the back stack entry
-// val itemId = backStackEntry.arguments?.getString("itemId")
-// // Pass the argument to the DetailsScreen
-// DetailsScreen(itemId, navController)
-// }
+//// composable("details/{itemId}") { backStackEntry ->
+//// // Retrieve the argument from the back stack entry
+//// val itemId = backStackEntry.arguments?.getString("itemId")
+//// // Pass the argument to the DetailsScreen
+//// DetailsScreen(itemId, navController)
+//// }
//
-// composable("path/{parentFolder}") { backStackEntry ->
-// val parentFolder = backStackEntry.arguments!!.getString("parentFolder")
-// onFolderClick(parentFolder!!)
-// MyListVisualizer(responsesHandler, onFileClick, onFolderClick)
-// }
+//// composable("path/{parentFolder}") { backStackEntry ->
+//// val parentFolder = backStackEntry.arguments!!.getString("parentFolder")
+//// onFolderClick(parentFolder!!)
+//// MyListVisualizer(responsesViewer, onFileClick, onFolderClick)
+//// }
// }
//}
diff --git a/app/src/main/java/com/bbc/denadrive/PathNotFoundException.kt b/app/src/main/java/com/bbc/denadrive/PathNotFoundException.kt
new file mode 100644
index 0000000..5bd402b
--- /dev/null
+++ b/app/src/main/java/com/bbc/denadrive/PathNotFoundException.kt
@@ -0,0 +1,9 @@
+package com.bbc.denadrive
+
+class PathNotFoundException(message: String): Exception(message) {
+
+// constructor(message: String, cause: Throwable) : this(message) {
+// initCause(cause)
+// }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bbc/denadrive/TestActivity.kt b/app/src/main/java/com/bbc/denadrive/TestActivity.kt
index 501d129..4ecd7ef 100644
--- a/app/src/main/java/com/bbc/denadrive/TestActivity.kt
+++ b/app/src/main/java/com/bbc/denadrive/TestActivity.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive
import android.app.PendingIntent
diff --git a/app/src/main/java/com/bbc/denadrive/TestBah.kt b/app/src/main/java/com/bbc/denadrive/TestBah.kt
index 9958ad9..8b748f9 100644
--- a/app/src/main/java/com/bbc/denadrive/TestBah.kt
+++ b/app/src/main/java/com/bbc/denadrive/TestBah.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive
import android.content.Intent
diff --git a/app/src/main/java/com/bbc/denadrive/apihandlers/ApiCalls.kt b/app/src/main/java/com/bbc/denadrive/apihandlers/ApiCalls.kt
index 35024d5..874809b 100644
--- a/app/src/main/java/com/bbc/denadrive/apihandlers/ApiCalls.kt
+++ b/app/src/main/java/com/bbc/denadrive/apihandlers/ApiCalls.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.apihandlers
import android.content.Context
@@ -5,14 +20,20 @@ import net.openid.appauth.AuthState
import net.openid.appauth.AuthorizationService
import okhttp3.Call
import okhttp3.Callback
+import okhttp3.HttpUrl
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okhttp3.HttpUrl.Companion.toHttpUrl
import java.io.IOException
-fun makeDriveApiCall(context: Context, authState: AuthState, url: String, folderId: String,
- callback: (String?, Exception?) -> Unit) {
+fun makeDriveApiCall(
+ context: Context,
+ authState: AuthState,
+ url: String,
+// folderId: String,
+ builderModifier:(HttpUrl.Builder) -> Unit,
+ callback: (String?, Exception?) -> Unit) {
val authService = AuthorizationService(context)
// _ = idToken
authState.performActionWithFreshTokens(authService) { accessToken, _, ex ->
@@ -23,7 +44,8 @@ fun makeDriveApiCall(context: Context, authState: AuthState, url: String, folder
}
val urlBuilder = url.toHttpUrl().newBuilder()
- urlBuilder.addQueryParameter("q", "'$folderId' in parents")
+ builderModifier(urlBuilder)
+// urlBuilder.addQueryParameter("q", "'$folderId' in parents")
val updatedUrl = urlBuilder.build()
val request = Request.Builder()
diff --git a/app/src/main/java/com/bbc/denadrive/apihandlers/DriveResponseBody.kt b/app/src/main/java/com/bbc/denadrive/apihandlers/DriveResponseBody.kt
index 6c4f670..67f755b 100644
--- a/app/src/main/java/com/bbc/denadrive/apihandlers/DriveResponseBody.kt
+++ b/app/src/main/java/com/bbc/denadrive/apihandlers/DriveResponseBody.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.apihandlers
import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/bbc/denadrive/apihandlers/MyFile.kt b/app/src/main/java/com/bbc/denadrive/apihandlers/MyFile.kt
index 1765305..b16d4b3 100644
--- a/app/src/main/java/com/bbc/denadrive/apihandlers/MyFile.kt
+++ b/app/src/main/java/com/bbc/denadrive/apihandlers/MyFile.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.apihandlers
import kotlinx.serialization.Serializable
@@ -8,4 +23,8 @@ data class MyFile(
val mimeType: String,
val id: String,
val name: String
-)
\ No newline at end of file
+) {
+ fun isFolder(): Boolean {
+ return mimeType == "application/vnd.google-apps.folder"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bbc/denadrive/apihandlers/ResponsesHandler.kt b/app/src/main/java/com/bbc/denadrive/apihandlers/ResponsesHandler.kt
index cc82430..bdbf849 100644
--- a/app/src/main/java/com/bbc/denadrive/apihandlers/ResponsesHandler.kt
+++ b/app/src/main/java/com/bbc/denadrive/apihandlers/ResponsesHandler.kt
@@ -1,44 +1,16 @@
package com.bbc.denadrive.apihandlers
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.lifecycle.ViewModel
import kotlinx.serialization.SerializationException
import kotlinx.serialization.json.Json
-class ResponsesHandler: ViewModel() {
+object ResponsesHandler {
- val lastResponseBody: MutableState = mutableStateOf(null)
-
- private var lastResponse: String = ""
- private var isComplete: Boolean = true
- private lateinit var respBuilder: StringBuilder
-
- fun newResponseArrived(response: String?) {
- if (isComplete && response != null) {
- respBuilder = StringBuilder(response)
- updateCompleteness()
- }
- else if (response != null) {
- respBuilder.append(response)
- updateCompleteness()
- }
- }
-
- private fun checkForCompleteness(): Pair {
+ inline fun newResponseArrived(response: String?): T? {
+ if (response == null) return null
return try {
- Pair(true, Json.decodeFromString(respBuilder.toString()))
+ Json.decodeFromString(response)
} catch (e: SerializationException) {
- Pair(false, null)
- }
- }
-
- private fun updateCompleteness() {
- val pair = checkForCompleteness()
- isComplete = pair.first
- if (isComplete) {
- lastResponse = respBuilder.toString()
- lastResponseBody.value = pair.second
+ null
}
}
diff --git a/app/src/main/java/com/bbc/denadrive/apihandlers/ResponsesViewer.kt b/app/src/main/java/com/bbc/denadrive/apihandlers/ResponsesViewer.kt
new file mode 100644
index 0000000..a8de4b8
--- /dev/null
+++ b/app/src/main/java/com/bbc/denadrive/apihandlers/ResponsesViewer.kt
@@ -0,0 +1,72 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
+package com.bbc.denadrive.apihandlers
+
+import android.util.Log
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.bbc.denadrive.FolderTree
+
+class ResponsesViewer: ViewModel() {
+
+ val rootFolder: MyFile = MyFile(
+ kind = "drive#file",
+ mimeType = "application/vnd.google-apps.folder",
+ id = "root",
+ name = "My Drive"
+ )
+
+ val lastResponseBody: MutableState = mutableStateOf(null)
+ val folderTree: FolderTree = FolderTree(rootFolder)
+ val currentFolderTree: MutableState = mutableStateOf(folderTree)
+ val updater1: MutableState = mutableStateOf(false)
+ val updater2: MutableState = mutableStateOf(true)
+
+ fun toggleUpdaters() {
+ Log.e("UPDATE", "toggleUpdaters: updating...", )
+ updater1.value = !updater1.value
+ updater2.value = !updater2.value
+ }
+
+// private var lastResponse: String = ""
+// private var isComplete: Boolean = true
+// private lateinit var respBuilder: StringBuilder
+
+ fun newResponseArrived(response: String?) {
+ if (response == null) return
+ lastResponseBody.value = ResponsesHandler.newResponseArrived(response)
+ }
+
+
+// private fun checkForCompleteness(): Pair {
+// return try {
+// Pair(true, Json.decodeFromString(respBuilder.toString()))
+// } catch (e: SerializationException) {
+// Pair(false, null)
+// }
+// }
+
+// private fun updateCompleteness() {
+// val pair = checkForCompleteness()
+// isComplete = pair.first
+// if (isComplete) {
+// lastResponse = respBuilder.toString()
+// lastResponseBody.value = pair.second
+// }
+// }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bbc/denadrive/home/DebugScreens.kt b/app/src/main/java/com/bbc/denadrive/home/DebugScreens.kt
index 9cf0b28..e6fe402 100644
--- a/app/src/main/java/com/bbc/denadrive/home/DebugScreens.kt
+++ b/app/src/main/java/com/bbc/denadrive/home/DebugScreens.kt
@@ -1,11 +1,25 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.home
+import android.util.Log
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.background
-import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
-import androidx.navigation.NavHostController
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
@@ -27,15 +41,18 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
import com.bbc.denadrive.R
import com.bbc.denadrive.apihandlers.MyFile
-import com.bbc.denadrive.apihandlers.ResponsesHandler
+import com.bbc.denadrive.apihandlers.ResponsesViewer
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ScaffoldWithSidebar(
- responsesHandler: ResponsesHandler,
+ responsesViewer: ResponsesViewer,
onFileClick: (String) -> Unit,
onFolderClick: (String) -> Unit,
doIt: () -> Unit,
@@ -55,11 +72,11 @@ fun ScaffoldWithSidebar(
.fillMaxWidth(0.67f)
.background(Color.White)
) {
- RectangularButton(backgroundColor = Color.White, text = "Text 1") { }
+ RectangularButton(backgroundColor = Color.White, text = "Text 1") { }
// Spacer(modifier = Modifier.height(10.dp))
- RectangularButton(backgroundColor = Color.White, text = "Text 2") { }
+ RectangularButton(backgroundColor = Color.White, text = "Text 2") { }
// Spacer(modifier = Modifier.height(10.dp))
- RectangularButton(backgroundColor = Color.White, text = "Text 3") { }
+ RectangularButton(backgroundColor = Color.White, text = "Text 3") { }
}
},
content = {
@@ -94,11 +111,16 @@ fun ScaffoldWithSidebar(
.padding(16.dp),
contentAlignment = Alignment.Center,
) {
- MyListVisualizer(
- responsesHandler = responsesHandler,
- onFileClick = onFileClick,
- onFolderClick = onFolderClick
+ AnotherVisualizer(
+ responsesViewer,
+ onFileClick,
+ onFolderClick
)
+// MyListVisualizer(
+// responsesViewer = responsesViewer,
+// onFileClick = onFileClick,
+// onFolderClick = onFolderClick
+// )
}
}
)
@@ -141,11 +163,13 @@ fun RectangularButton(
}
@Composable
-fun MyListVisualizer(responsesHandler: ResponsesHandler,
- onFileClick: (String) -> Unit,
- onFolderClick: (String) -> Unit) {
+fun MyListVisualizer(
+ responsesViewer: ResponsesViewer,
+ onFileClick: (String) -> Unit,
+ onFolderClick: (String) -> Unit
+) {
val fileList = mutableListOf()
- if (responsesHandler.lastResponseBody.value == null) {
+ if (responsesViewer.lastResponseBody.value == null) {
fileList.clear()
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Text(text = "Loading...", style = MaterialTheme.typography.titleLarge)
@@ -153,24 +177,113 @@ fun MyListVisualizer(responsesHandler: ResponsesHandler,
} else {
fileList.clear()
fileList.addAll(
- responsesHandler.lastResponseBody.value!!.toList()
+ responsesViewer.lastResponseBody.value!!.toList()
)
- Box (modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
+ Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
LazyColumn {
items(fileList) { file ->
val logo = painterResource(id = getId(file.mimeType))
val isFolder = file.mimeType.endsWith("folder")
val onClick = if (isFolder) onFolderClick
else onFileClick
- LogoTextBox(logo, file.name) { onClick(
- if (isFolder) file.id else file.name) }
+ LogoTextBox(logo, file.name) {
+ onClick(
+ if (isFolder) file.id else file.name
+ )
+ }
}
}
}
}
}
-fun getId(mimeType: String): Int {
+@Composable
+fun Loading(
+ modifier: Modifier = Modifier
+) {
+ // State to control the rotation animation
+ val rotation = remember { mutableFloatStateOf(0f) }
+
+ // Animate the rotation
+ LaunchedEffect(Unit) {
+ while (true) {
+ rotation.floatValue += 10f
+ if (rotation.floatValue >= 360f) rotation.floatValue = 0f
+ kotlinx.coroutines.delay(16) // Approximately 60 FPS
+ }
+ }
+
+ Box(
+ modifier = modifier
+ .fillMaxSize()
+ .padding(16.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.Center
+ ) {
+ // Rotating Circular Progress Indicator
+ CircularProgressIndicator(
+ modifier = Modifier
+ .size(64.dp)
+ .graphicsLayer(rotationZ = rotation.floatValue),
+ color = Color.Blue
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ // Loading text
+ Text(
+ text = "Loading",
+ fontSize = 20.sp,
+ fontWeight = FontWeight.Bold,
+ color = Color.Black
+ )
+ }
+ }
+}
+
+@Composable
+fun AnotherVisualizer(
+ responsesViewer: ResponsesViewer,
+ onFileClick: (String) -> Unit,
+ onFolderClick: (String) -> Unit
+) {
+ val currentFolderTree = responsesViewer.currentFolderTree.value
+ val updater1 = responsesViewer.updater1.value
+ val updater2 = responsesViewer.updater2.value
+ if (currentFolderTree.isLeaf() && (updater1 || updater2)) {
+ Log.e("Visualizer", "AnotherVisualizer: ${currentFolderTree.value}", )
+ Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+ Text(text = "How did you get here? You're inside a file...")
+ }
+ } else if (currentFolderTree.getChildren().isEmpty()) {
+ Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+ Text("Empty folder")
+// Loading()
+ }
+ } else {
+ val fileList = currentFolderTree.getChildren().map { tree -> tree.value }
+ Log.e("Visualizer", "AnotherVisualizer: ${currentFolderTree.value}", )
+ Log.e("Visualizer", "AnotherVisualizer: ${currentFolderTree.getChildren()}", )
+ Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
+ LazyColumn {
+ items(fileList) { file ->
+ val logo = painterResource(id = getId(file.mimeType))
+ val isFolder = file.mimeType.endsWith("folder")
+ val onClick = if (isFolder) onFolderClick
+ else onFileClick
+ LogoTextBox(logo, file.name) {
+ onClick(
+ if (isFolder) file.id else file.name
+ )
+ }
+ }
+ }
+ }
+ }
+}
+
+fun getId(mimeType: String): Int {
val extracted = mimeType.drop("application/vnd.google-apps.".length)
return when (extracted) {
"document" -> R.drawable.docslogo_ok
@@ -184,11 +297,12 @@ fun getId(mimeType: String): Int {
fun LogoTextBox(
logoPainter: Painter,
text: String,
- onClick: () -> Unit) {
+ onClick: () -> Unit
+) {
Card(
modifier = Modifier
.fillMaxWidth()
- .padding(16.dp)
+ .padding(4.dp)
.clickable(onClick = onClick),
shape = RoundedCornerShape(8.dp),
elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
@@ -203,9 +317,11 @@ fun LogoTextBox(
Image(
painter = logoPainter,
contentDescription = "Item Logo",
+ contentScale = ContentScale.Crop,
+ alignment = Alignment.Center,
modifier = Modifier
- .size(60.dp) // Adjust size as needed
- .padding(end = 16.dp) // Space between logo and text
+ .size(80.dp) // Adjust size as needed
+ .padding(horizontal = 16.dp) // Space between logo and text
)
// Text to the right of the logo
diff --git a/app/src/main/java/com/bbc/denadrive/home/NeverLoggedInLogic.kt b/app/src/main/java/com/bbc/denadrive/home/NeverLoggedInLogic.kt
index 38a1660..68584de 100644
--- a/app/src/main/java/com/bbc/denadrive/home/NeverLoggedInLogic.kt
+++ b/app/src/main/java/com/bbc/denadrive/home/NeverLoggedInLogic.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.home
import android.content.Intent
diff --git a/app/src/main/java/com/bbc/denadrive/oauth/AppAuthImplementation.kt b/app/src/main/java/com/bbc/denadrive/oauth/AppAuthImplementation.kt
index 5d82e96..02ee7f5 100644
--- a/app/src/main/java/com/bbc/denadrive/oauth/AppAuthImplementation.kt
+++ b/app/src/main/java/com/bbc/denadrive/oauth/AppAuthImplementation.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.oauth
import androidx.core.net.toUri
diff --git a/app/src/main/java/com/bbc/denadrive/oauth/AuthStatePersistence.kt b/app/src/main/java/com/bbc/denadrive/oauth/AuthStatePersistence.kt
index d5cd0ca..60bf759 100644
--- a/app/src/main/java/com/bbc/denadrive/oauth/AuthStatePersistence.kt
+++ b/app/src/main/java/com/bbc/denadrive/oauth/AuthStatePersistence.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.oauth
import android.content.Context
diff --git a/app/src/main/java/com/bbc/denadrive/oauth/LoadingActivity.kt b/app/src/main/java/com/bbc/denadrive/oauth/LoadingActivity.kt
index 9f8c03b..462068a 100644
--- a/app/src/main/java/com/bbc/denadrive/oauth/LoadingActivity.kt
+++ b/app/src/main/java/com/bbc/denadrive/oauth/LoadingActivity.kt
@@ -1,3 +1,18 @@
+/*
+This file is part of DeNa Drive.
+
+DeNa Drive 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.
+
+DeNa Drive 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 DeNa Drive.
+If not, see .
+*/
+
package com.bbc.denadrive.oauth
import android.content.Intent